submodule.c: use the ARRAY_SIZE macro
authorElia Pinto <gitter.spiros@gmail.com>
Fri, 27 Jun 2014 12:11:39 +0000 (05:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Jun 2014 20:39:23 +0000 (13:39 -0700)
Use the ARRAY_SIZE macro to get the number
of elements in an array.

Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
submodule.c
index b80ecacf60dc87025336b6b6d6a51acc9321f429..48e3b44e219dffec6f435f0f25f1b74409fa29a9 100644 (file)
@@ -965,7 +965,7 @@ static int find_first_merges(struct object_array *result, const char *path,
                        sha1_to_hex(a->object.sha1));
        init_revisions(&revs, NULL);
        rev_opts.submodule = path;
-       setup_revisions(sizeof(rev_args)/sizeof(char *)-1, rev_args, &revs, &rev_opts);
+       setup_revisions(ARRAY_SIZE(rev_args)-1, rev_args, &revs, &rev_opts);
 
        /* save all revisions from the above list that contain b */
        if (prepare_revision_walk(&revs))