diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-04-13 23:01:32 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-04-14 09:56:08 +0300 |
| commit | f2605051427af9fceaacb4a9d0effc6e2b0af227 (patch) | |
| tree | dcd1e9e12fb9576ddf6a7095ec47a884f4311d8b /builtin/shortlog.c | |
| parent | 4b59b2db97af0b40fc2688069c3a91ba28f8883d (diff) | |
string_list API users: use string_list_init_{no,}dup
Follow-up on the introduction of string_list_init_nodup() and
string_list_init_dup() in the series merged in bd4232fac33 (Merge
branch 'ab/struct-init', 2021-07-16) and convert code that implicitly
relied on xcalloc() being equivalent to the initializer to use
xmalloc() and string_list_init_{no,}dup() instead.
In the case of get_unmerged() in merge-recursive.c we used the
combination of xcalloc() and assigning "1" to "strdup_strings" to get
what we'd get via string_list_init_dup(), let's use that instead.
Adjacent code in cmd_format_patch() will be changed in a subsequent
commit, since we're changing that let's change the other in-tree
patterns that do the same. Let's also convert a "x == NULL" to "!x"
per our CodingGuidelines, as we need to change the "if" line anyway.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/shortlog.c')
| -rw-r--r-- | builtin/shortlog.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/shortlog.c b/builtin/shortlog.c index 26c5c0cf93..fcde07c936 100644 --- a/builtin/shortlog.c +++ b/builtin/shortlog.c @@ -81,8 +81,10 @@ static void insert_one_record(struct shortlog *log, format_subject(&subject, oneline, " "); buffer = strbuf_detach(&subject, NULL); - if (item->util == NULL) - item->util = xcalloc(1, sizeof(struct string_list)); + if (!item->util) { + item->util = xmalloc(sizeof(struct string_list)); + string_list_init_nodup(item->util); + } string_list_append(item->util, buffer); } } |