| Message ID | patch-2.2-5d8baa9cbc4-20220721T063543Z-avarab@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | string_list API users: use alloc + init, not calloc + strdup_strings | expand |
On Wed, Jul 20, 2022 at 11:39 PM Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote: > > Convert various code that didn't use string_list_init_*() to do so, in > cases where the only thing being allocated was the string list we can > change from CALLOC_ARRAY() to ALLOC_ARRAY(), the string_list_init_*() > function will zero out the memory. > > This covers cases that weren't matched by tho coccinelle rule in the s/tho/the/ ? > preceding commit, which is conservative enough to care about the type > of what we're modifying. > > Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> > --- > notes-utils.c | 4 ++-- > reflog-walk.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/notes-utils.c b/notes-utils.c > index d7d18e30f5a..73559d24ec8 100644 > --- a/notes-utils.c > +++ b/notes-utils.c > @@ -129,8 +129,8 @@ struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd) > c->cmd = cmd; > c->enabled = 1; > c->combine = combine_notes_concatenate; > - CALLOC_ARRAY(c->refs, 1); > - c->refs->strdup_strings = 1; > + ALLOC_ARRAY(c->refs, 1); > + string_list_init_dup(c->refs); But c->refs is a struct string_list *; why doesn't cocci recognize this one and convert it? > c->refs_from_env = 0; > c->mode_from_env = 0; > if (rewrite_mode_env) { > diff --git a/reflog-walk.c b/reflog-walk.c > index 7aa6595a51f..2b17408f9a4 100644 > --- a/reflog-walk.c > +++ b/reflog-walk.c > @@ -120,7 +120,7 @@ struct reflog_walk_info { > void init_reflog_walk(struct reflog_walk_info **info) > { > CALLOC_ARRAY(*info, 1); > - (*info)->complete_reflogs.strdup_strings = 1; > + string_list_init_dup(&((*info)->complete_reflogs)); Makes sense. > } > > void reflog_walk_info_release(struct reflog_walk_info *info) > -- > 2.37.1.1095.g64a1e8362fd >
diff --git a/notes-utils.c b/notes-utils.c index d7d18e30f5a..73559d24ec8 100644 --- a/notes-utils.c +++ b/notes-utils.c @@ -129,8 +129,8 @@ struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd) c->cmd = cmd; c->enabled = 1; c->combine = combine_notes_concatenate; - CALLOC_ARRAY(c->refs, 1); - c->refs->strdup_strings = 1; + ALLOC_ARRAY(c->refs, 1); + string_list_init_dup(c->refs); c->refs_from_env = 0; c->mode_from_env = 0; if (rewrite_mode_env) { diff --git a/reflog-walk.c b/reflog-walk.c index 7aa6595a51f..2b17408f9a4 100644 --- a/reflog-walk.c +++ b/reflog-walk.c @@ -120,7 +120,7 @@ struct reflog_walk_info { void init_reflog_walk(struct reflog_walk_info **info) { CALLOC_ARRAY(*info, 1); - (*info)->complete_reflogs.strdup_strings = 1; + string_list_init_dup(&((*info)->complete_reflogs)); } void reflog_walk_info_release(struct reflog_walk_info *info)
Convert various code that didn't use string_list_init_*() to do so, in cases where the only thing being allocated was the string list we can change from CALLOC_ARRAY() to ALLOC_ARRAY(), the string_list_init_*() function will zero out the memory. This covers cases that weren't matched by tho coccinelle rule in the preceding commit, which is conservative enough to care about the type of what we're modifying. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- notes-utils.c | 4 ++-- reflog-walk.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)