[PATCH] Rewrite some function exit paths to avoid "unreachable code" traps
Noticed by Guido Ostkamp for Sun's Workshop cc.
Originally-by: Guido Ostkamp <git@ostkamp.fastmail.fm>
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
Guido Ostkamp, Fri, Nov 16, 2007 23:52:01 +0100:
>
> What about the xdiff/xdiffi.c problem that should also be solved?
>
Here you go.
builtin-apply.c | 5 +++--
utf8.c | 2 +-
xdiff/xdiffi.c | 14 +++++++-------
xdiff/xutils.c | 5 ++---
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/builtin-apply.c b/builtin-apply.c
index 8edcc08..6267396 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -668,13 +668,13 @@ static char *git_header_name(char *line, int llen)
default:
continue;
case '\n':
- return NULL;
+ goto eol;
case '\t': case ' ':
second = name+len;
for (;;) {
char c = *second++;
if (c == '\n')
- return NULL;
+ goto eol;
if (c == '/')
break;
}
@@ -683,6 +683,7 @@ static char *git_header_name(char *line, int llen)
}
}
}
+eol:
return NULL;
}
diff --git a/utf8.c b/utf8.c
index 8095a71..50c46af 100644
--- a/utf8.c
+++ b/utf8.c
@@ -262,7 +262,7 @@ int print_wrapped_text(const char *text, int indent, int indent2, int width)
print_spaces(indent);
fwrite(start, text - start, 1, stdout);
if (!c)
- return w;
+ break;
else if (c == '\t')
w |= 0x07;
space = text;
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 5cb7171..365d768 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -110,7 +110,7 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
spl->i1 = i1;
spl->i2 = i2;
spl->min_lo = spl->min_hi = 1;
- return ec;
+ goto end;
}
}
@@ -145,7 +145,7 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
spl->i1 = i1;
spl->i2 = i2;
spl->min_lo = spl->min_hi = 1;
- return ec;
+ goto end;
}
}
@@ -184,7 +184,7 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
if (best > 0) {
spl->min_lo = 1;
spl->min_hi = 0;
- return ec;
+ goto end;
}
for (best = 0, d = bmax; d >= bmin; d -= 2) {
@@ -208,7 +208,7 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
if (best > 0) {
spl->min_lo = 0;
spl->min_hi = 1;
- return ec;
+ goto end;
}
}
@@ -254,11 +254,11 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
spl->min_lo = 0;
spl->min_hi = 1;
}
- return ec;
+ goto end;
}
}
-
- return -1;
+end:
+ return ec;
}
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 2ade97b..533ff76 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -230,10 +230,9 @@ int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags)
i2++;
}
return i1 >= s1 && i2 >= s2;
- } else
- return s1 == s2 && !memcmp(l1, l2, s1);
+ }
- return 0;
+ return s1 == s2 && !memcmp(l1, l2, s1);
}
static unsigned long xdl_hash_record_with_whitespace(char const **data,
--
1.5.3.5.750.g9f37
Alex Riesen <raa.lkml@gmail.com>