remove ugly shadowing of loop indexes in subloops.

builtin-mv.c and git.c has a nested loop that is governed by a
variable 'i', but they shadow it with another instance of 'i'.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/builtin-mv.c b/builtin-mv.c
index ff882bec474c59c9cb4bb49d723cf81febb204ad..fd1e52098174be212c51b957280f38dc6e9c0e48 100644 (file)
--- a/builtin-mv.c
+++ b/builtin-mv.c
@@ -262,10 +262,10 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
        } else {
                for (i = 0; i < changed.nr; i++) {
                        const char *path = changed.items[i].path;
        } else {
                for (i = 0; i < changed.nr; i++) {
                        const char *path = changed.items[i].path;

-                       int i = cache_name_pos(path, strlen(path));
-                       struct cache_entry *ce = active_cache[i];
+                       int j = cache_name_pos(path, strlen(path));
+                       struct cache_entry *ce = active_cache[j];

 
 

-                       if (i < 0)
+                       if (j < 0)

                                die ("Huh? Cache entry for %s unknown?", path);
                        refresh_cache_entry(ce, 0);
                }
                                die ("Huh? Cache entry for %s unknown?", path);
                        refresh_cache_entry(ce, 0);
                }

diff --git a/git.c b/git.c
index 930998bbe542cbaa92b3f16a6b0dc0d6ad43b874..a01d195c2319fd21fb361e535c5d6333550e3dbd 100644 (file)
--- a/git.c
+++ b/git.c
@@ -292,11 +292,11 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                if (p->option & USE_PAGER)
                        setup_pager();
                if (getenv("GIT_TRACE")) {
                if (p->option & USE_PAGER)
                        setup_pager();
                if (getenv("GIT_TRACE")) {

-                       int i;
+                       int j;

                        fprintf(stderr, "trace: built-in: git");
                        fprintf(stderr, "trace: built-in: git");

-                       for (i = 0; i < argc; ++i) {
+                       for (j = 0; j < argc; ++j) {

                                fputc(' ', stderr);
                                fputc(' ', stderr);

-                               sq_quote_print(stderr, argv[i]);
+                               sq_quote_print(stderr, argv[j]);

                        }
                        putc('\n', stderr);
                        fflush(stderr);
                        }
                        putc('\n', stderr);
                        fflush(stderr);