diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-16 12:18:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-16 12:18:55 -0700 |
| commit | c6d3abbf994aaef6c56512f2afe2236310e08e39 (patch) | |
| tree | 78caa8a86a2bb1b14c493e3f4b4caf9b483d2012 | |
| parent | Merge branch 'jm/dedup-test-config' (diff) | |
| parent | string-list: spell all values out that are given to a string_list initializer (diff) | |
| download | tgif-c6d3abbf994aaef6c56512f2afe2236310e08e39.tar.xz | |
Merge branch 'ta/string-list-init'
* ta/string-list-init:
string-list: spell all values out that are given to a string_list initializer
| -rw-r--r-- | Documentation/technical/api-string-list.txt | 2 | ||||
| -rw-r--r-- | string-list.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/technical/api-string-list.txt b/Documentation/technical/api-string-list.txt index 20be348834..f1add51efe 100644 --- a/Documentation/technical/api-string-list.txt +++ b/Documentation/technical/api-string-list.txt @@ -200,3 +200,5 @@ Represents the list itself. You should not tamper with it. . Setting the `strdup_strings` member to 1 will strdup() the strings before adding them, see above. +. The `compare_strings_fn` member is used to specify a custom compare + function, otherwise `strcmp()` is used as the default function. diff --git a/string-list.h b/string-list.h index de6769c92d..dd5e294465 100644 --- a/string-list.h +++ b/string-list.h @@ -15,8 +15,8 @@ struct string_list { compare_strings_fn cmp; /* NULL uses strcmp() */ }; -#define STRING_LIST_INIT_NODUP { NULL, 0, 0, 0 } -#define STRING_LIST_INIT_DUP { NULL, 0, 0, 1 } +#define STRING_LIST_INIT_NODUP { NULL, 0, 0, 0, NULL } +#define STRING_LIST_INIT_DUP { NULL, 0, 0, 1, NULL } void print_string_list(const struct string_list *p, const char *text); void string_list_clear(struct string_list *list, int free_util); |