{"thread":{"id":"8517","subject":"[RFC][PATCH 09/10] Sparse: fix some \"symbol 's' shadows an earlier one\" warnings","startedAt":"2007-06-08T22:25:48Z","lastAt":"2007-06-08T22:25:48Z","messageCount":1,"participants":["Ramsay Jones"],"isPatch":true,"patchVersion":1,"patchTotal":10},"messages":[{"id":"44396","messageId":"4669D76C.6060801@ramsay1.demon.co.uk","threadId":"8517","inReplyTo":null,"subject":"[RFC][PATCH 09/10] Sparse: fix some \"symbol 's' shadows an earlier one\" warnings","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsay1.demon.co.uk","sentAt":"2007-06-08T22:25:48Z","receivedAt":"2007-06-08T22:25:48Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nSigned-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>\n---\n builtin-apply.c         |   18 +++++++++---------\n builtin-blame.c         |    3 ++-\n builtin-diff.c          |    1 -\n builtin-fetch--tool.c   |    3 +--\n builtin-fmt-merge-msg.c |    2 +-\n builtin-for-each-ref.c  |   10 +++++-----\n builtin-fsck.c          |    7 +++----\n builtin-grep.c          |    6 +++---\n builtin-mailinfo.c      |   16 ++++++++--------\n builtin-pack-objects.c  |   10 +++++-----\n builtin-show-branch.c   |    8 +++++---\n combine-diff.c          |    2 +-\n config.c                |    4 ++--\n convert-objects.c       |   10 +++++-----\n daemon.c                |    1 -\n fetch-pack.c            |   16 ++++++++--------\n fetch.c                 |    6 +++---\n pack-check.c            |    9 ++++-----\n reflog-walk.c           |    6 +++---\n revision.c              |    4 ++--\n 20 files changed, 70 insertions(+), 72 deletions(-)\n\ndiff --git a/builtin-apply.c b/builtin-apply.c\nindex 0399743..5700d43 100644\n--- a/builtin-apply.c\n+++ b/builtin-apply.c\n@@ -1393,7 +1393,7 @@ static const char minuses[]= \"--------------------------------------------------\n \n static void show_stats(struct patch *patch)\n {\n-\tconst char *prefix = \"\";\n+\tconst char *intro = \"\";\n \tchar *name = patch->new_name;\n \tchar *qname = NULL;\n \tint len, max, add, del, total;\n@@ -1416,7 +1416,7 @@ static void show_stats(struct patch *patch)\n \t\tmax = 50;\n \tif (len > max) {\n \t\tchar *slash;\n-\t\tprefix = \"...\";\n+\t\tintro = \"...\";\n \t\tmax -= 3;\n \t\tname += len - max;\n \t\tslash = strchr(name, '/');\n@@ -1442,9 +1442,9 @@ static void show_stats(struct patch *patch)\n \t\tdel = total - add;\n \t}\n \tif (patch->is_binary)\n-\t\tprintf(\" %s%-*s |  Bin\\n\", prefix, len, name);\n+\t\tprintf(\" %s%-*s |  Bin\\n\", intro, len, name);\n \telse\n-\t\tprintf(\" %s%-*s |%5d %.*s%.*s\\n\", prefix,\n+\t\tprintf(\" %s%-*s |%5d %.*s%.*s\\n\", intro,\n \t\t       len, name, patch->lines_added + patch->lines_deleted,\n \t\t       add, pluses, del, minuses);\n \tfree(qname);\n@@ -1771,7 +1771,7 @@ static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag, i\n \t\t\toffset = -1;\n \t\tif (offset >= 0) {\n \t\t\tint diff = newsize - oldsize;\n-\t\t\tunsigned long size = desc->size + diff;\n+\t\t\tunsigned long buf_size = desc->size + diff;\n \t\t\tunsigned long alloc = desc->alloc;\n \n \t\t\t/* Warn if it was necessary to reduce the number\n@@ -1783,16 +1783,16 @@ static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag, i\n \t\t\t\t\t\" to apply fragment at %d\\n\",\n \t\t\t\t\tleading, trailing, pos + lines);\n \n-\t\t\tif (size > alloc) {\n-\t\t\t\talloc = size + 8192;\n+\t\t\tif (buf_size > alloc) {\n+\t\t\t\talloc = buf_size + 8192;\n \t\t\t\tdesc->alloc = alloc;\n \t\t\t\tbuf = xrealloc(buf, alloc);\n \t\t\t\tdesc->buffer = buf;\n \t\t\t}\n-\t\t\tdesc->size = size;\n+\t\t\tdesc->size = buf_size;\n \t\t\tmemmove(buf + offset + newsize,\n \t\t\t\tbuf + offset + oldsize,\n-\t\t\t\tsize - offset - newsize);\n+\t\t\t\tbuf_size - offset - newsize);\n \t\t\tmemcpy(buf + offset, newlines, newsize);\n \t\t\toffset = 0;\n \ndiff --git a/builtin-blame.c b/builtin-blame.c\nindex 35471fc..d4d11a7 100644\n--- a/builtin-blame.c\n+++ b/builtin-blame.c\n@@ -1185,7 +1185,7 @@ static void pass_blame(struct scoreboard *sb, struct origin *origin, int opt)\n \tint i, pass;\n \tstruct commit *commit = origin->commit;\n \tstruct commit_list *parent;\n-\tstruct origin *parent_origin[MAXPARENT], *porigin;\n+\tstruct origin *parent_origin[MAXPARENT];\n \n \tmemset(parent_origin, 0, sizeof(parent_origin));\n \n@@ -1201,6 +1201,7 @@ static void pass_blame(struct scoreboard *sb, struct origin *origin, int opt)\n \t\t     i < MAXPARENT && parent;\n \t\t     parent = parent->next, i++) {\n \t\t\tstruct commit *p = parent->item;\n+\t\t\tstruct origin *porigin;\n \t\t\tint j, same;\n \n \t\t\tif (parent_origin[i])\ndiff --git a/builtin-diff.c b/builtin-diff.c\nindex e00a212..6a1c116 100644\n--- a/builtin-diff.c\n+++ b/builtin-diff.c\n@@ -226,7 +226,6 @@ int cmd_diff(int argc, const char **argv, const char *prefix)\n \t * default to HEAD by hand.  Eek.\n \t */\n \tif (!rev.pending.nr) {\n-\t\tint i;\n \t\tfor (i = 1; i < argc; i++) {\n \t\t\tconst char *arg = argv[i];\n \t\t\tif (!strcmp(arg, \"--\"))\ndiff --git a/builtin-fetch--tool.c b/builtin-fetch--tool.c\nindex a1d51d0..3b2b952 100644\n--- a/builtin-fetch--tool.c\n+++ b/builtin-fetch--tool.c\n@@ -289,7 +289,7 @@ static int fetch_native_store(FILE *fp,\n \t\t\tcontinue;\n \t\tif (!strcmp(buffer, \"keep\")) {\n \t\t\tchar *od = get_object_directory();\n-\t\t\tint len = strlen(od) + strlen(cp) + 50;\n+\t\t\tlen = strlen(od) + strlen(cp) + 50;\n \t\t\tkeep = xmalloc(len);\n \t\t\tsprintf(keep, \"%s/pack/pack-%s.keep\", od, cp);\n \t\t\tcontinue;\n@@ -476,7 +476,6 @@ static int pick_rref(int sha1_only, const char *rref, const char *ls_remote_resu\n \twhile (1) {\n \t\tconst char *next;\n \t\tint rreflen;\n-\t\tint i;\n \n \t\twhile (*rref && isspace(*rref))\n \t\t\trref++;\ndiff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c\nindex 5c145d2..a8b9b5b 100644\n--- a/builtin-fmt-merge-msg.c\n+++ b/builtin-fmt-merge-msg.c\n@@ -138,7 +138,7 @@ static int handle_line(char *line)\n \t}\n \n \tif (!strcmp(\".\", src) || !strcmp(src, origin)) {\n-\t\tint len = strlen(origin);\n+\t\tlen = strlen(origin);\n \t\tif (origin[0] == '\\'' && origin[len - 1] == '\\'') {\n \t\t\tchar *new_origin = xmalloc(len - 1);\n \t\t\tmemcpy(new_origin, origin + 1, len - 2);\ndiff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c\nindex 3ca77b5..b74e5f9 100644\n--- a/builtin-for-each-ref.c\n+++ b/builtin-for-each-ref.c\n@@ -268,17 +268,17 @@ static void grab_commit_values(struct atom_value *val, int deref, struct object\n \t\t}\n \t\telse if (!strcmp(name, \"parent\")) {\n \t\t\tint num = num_parents(commit);\n-\t\t\tint i;\n+\t\t\tint j;\n \t\t\tstruct commit_list *parents;\n \t\t\tchar *s = xmalloc(42 * num);\n \t\t\tv->s = s;\n-\t\t\tfor (i = 0, parents = commit->parents;\n+\t\t\tfor (j = 0, parents = commit->parents;\n \t\t\t     parents;\n-\t\t\t     parents = parents->next, i = i + 42) {\n+\t\t\t     parents = parents->next, j = j + 42) {\n \t\t\t\tstruct commit *parent = parents->item;\n-\t\t\t\tstrcpy(s+i, sha1_to_hex(parent->object.sha1));\n+\t\t\t\tstrcpy(s+j, sha1_to_hex(parent->object.sha1));\n \t\t\t\tif (parents->next)\n-\t\t\t\t\ts[i+40] = ' ';\n+\t\t\t\t\ts[j+40] = ' ';\n \t\t\t}\n \t\t}\n \t}\ndiff --git a/builtin-fsck.c b/builtin-fsck.c\nindex 776a435..2a3890e 100644\n--- a/builtin-fsck.c\n+++ b/builtin-fsck.c\n@@ -669,9 +669,9 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)\n \t\t\tverify_pack(p, 0);\n \n \t\tfor (p = packed_git; p; p = p->next) {\n-\t\t\tuint32_t i, num = p->num_objects;\n-\t\t\tfor (i = 0; i < num; i++)\n-\t\t\t\tfsck_sha1(nth_packed_object_sha1(p, i));\n+\t\t\tuint32_t j, num = p->num_objects;\n+\t\t\tfor (j = 0; j < num; j++)\n+\t\t\t\tfsck_sha1(nth_packed_object_sha1(p, j));\n \t\t}\n \t}\n \n@@ -708,7 +708,6 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)\n \t}\n \n \tif (keep_cache_objects) {\n-\t\tint i;\n \t\tread_cache();\n \t\tfor (i = 0; i < active_nr; i++) {\n \t\t\tunsigned int mode;\ndiff --git a/builtin-grep.c b/builtin-grep.c\nindex e13cb31..84e346b 100644\n--- a/builtin-grep.c\n+++ b/builtin-grep.c\n@@ -275,10 +275,10 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached)\n \t\t\tcontinue;\n \t\tname = ce->name;\n \t\tif (name[0] == '-') {\n-\t\t\tint len = ce_namelen(ce);\n-\t\t\tname = xmalloc(len + 3);\n+\t\t\tint name_len = ce_namelen(ce);\n+\t\t\tname = xmalloc(name_len + 3);\n \t\t\tmemcpy(name, \"./\", 2);\n-\t\t\tmemcpy(name + 2, ce->name, len + 1);\n+\t\t\tmemcpy(name + 2, ce->name, name_len + 1);\n \t\t}\n \t\targv[argc++] = name;\n \t\tif (argc < MAXARGS && !ce_stage(ce))\ndiff --git a/builtin-mailinfo.c b/builtin-mailinfo.c\nindex c95e477..8df8984 100644\n--- a/builtin-mailinfo.c\n+++ b/builtin-mailinfo.c\n@@ -70,14 +70,14 @@ static int bogus_from(char *line)\n \n static int handle_from(char *in_line)\n {\n-\tchar line[1000];\n+\tchar from_line[1000];\n \tchar *at;\n \tchar *dst;\n \n-\tstrcpy(line, in_line);\n-\tat = strchr(line, '@');\n+\tstrcpy(from_line, in_line);\n+\tat = strchr(from_line, '@');\n \tif (!at)\n-\t\treturn bogus_from(line);\n+\t\treturn bogus_from(from_line);\n \n \t/*\n \t * If we already have one email, don't take any confusing lines\n@@ -88,7 +88,7 @@ static int handle_from(char *in_line)\n \t/* Pick up the string around '@', possibly delimited with <>\n \t * pair; that is the email part.  White them out while copying.\n \t */\n-\twhile (at > line) {\n+\twhile (at > from_line) {\n \t\tchar c = at[-1];\n \t\tif (isspace(c))\n \t\t\tbreak;\n@@ -116,8 +116,8 @@ static int handle_from(char *in_line)\n \t * email part, so trim from both ends, possibly removing\n \t * the () pair at the end.\n \t */\n-\tat = line + strlen(line);\n-\twhile (at > line) {\n+\tat = from_line + strlen(from_line);\n+\twhile (at > from_line) {\n \t\tunsigned char c = *--at;\n \t\tif (!isspace(c)) {\n \t\t\tat[(c == ')') ? 0 : 1] = 0;\n@@ -125,7 +125,7 @@ static int handle_from(char *in_line)\n \t\t}\n \t}\n \n-\tat = line;\n+\tat = from_line;\n \tfor (;;) {\n \t\tunsigned char c = *at;\n \t\tif (!c || !isspace(c)) {\ndiff --git a/builtin-pack-objects.c b/builtin-pack-objects.c\nindex 966f843..ccf583f 100644\n--- a/builtin-pack-objects.c\n+++ b/builtin-pack-objects.c\n@@ -1004,17 +1004,17 @@ static void add_pbase_object(struct tree_desc *tree,\n \t\t}\n \t\tif (S_ISDIR(entry.mode)) {\n \t\t\tstruct tree_desc sub;\n-\t\t\tstruct pbase_tree_cache *tree;\n+\t\t\tstruct pbase_tree_cache *t;\n \t\t\tconst char *down = name+cmplen+1;\n \t\t\tint downlen = name_cmp_len(down);\n \n-\t\t\ttree = pbase_tree_get(entry.sha1);\n-\t\t\tif (!tree)\n+\t\t\tt = pbase_tree_get(entry.sha1);\n+\t\t\tif (!t)\n \t\t\t\treturn;\n-\t\t\tinit_tree_desc(&sub, tree->tree_data, tree->tree_size);\n+\t\t\tinit_tree_desc(&sub, t->tree_data, t->tree_size);\n \n \t\t\tadd_pbase_object(&sub, down, downlen, fullname);\n-\t\t\tpbase_tree_put(tree);\n+\t\t\tpbase_tree_put(t);\n \t\t}\n \t}\n }\ndiff --git a/builtin-show-branch.c b/builtin-show-branch.c\nindex c892f1f..3ec3448 100644\n--- a/builtin-show-branch.c\n+++ b/builtin-show-branch.c\n@@ -875,9 +875,11 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)\n \tall_revs = all_mask & ~((1u << REV_SHIFT) - 1);\n \n \twhile (seen) {\n-\t\tstruct commit *commit = pop_one_commit(&seen);\n-\t\tint this_flag = commit->object.flags;\n-\t\tint is_merge_point = ((this_flag & all_revs) == all_revs);\n+\t\tint this_flag, is_merge_point;\n+\n+\t\tcommit = pop_one_commit(&seen);\n+\t\tthis_flag = commit->object.flags;\n+\t\tis_merge_point = ((this_flag & all_revs) == all_revs);\n \n \t\tshown_merge_point |= is_merge_point;\n \ndiff --git a/combine-diff.c b/combine-diff.c\nindex ea3ca5f..63ea310 100644\n--- a/combine-diff.c\n+++ b/combine-diff.c\n@@ -699,7 +699,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,\n \t\t\t !fstat(fd, &st)) {\n \t\t\tsize_t len = xsize_t(st.st_size);\n \t\t\tsize_t sz = 0;\n-\t\t\tint is_file, i;\n+\t\t\tint is_file;\n \n \t\t\telem->mode = canon_mode(st.st_mode);\n \t\t\t/* if symlinks don't work, assume symlink if all parents\ndiff --git a/config.c b/config.c\nindex 5754ec2..5e6a675 100644\n--- a/config.c\n+++ b/config.c\n@@ -152,7 +152,7 @@ static int get_extended_base_var(char *name, int baselen, int c)\n \tname[baselen++] = '.';\n \n \tfor (;;) {\n-\t\tint c = get_next_char();\n+\t\tc = get_next_char();\n \t\tif (c == '\\n')\n \t\t\treturn -1;\n \t\tif (c == '\"')\n@@ -753,7 +753,7 @@ int git_config_set_multivar(const char* key, const char* value,\n \t\tstruct stat st;\n \t\tchar* contents;\n \t\tsize_t contents_sz, copy_begin, copy_end;\n-\t\tint i, new_line = 0;\n+\t\tint new_line = 0;\n \n \t\tif (value_regex == NULL)\n \t\t\tstore.value_regex = NULL;\ndiff --git a/convert-objects.c b/convert-objects.c\nindex cefbceb..90aecc4 100644\n--- a/convert-objects.c\n+++ b/convert-objects.c\n@@ -180,15 +180,15 @@ static unsigned long parse_oldstyle_date(const char *buf)\n \t\t\t\treturn mktime(&tm);\n \t\t\tbuf = next;\n \t\t} else {\n-\t\t\tconst char **p = timezones;\n+\t\t\tconst char **t = timezones;\n \t\t\twhile (isspace(*buf))\n \t\t\t\tbuf++;\n-\t\t\twhile (*p) {\n-\t\t\t\tif (!memcmp(buf, *p, strlen(*p))) {\n-\t\t\t\t\tbuf += strlen(*p);\n+\t\t\twhile (*t) {\n+\t\t\t\tif (!memcmp(buf, *t, strlen(*t))) {\n+\t\t\t\t\tbuf += strlen(*t);\n \t\t\t\t\tbreak;\n \t\t\t\t}\n-\t\t\t\tp++;\n+\t\t\t\tt++;\n \t\t\t}\n \t\t}\n \t\tfmt++;\ndiff --git a/daemon.c b/daemon.c\nindex 9daa850..c09ab5c 100644\n--- a/daemon.c\n+++ b/daemon.c\n@@ -903,7 +903,6 @@ static int service_loop(int socknum, int *socklist)\n \tsignal(SIGCHLD, child_handler);\n \n \tfor (;;) {\n-\t\tint i;\n \n \t\tif (poll(pfd, socknum, -1) < 0) {\n \t\t\tif (errno != EINTR) {\ndiff --git a/fetch-pack.c b/fetch-pack.c\nindex 75649a6..fc1696e 100644\n--- a/fetch-pack.c\n+++ b/fetch-pack.c\n@@ -147,7 +147,7 @@ static int find_common(int fd[2], unsigned char *result_sha1,\n {\n \tint fetching;\n \tint count = 0, flushes = 0, retval;\n-\tconst unsigned char *sha1;\n+\tconst unsigned char *rev;\n \tunsigned in_vain = 0;\n \tint got_continue = 0;\n \n@@ -223,10 +223,10 @@ static int find_common(int fd[2], unsigned char *result_sha1,\n \n \tflushes = 0;\n \tretval = -1;\n-\twhile ((sha1 = get_rev())) {\n-\t\tpacket_write(fd[1], \"have %s\\n\", sha1_to_hex(sha1));\n+\twhile ((rev = get_rev())) {\n+\t\tpacket_write(fd[1], \"have %s\\n\", sha1_to_hex(rev));\n \t\tif (verbose)\n-\t\t\tfprintf(stderr, \"have %s\\n\", sha1_to_hex(sha1));\n+\t\t\tfprintf(stderr, \"have %s\\n\", sha1_to_hex(rev));\n \t\tin_vain++;\n \t\tif (!(31 & ++count)) {\n \t\t\tint ack;\n@@ -759,7 +759,7 @@ int main(int argc, char **argv)\n \tif (!ret && depth > 0) {\n \t\tstruct cache_time mtime;\n \t\tchar *shallow = git_path(\"shallow\");\n-\t\tint fd;\n+\t\tint lock_fd;\n \n \t\tmtime.sec = st.st_mtime;\n #ifdef USE_NSEC\n@@ -775,12 +775,12 @@ int main(int argc, char **argv)\n \t\t\t  )\n \t\t\tdie(\"shallow file was changed during fetch\");\n \n-\t\tfd = hold_lock_file_for_update(&lock, shallow, 1);\n-\t\tif (!write_shallow_commits(fd, 0)) {\n+\t\tlock_fd = hold_lock_file_for_update(&lock, shallow, 1);\n+\t\tif (!write_shallow_commits(lock_fd, 0)) {\n \t\t\tunlink(shallow);\n \t\t\trollback_lock_file(&lock);\n \t\t} else {\n-\t\t\tclose(fd);\n+\t\t\tclose(lock_fd);\n \t\t\tcommit_lock_file(&lock);\n \t\t}\n \t}\ndiff --git a/fetch.c b/fetch.c\nindex 8e29d31..c2742f5 100644\n--- a/fetch.c\n+++ b/fetch.c\n@@ -47,9 +47,9 @@ static int process_tree(struct tree *tree)\n \t\tstruct object *obj = NULL;\n \n \t\tif (S_ISDIR(entry.mode)) {\n-\t\t\tstruct tree *tree = lookup_tree(entry.sha1);\n-\t\t\tif (tree)\n-\t\t\t\tobj = &tree->object;\n+\t\t\tstruct tree *t = lookup_tree(entry.sha1);\n+\t\t\tif (t)\n+\t\t\t\tobj = &t->object;\n \t\t}\n \t\telse {\n \t\t\tstruct blob *blob = lookup_blob(entry.sha1);\ndiff --git a/pack-check.c b/pack-check.c\nindex d04536b..ef7179e 100644\n--- a/pack-check.c\n+++ b/pack-check.c\n@@ -7,7 +7,7 @@ static int verify_packfile(struct packed_git *p,\n \toff_t index_size = p->index_size;\n \tconst unsigned char *index_base = p->index_data;\n \tSHA_CTX ctx;\n-\tunsigned char sha1[20];\n+\tunsigned char pack_sha1[20];\n \toff_t offset = 0, pack_sig = p->pack_size - 20;\n \tuint32_t nr_objects, i;\n \tint err;\n@@ -27,11 +27,11 @@ static int verify_packfile(struct packed_git *p,\n \t\t\tremaining -= (unsigned int)(offset - pack_sig);\n \t\tSHA1_Update(&ctx, in, remaining);\n \t}\n-\tSHA1_Final(sha1, &ctx);\n-\tif (hashcmp(sha1, use_pack(p, w_curs, pack_sig, NULL)))\n+\tSHA1_Final(pack_sha1, &ctx);\n+\tif (hashcmp(pack_sha1, use_pack(p, w_curs, pack_sig, NULL)))\n \t\treturn error(\"Packfile %s SHA1 mismatch with itself\",\n \t\t\t     p->pack_name);\n-\tif (hashcmp(sha1, index_base + index_size - 40))\n+\tif (hashcmp(pack_sha1, index_base + index_size - 40))\n \t\treturn error(\"Packfile %s SHA1 mismatch with idx\",\n \t\t\t     p->pack_name);\n \tunuse_pack(w_curs);\n@@ -46,7 +46,6 @@ static int verify_packfile(struct packed_git *p,\n \t\tvoid *data;\n \t\tenum object_type type;\n \t\tunsigned long size;\n-\t\toff_t offset;\n \n \t\tsha1 = nth_packed_object_sha1(p, i);\n \t\tif (!sha1)\ndiff --git a/reflog-walk.c b/reflog-walk.c\nindex c983858..a2c1f17 100644\n--- a/reflog-walk.c\n+++ b/reflog-walk.c\n@@ -240,11 +240,11 @@ void fake_reflog_parent(struct reflog_walk_info *info, struct commit *commit)\n \tcommit->object.flags &= ~(ADDED | SEEN | SHOWN);\n }\n \n-void show_reflog_message(struct reflog_walk_info* info, int oneline,\n+void show_reflog_message(struct reflog_walk_info* winfo, int oneline,\n \tint relative_date)\n {\n-\tif (info && info->last_commit_reflog) {\n-\t\tstruct commit_reflog *commit_reflog = info->last_commit_reflog;\n+\tif (winfo && winfo->last_commit_reflog) {\n+\t\tstruct commit_reflog *commit_reflog = winfo->last_commit_reflog;\n \t\tstruct reflog_info *info;\n \n \t\tinfo = &commit_reflog->reflogs->items[commit_reflog->recno+1];\ndiff --git a/revision.c b/revision.c\nindex 1bfe80c..13b7b37 100644\n--- a/revision.c\n+++ b/revision.c\n@@ -79,9 +79,9 @@ void mark_tree_uninteresting(struct tree *tree)\n \ttree->buffer = NULL;\n }\n \n-void mark_parents_uninteresting(struct commit *commit)\n+void mark_parents_uninteresting(struct commit *c)\n {\n-\tstruct commit_list *parents = commit->parents;\n+\tstruct commit_list *parents = c->parents;\n \n \twhile (parents) {\n \t\tstruct commit *commit = parents->item;\n-- \n1.5.2\n"}]}