merge-recursive: use STRING_LIST_INIT_NODUP

Initialize a string_list right when it's defined.  That's shorter, saves
a function call and makes it more obvious that we're using the NODUP
variant here.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-recursive.c b/merge-recursive.c
index 65cb5d6c1f59d635e44a0fea648e39a976c0eaf0..3bba90850f3ee2a27860653e5d08a676820234c7 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -400,7 +400,7 @@ static void record_df_conflict_files(struct merge_options *o,
         * and the file need to be present, then the D/F file will be
         * reinstated with a new unique name at the time it is processed.
         */
         * and the file need to be present, then the D/F file will be
         * reinstated with a new unique name at the time it is processed.
         */

-       struct string_list df_sorted_entries;
+       struct string_list df_sorted_entries = STRING_LIST_INIT_NODUP;

        const char *last_file = NULL;
        int last_len = 0;
        int i;
        const char *last_file = NULL;
        int last_len = 0;
        int i;


@@ -413,7 +413,6 @@ static void record_df_conflict_files(struct merge_options *o,
                return;
 
        /* Ensure D/F conflicts are adjacent in the entries list. */
                return;
 
        /* Ensure D/F conflicts are adjacent in the entries list. */

-       memset(&df_sorted_entries, 0, sizeof(struct string_list));

        for (i = 0; i < entries->nr; i++) {
                struct string_list_item *next = &entries->items[i];
                string_list_append(&df_sorted_entries, next->string)->util =
        for (i = 0; i < entries->nr; i++) {
                struct string_list_item *next = &entries->items[i];
                string_list_append(&df_sorted_entries, next->string)->util =