{"thread":{"id":"5364","subject":"[PATCH 3/7] missing 'static' keywords","startedAt":"2006-08-23T10:39:10Z","lastAt":"2006-08-23T10:39:16Z","messageCount":7,"participants":["Pierre Habouzit"],"isPatch":true,"patchVersion":1,"patchTotal":7},"messages":[{"id":"25800","messageId":"11563295562072-git-send-email-madcoder@debian.org","threadId":"5364","inReplyTo":null,"subject":"[PATCH 1/7] avoid to use error that shadows the function name, use err instead.","fromName":"Pierre Habouzit","fromEmail":"madcoder@debian.org","sentAt":"2006-08-23T10:39:10Z","receivedAt":"2006-08-23T10:39:10Z","isPatch":true,"sender":{"key":"madcoder@debian.org","avatar":"https://avatars.githubusercontent.com/u/44708?v=4"},"body":"Signed-off-by: Pierre Habouzit \n---\n builtin-apply.c | 6 +++---\n builtin-push.c | 10 +++++-----\n 2 files changed, 8 insertions(+), 8 deletions(-)\n\ndiff --git a/builtin-apply.c b/builtin-apply.c\nindex 4f0eef0..5991737 100644\n--- a/builtin-apply.c\n+++ b/builtin-apply.c\n@@ -1907,13 +1907,13 @@ static int check_patch(struct patch *pat\n static int check_patch_list(struct patch *patch)\n {\n \tstruct patch *prev_patch = NULL;\n-\tint error = 0;\n+\tint err = 0;\n \n \tfor (prev_patch = NULL; patch ; patch = patch->next) {\n-\t\terror |= check_patch(patch, prev_patch);\n+\t\terr |= check_patch(patch, prev_patch);\n \t\tprev_patch = patch;\n \t}\n-\treturn error;\n+\treturn err;\n }\n \n static void show_index_list(struct patch *list)\ndiff --git a/builtin-push.c b/builtin-push.c\nindex 2b5e6fa..ada8338 100644\n--- a/builtin-push.c\n+++ b/builtin-push.c\n@@ -232,7 +232,7 @@ static int do_push(const char *repo)\n \tcommon_argc = argc;\n \n \tfor (i = 0; i < n; i++) {\n-\t\tint error;\n+\t\tint err;\n \t\tint dest_argc = common_argc;\n \t\tint dest_refspec_nr = refspec_nr;\n \t\tconst char **dest_refspec = refspec;\n@@ -248,10 +248,10 @@ static int do_push(const char *repo)\n \t\twhile (dest_refspec_nr--)\n \t\t\targv[dest_argc++] = *dest_refspec++;\n \t\targv[dest_argc] = NULL;\n-\t\terror = run_command_v(argc, argv);\n-\t\tif (!error)\n+\t\terr = run_command_v(argc, argv);\n+\t\tif (!err)\n \t\t\tcontinue;\n-\t\tswitch (error) {\n+\t\tswitch (err) {\n \t\tcase -ERR_RUN_COMMAND_FORK:\n \t\t\tdie(\"unable to fork for %s\", sender);\n \t\tcase -ERR_RUN_COMMAND_EXEC:\n@@ -262,7 +262,7 @@ static int do_push(const char *repo)\n \t\tcase -ERR_RUN_COMMAND_WAITPID_NOEXIT:\n \t\t\tdie(\"%s died with strange error\", sender);\n \t\tdefault:\n-\t\t\treturn -error;\n+\t\t\treturn -err;\n \t\t}\n \t}\n \treturn 0;\n-- \n1.4.1.1\n"},{"id":"25802","messageId":"11563295562422-git-send-email-madcoder@debian.org","threadId":"5364","inReplyTo":"11563295562072-git-send-email-madcoder@debian.org","subject":"[PATCH 2/7] git_dir holds pointers to local strings, hence MUST be const.","fromName":"Pierre Habouzit","fromEmail":"madcoder@debian.org","sentAt":"2006-08-23T10:39:11Z","receivedAt":"2006-08-23T10:39:11Z","isPatch":true,"sender":{"key":"madcoder@debian.org","avatar":"https://avatars.githubusercontent.com/u/44708?v=4"},"body":"Signed-off-by: Pierre Habouzit \n---\n cache.h | 2 +-\n environment.c | 7 ++++---\n 2 files changed, 5 insertions(+), 4 deletions(-)\n\ndiff --git a/cache.h b/cache.h\nindex 08d6a91..3044794 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -123,7 +123,7 @@ #define DB_ENVIRONMENT \"GIT_OBJECT_DIREC\n #define INDEX_ENVIRONMENT \"GIT_INDEX_FILE\"\n #define GRAFT_ENVIRONMENT \"GIT_GRAFT_FILE\"\n \n-extern char *get_git_dir(void);\n+extern const char *get_git_dir(void);\n extern char *get_object_directory(void);\n extern char *get_refs_directory(void);\n extern char *get_index_file(void);\ndiff --git a/environment.c b/environment.c\nindex e6bd003..5fae9ac 100644\n--- a/environment.c\n+++ b/environment.c\n@@ -25,8 +25,9 @@ int zlib_compression_level = Z_DEFAULT_C\n int pager_in_use;\n int pager_use_color = 1;\n \n-static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,\n-\t*git_graft_file;\n+static const char *git_dir;\n+static char *git_object_dir, *git_index_file, *git_refs_dir, *git_graft_file;\n+\n static void setup_git_env(void)\n {\n \tgit_dir = getenv(GIT_DIR_ENVIRONMENT);\n@@ -49,7 +50,7 @@ static void setup_git_env(void)\n \t\tgit_graft_file = strdup(git_path(\"info/grafts\"));\n }\n \n-char *get_git_dir(void)\n+const char *get_git_dir(void)\n {\n \tif (!git_dir)\n \t\tsetup_git_env();\n-- \n1.4.1.1\n"},{"id":"25798","messageId":"1156329556788-git-send-email-madcoder@debian.org","threadId":"5364","inReplyTo":"11563295562422-git-send-email-madcoder@debian.org","subject":"[PATCH 3/7] missing 'static' keywords","fromName":"Pierre Habouzit","fromEmail":"madcoder@debian.org","sentAt":"2006-08-23T10:39:12Z","receivedAt":"2006-08-23T10:39:12Z","isPatch":true,"sender":{"key":"madcoder@debian.org","avatar":"https://avatars.githubusercontent.com/u/44708?v=4"},"body":"Signed-off-by: Pierre Habouzit \n---\n builtin-tar-tree.c | 2 +-\n http-push.c | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin-tar-tree.c b/builtin-tar-tree.c\nindex e0bcb0a..61a4135 100644\n--- a/builtin-tar-tree.c\n+++ b/builtin-tar-tree.c\n@@ -275,7 +275,7 @@ static void traverse_tree(struct tree_de\n \t}\n }\n \n-int git_tar_config(const char *var, const char *value)\n+static int git_tar_config(const char *var, const char *value)\n {\n \tif (!strcmp(var, \"tar.umask\")) {\n \t\tif (!strcmp(value, \"user\")) {\ndiff --git a/http-push.c b/http-push.c\nindex 4849779..7d12f69 100644\n--- a/http-push.c\n+++ b/http-push.c\n@@ -1700,7 +1700,7 @@ static int locking_available(void)\n \treturn lock_flags;\n }\n \n-struct object_list **add_one_object(struct object *obj, struct object_list **p)\n+static struct object_list **add_one_object(struct object *obj, struct object_list **p)\n {\n \tstruct object_list *entry = xmalloc(sizeof(struct object_list));\n \tentry->item = obj;\n-- \n1.4.1.1\n"},{"id":"25801","messageId":"11563295573215-git-send-email-madcoder@debian.org","threadId":"5364","inReplyTo":"1156329556788-git-send-email-madcoder@debian.org","subject":"[PATCH 4/7] remove ugly shadowing of loop indexes in subloops.","fromName":"Pierre Habouzit","fromEmail":"madcoder@debian.org","sentAt":"2006-08-23T10:39:13Z","receivedAt":"2006-08-23T10:39:13Z","isPatch":true,"sender":{"key":"madcoder@debian.org","avatar":"https://avatars.githubusercontent.com/u/44708?v=4"},"body":"Signed-off-by: Pierre Habouzit \n---\n builtin-mv.c | 6 +++---\n git.c | 6 +++---\n 2 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/builtin-mv.c b/builtin-mv.c\nindex ff882be..fd1e520 100644\n--- a/builtin-mv.c\n+++ b/builtin-mv.c\n@@ -262,10 +262,10 @@ int cmd_mv(int argc, const char **argv, \n \t} else {\n \t\tfor (i = 0; i < changed.nr; i++) {\n \t\t\tconst char *path = changed.items[i].path;\n-\t\t\tint i = cache_name_pos(path, strlen(path));\n-\t\t\tstruct cache_entry *ce = active_cache[i];\n+\t\t\tint j = cache_name_pos(path, strlen(path));\n+\t\t\tstruct cache_entry *ce = active_cache[j];\n \n-\t\t\tif (i < 0)\n+\t\t\tif (j < 0)\n \t\t\t\tdie (\"Huh? Cache entry for %s unknown?\", path);\n \t\t\trefresh_cache_entry(ce, 0);\n \t\t}\ndiff --git a/git.c b/git.c\nindex 930998b..a01d195 100644\n--- a/git.c\n+++ b/git.c\n@@ -292,11 +292,11 @@ static void handle_internal_command(int \n \t\tif (p->option & USE_PAGER)\n \t\t\tsetup_pager();\n \t\tif (getenv(\"GIT_TRACE\")) {\n-\t\t\tint i;\n+\t\t\tint j;\n \t\t\tfprintf(stderr, \"trace: built-in: git\");\n-\t\t\tfor (i = 0; i < argc; ++i) {\n+\t\t\tfor (j = 0; j < argc; ++j) {\n \t\t\t\tfputc(' ', stderr);\n-\t\t\t\tsq_quote_print(stderr, argv[i]);\n+\t\t\t\tsq_quote_print(stderr, argv[j]);\n \t\t\t}\n \t\t\tputc('\\n', stderr);\n \t\t\tfflush(stderr);\n-- \n1.4.1.1\n"},{"id":"25805","messageId":"11563295573035-git-send-email-madcoder@debian.org","threadId":"5364","inReplyTo":"11563295573215-git-send-email-madcoder@debian.org","subject":"[PATCH 5/7] missing #define DEBUG 0 that made the preprocessor whine","fromName":"Pierre Habouzit","fromEmail":"madcoder@debian.org","sentAt":"2006-08-23T10:39:14Z","receivedAt":"2006-08-23T10:39:14Z","isPatch":true,"sender":{"key":"madcoder@debian.org","avatar":"https://avatars.githubusercontent.com/u/44708?v=4"},"body":"Signed-off-by: Pierre Habouzit \n---\n builtin-grep.c | 2 ++\n 1 files changed, 2 insertions(+), 0 deletions(-)\n\ndiff --git a/builtin-grep.c b/builtin-grep.c\nindex 0bd517b..3123494 100644\n--- a/builtin-grep.c\n+++ b/builtin-grep.c\n@@ -14,6 +14,8 @@ #include \n #include \n #include \n \n+#define DEBUG 0\n+\n /*\n * git grep pathspecs are somewhat different from diff-tree pathspecs;\n * pathname wildcards are allowed.\n-- \n1.4.1.1\n"},{"id":"25804","messageId":"1156329557424-git-send-email-madcoder@debian.org","threadId":"5364","inReplyTo":"11563295573035-git-send-email-madcoder@debian.org","subject":"[PATCH 6/7] use name[len] in switch directly, instead of creating a shadowed variable.","fromName":"Pierre Habouzit","fromEmail":"madcoder@debian.org","sentAt":"2006-08-23T10:39:15Z","receivedAt":"2006-08-23T10:39:15Z","isPatch":true,"sender":{"key":"madcoder@debian.org","avatar":"https://avatars.githubusercontent.com/u/44708?v=4"},"body":"Signed-off-by: Pierre Habouzit \n---\n builtin-apply.c | 4 +---\n 1 files changed, 1 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin-apply.c b/builtin-apply.c\nindex 5991737..f8f5eeb 100644\n--- a/builtin-apply.c\n+++ b/builtin-apply.c\n@@ -606,9 +606,7 @@ static char *git_header_name(char *line,\n \t * form.\n \t */\n \tfor (len = 0 ; ; len++) {\n-\t\tchar c = name[len];\n-\n-\t\tswitch (c) {\n+\t\tswitch (name[len]) {\n \t\tdefault:\n \t\t\tcontinue;\n \t\tcase '\\n':\n-- \n1.4.1.1\n"},{"id":"25803","messageId":"1156329557613-git-send-email-madcoder@debian.org","threadId":"5364","inReplyTo":"1156329557424-git-send-email-madcoder@debian.org","subject":"[PATCH 7/7] n is in fact unused, and is later shadowed.","fromName":"Pierre Habouzit","fromEmail":"madcoder@debian.org","sentAt":"2006-08-23T10:39:16Z","receivedAt":"2006-08-23T10:39:16Z","isPatch":true,"sender":{"key":"madcoder@debian.org","avatar":"https://avatars.githubusercontent.com/u/44708?v=4"},"body":"Signed-off-by: Pierre Habouzit \n---\n date.c | 5 ++---\n 1 files changed, 2 insertions(+), 3 deletions(-)\n\ndiff --git a/date.c b/date.c\nindex 66be23a..63d1d5b 100644\n--- a/date.c\n+++ b/date.c\n@@ -584,10 +584,9 @@ static const char *approxidate_alpha(con\n \tconst struct typelen *tl;\n \tconst struct special *s;\n \tconst char *end = date;\n-\tint n = 1, i;\n+\tint i;\n \n-\twhile (isalpha(*++end))\n-\t\tn++;\n+\twhile (isalpha(*++end));\n \n \tfor (i = 0; i < 12; i++) {\n \t\tint match = match_string(date, month_names[i]);\n-- \n1.4.1.1\n"}]}