Re: [PATCH] merge-recursive: use STRING_LIST_INIT_NODUP

[Johannes Schindelin]

Hi René,

On Fri, 5 Aug 2016, René Scharfe wrote:

> 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.

Thank you! I guess I never updated the code after the _INIT* macros were
introduced.

The change is good, of course.

Thanks,
Dscho

[PATCH] merge-recursive: use STRING_LIST_INIT_NODUP

[René Scharfe]

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 
---
 merge-recursive.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/merge-recursive.c b/merge-recursive.c
index a4a1195..97e6737 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -409,7 +409,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.
 */
-   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;
@@ -422,7 +422,6 @@ static void record_df_conflict_files(struct merge_options 
*o,
return;
 
/* Ensure D/F conflicts are adjacent in the entries list. */
-   memset(_sorted_entries, 0, sizeof(struct string_list));
for (i = 0; i < entries->nr; i++) {
struct string_list_item *next = >items[i];
string_list_append(_sorted_entries, next->string)->util =
-- 
2.9.2

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html