From 3826902d25febf61274925d6f12cc7471ba3c38f Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Sat, 25 May 2013 11:08:12 +0200 Subject: find_first_merges(): initialize merges variable using initializer Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- submodule.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'submodule.c') diff --git a/submodule.c b/submodule.c index e728025f60..b837c04ee2 100644 --- a/submodule.c +++ b/submodule.c @@ -846,7 +846,7 @@ static int find_first_merges(struct object_array *result, const char *path, struct commit *a, struct commit *b) { int i, j; - struct object_array merges; + struct object_array merges = OBJECT_ARRAY_INIT; struct commit *commit; int contains_another; @@ -856,7 +856,6 @@ static int find_first_merges(struct object_array *result, const char *path, struct rev_info revs; struct setup_revision_opt rev_opts; - memset(&merges, 0, sizeof(merges)); memset(result, 0, sizeof(struct object_array)); memset(&rev_opts, 0, sizeof(rev_opts)); -- cgit v1.2.1 From 5de0c0155c824803a7ee39326b09eeb93e9ec899 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Sat, 25 May 2013 11:08:13 +0200 Subject: find_first_merges(): remove unnecessary code No names are ever set for the object_array_entries in merges, so there is no need to pretend to copy them to the result array. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- submodule.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'submodule.c') diff --git a/submodule.c b/submodule.c index b837c04ee2..ad476ce5fb 100644 --- a/submodule.c +++ b/submodule.c @@ -893,8 +893,7 @@ static int find_first_merges(struct object_array *result, const char *path, } if (!contains_another) - add_object_array(merges.objects[i].item, - merges.objects[i].name, result); + add_object_array(merges.objects[i].item, NULL, result); } free(merges.objects); -- cgit v1.2.1