Skip to content

Commit

Permalink
git-verify-pack: get rid of while loop
Browse files Browse the repository at this point in the history
Get rid of that while loop which was apparently used as a way to avoid
goto's (why?).  It's easy now because there is only one break left at
the end of it.  Also make the comment clearer.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Rene Scharfe authored and Junio C Hamano committed Aug 10, 2006
1 parent 68f4c78 commit fc5fc50
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions verify-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@ static int verify_one_pack(const char *path, int verbose)
if (len >= PATH_MAX)
return error("name too long: %s", path);

while (1) {
/* Should name foo.idx, but foo.pack may be named;
* convert it to foo.idx
*/
if (has_extension(arg, len, ".pack")) {
strcpy(arg + len - 5, ".idx");
len--;
} else if (!has_extension(arg, len, ".idx")) {
if (len + 4 >= PATH_MAX)
return error("name too long: %s.idx", arg);
strcpy(arg + len, ".idx");
len += 4;
}
if ((g = add_packed_git(arg, len, 1)))
break;
return error("packfile %s not found.", arg);
/*
* In addition to "foo.idx" we accept "foo.pack" and "foo";
* normalize these forms to "foo.idx" for add_packed_git().
*/
if (has_extension(arg, len, ".pack")) {
strcpy(arg + len - 5, ".idx");
len--;
} else if (!has_extension(arg, len, ".idx")) {
if (len + 4 >= PATH_MAX)
return error("name too long: %s.idx", arg);
strcpy(arg + len, ".idx");
len += 4;
}

if (!(g = add_packed_git(arg, len, 1)))
return error("packfile %s not found.", arg);

return verify_pack(g, verbose);
}

Expand Down

0 comments on commit fc5fc50

Please sign in to comment.