Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/verify-pack.c b/verify-pack.c
index 99c352ee3a48b03c724d7abcbe60e7136083bf71..357970da391da39eb24a3154923dabd1c9baea53 100644 (file)
--- a/verify-pack.c
+++ b/verify-pack.c
@@ -16,10 +16,10 @@ static int verify_one_pack(const char *path, int verbose)
         * 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")) {
+       if (has_extension(arg, ".pack")) {
                strcpy(arg + len - 5, ".idx");
                len--;
-       } else if (!has_extension(arg, len, ".idx")) {
+       } else if (!has_extension(arg, ".idx")) {
                if (len + 4 >= PATH_MAX)
                        return error("name too long: %s.idx", arg);
                strcpy(arg + len, ".idx");
@@ -49,7 +49,7 @@ static const char verify_pack_usage[] = "git-verify-pack [-v] <pack>...";
 
 int main(int ac, char **av)
 {
-       int errs = 0;
+       int err = 0;
        int verbose = 0;
        int no_more_options = 0;
        int nothing_done = 1;
@@ -65,7 +65,7 @@ int main(int ac, char **av)
                }
                else {
                        if (verify_one_pack(av[1], verbose))
-                               errs++;
+                               err = 1;
                        nothing_done = 0;
                }
                ac--; av++;
@@ -74,5 +74,5 @@ int main(int ac, char **av)
        if (nothing_done)
                usage(verify_pack_usage);
 
-       return !!errs;
+       return err;
 }