summaryrefslogtreecommitdiffstats
path: root/string-list.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-07-16 17:42:52 -0700
committerJunio C Hamano <gitster@pobox.com>2021-07-16 17:42:53 -0700
commitbd4232fac3319890429ec303e2f7c3d287c8eaa3 (patch)
treeb5032aca9cdafb5812801f2868cabddc23e2052a /string-list.h
parent832a239b72779e97b09943d77b9097ed8376e18e (diff)
parentbc40dfb10a06612813a3f9b733d65af0732208b2 (diff)
downloadgit-bd4232fac3319890429ec303e2f7c3d287c8eaa3.tar.gz
git-bd4232fac3319890429ec303e2f7c3d287c8eaa3.zip
Merge branch 'ab/struct-init'
Code cleanup around struct_type_init() functions. * ab/struct-init: string-list.h users: change to use *_{nodup,dup}() string-list.[ch]: add a string_list_init_{nodup,dup}() dir.[ch]: replace dir_init() with DIR_INIT *.c *_init(): define in terms of corresponding *_INIT macro *.h: move some *_INIT to designated initializers
Diffstat (limited to 'string-list.h')
-rw-r--r--string-list.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/string-list.h b/string-list.h
index 6c5d274126..0d6b469239 100644
--- a/string-list.h
+++ b/string-list.h
@@ -91,14 +91,21 @@ struct string_list {
compare_strings_fn cmp; /* NULL uses strcmp() */
};
-#define STRING_LIST_INIT_NODUP { NULL, 0, 0, 0, NULL }
-#define STRING_LIST_INIT_DUP { NULL, 0, 0, 1, NULL }
+#define STRING_LIST_INIT_NODUP { 0 }
+#define STRING_LIST_INIT_DUP { .strdup_strings = 1 }
/* General functions which work with both sorted and unsorted lists. */
/**
- * Initialize the members of the string_list, set `strdup_strings`
- * member according to the value of the second parameter.
+ * Initialize the members of a string_list pointer in the same way as
+ * the corresponding `STRING_LIST_INIT_NODUP` and
+ * `STRING_LIST_INIT_DUP` macros.
+ */
+void string_list_init_nodup(struct string_list *list);
+void string_list_init_dup(struct string_list *list);
+
+/**
+ * TODO remove: For compatibility with any in-flight older API users
*/
void string_list_init(struct string_list *list, int strdup_strings);