[PATCH v2 1/2] string-list: Add string_list initializer helper functions
- From
Tanay Abhra <tanayabh@gmail.com>
- Date
- Jun 16, 2014, 08:27 UTC
- Message-ID
- <1402907232-24629-2-git-send-email-tanayabh@gmail.com>
- In-Reply-To
- <1402907232-24629-1-git-send-email-tanayabh@gmail.com>
When a compound construct like a string_list within another struct is used, the default initializer macros are useless. For such cases add helper functions for string_list initialization for both DUP and NODUP modes.
Signed-off-by: Tanay Abhra <tanayabh@gmail.com> --- string-list.c | 18 ++++++++++++++++++ string-list.h | 3 +++ 2 files changed, 21 insertions(+)
diff --git a/string-list.c b/string-list.c index aabb25e..8c3a4eb 100644 --- a/string-list.c +++ b/string-list.c @@ -1,6 +1,24 @@ #include "cache.h" #include "string-list.h" +void string_list_init_nodup(struct string_list *list) +{ + list->items = NULL; + list->nr = 0; + list->alloc = 0; + list->strdup_strings = 0; + list->cmp = NULL; +} + +void string_list_init_dup(struct string_list *list) +{ + list->items = NULL; + list->nr = 0; + list->alloc = 0; + list->strdup_strings = 1; + list->cmp = NULL; +} + /* if there is no exact match, point to the index where the entry could be * inserted */ static int get_entry_index(const struct string_list *list, const char *string, diff --git a/string-list.h b/string-list.h index de6769c..8ae3376 100644 --- a/string-list.h +++ b/string-list.h @@ -18,6 +18,9 @@ struct string_list { #define STRING_LIST_INIT_NODUP { NULL, 0, 0, 0 } #define STRING_LIST_INIT_DUP { NULL, 0, 0, 1 } +void string_list_init_nodup(struct string_list *list); +void string_list_init_dup(struct string_list *list); + void print_string_list(const struct string_list *p, const char *text); void string_list_clear(struct string_list *list, int free_util);
-- 1.9.0.GIT