Re: [PATCH v10 1/4] string-list: add string_list initializer helper function
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 18, 2014, 17:15 UTC
- Message-ID
- <xmqqvbqumvvg.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <1405675142-20300-2-git-send-email-tanayabh@gmail.com>
Tanay Abhra <tanayabh@gmail.com> writes:
Show 8 quoted lines
> The string-list API has STRING_LIST_INIT_* macros to be used > to define variables with initializers, but lacks functions > to initialise an uninitialized piece of memory to be used as > a string-list at the run-time. > Introduce `string_list_init()` function for that. > > Signed-off-by: Tanay Abhra <tanayabh@gmail.com> > ---
Looks sensible, modulo s/initialise/initialize/ which perhaps is originally my fault.
Will queue; thanks.
Show 50 quoted lines
> Documentation/technical/api-string-list.txt | 5 +++++
> string-list.c | 6 ++++++
> string-list.h | 2 ++
> 3 files changed, 13 insertions(+)
>
> diff --git a/Documentation/technical/api-string-list.txt b/Documentation/technical/api-string-list.txt
> index f1add51..d51a657 100644
> --- a/Documentation/technical/api-string-list.txt
> +++ b/Documentation/technical/api-string-list.txt
> @@ -68,6 +68,11 @@ Functions
>
> * General ones (works with sorted and unsorted lists as well)
>
> +`string_list_init`::
> +
> + Initialize the members of the string_list, set `strdup_strings`
> + member according to the value of the second parameter.
> +
> `filter_string_list`::
>
> Apply a function to each item in a list, retaining only the
> diff --git a/string-list.c b/string-list.c
> index aabb25e..db38b62 100644
> --- a/string-list.c
> +++ b/string-list.c
> @@ -1,6 +1,12 @@
> #include "cache.h"
> #include "string-list.h"
>
> +void string_list_init(struct string_list *list, int strdup_strings)
> +{
> + memset(list, 0, sizeof(*list));
> + list->strdup_strings = strdup_strings;
> +}
> +
> /* 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 dd5e294..494eb5d 100644
> --- a/string-list.h
> +++ b/string-list.h
> @@ -18,6 +18,8 @@ struct string_list {
> #define STRING_LIST_INIT_NODUP { NULL, 0, 0, 0, NULL }
> #define STRING_LIST_INIT_DUP { NULL, 0, 0, 1, NULL }
>
> +void string_list_init(struct string_list *list, int strdup_strings);
> +
> void print_string_list(const struct string_list *p, const char *text);
> void string_list_clear(struct string_list *list, int free_util);