From 026f09e79689f99f573b8399443e8c4ffa84a794 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Sat, 25 May 2013 11:08:05 +0200 Subject: [PATCH] cmd_diff(): rename local variable "list" -> "entry" It's not a list, it's an array entry. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- builtin/diff.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/diff.c b/builtin/diff.c index 661fdde4d5..84243d9956 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -339,9 +339,9 @@ int cmd_diff(int argc, const char **argv, const char *prefix) } for (i = 0; i < rev.pending.nr; i++) { - struct object_array_entry *list = rev.pending.objects+i; - struct object *obj = list->item; - const char *name = list->name; + struct object_array_entry *entry = &rev.pending.objects[i]; + struct object *obj = entry->item; + const char *name = entry->name; int flags = (obj->flags & UNINTERESTING); if (!obj->parsed) obj = parse_object(obj->sha1); @@ -360,7 +360,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix) die(_("more than two blobs given: '%s'"), name); hashcpy(blob[blobs].sha1, obj->sha1); blob[blobs].name = name; - blob[blobs].mode = list->mode; + blob[blobs].mode = entry->mode; blobs++; continue; -- 2.11.4.GIT