Browse Source

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>
maint
Pierre Habouzit 19 years ago committed by Junio C Hamano
parent
commit
d828f6ddf8
  1. 6
      builtin-mv.c
  2. 6
      git.c

6
builtin-mv.c

@ -262,10 +262,10 @@ int cmd_mv(int argc, const char **argv, const char *prefix) @@ -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;
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);
}

6
git.c

@ -292,11 +292,11 @@ static void handle_internal_command(int argc, const char **argv, char **envp) @@ -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")) {
int i;
int j;
fprintf(stderr, "trace: built-in: git");
for (i = 0; i < argc; ++i) {
for (j = 0; j < argc; ++j) {
fputc(' ', stderr);
sq_quote_print(stderr, argv[i]);
sq_quote_print(stderr, argv[j]);
}
putc('\n', stderr);
fflush(stderr);

Loading…
Cancel
Save