[PATCH v11 2/4] replace memset with string-list initializers
- From
Tanay Abhra <tanayabh@gmail.com>
- Date
- Jul 19, 2014, 05:46 UTC
- Message-ID
- <1405748778-3755-3-git-send-email-tanayabh@gmail.com>
- In-Reply-To
- <1405748778-3755-1-git-send-email-tanayabh@gmail.com>
Using memset and then manually setting values of the string-list members is not future proof as the internal representation of string-list may change any time. Use `string_list_init()` or STRING_LIST_INIT_* macros instead of memset.
Signed-off-by: Tanay Abhra <tanayabh@gmail.com> --- builtin/commit.c | 3 +-- merge-recursive.c | 9 +++------ submodule.c | 5 +---- transport.c | 4 +--- 4 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c index 72eb3be..5b196ca 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -420,8 +420,7 @@ static char *prepare_index(int argc, const char **argv, const char *prefix, die(_("cannot do a partial commit during a cherry-pick.")); } - memset(&partial, 0, sizeof(partial)); - partial.strdup_strings = 1; + string_list_init(&partial, 1); if (list_paths(&partial, !current_head ? NULL : "HEAD", prefix, &pathspec)) exit(1); diff --git a/merge-recursive.c b/merge-recursive.c index 5814d05..1d332b8 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2059,12 +2059,9 @@ void init_merge_options(struct merge_options *o) if (o->verbosity >= 5) o->buffer_output = 0; strbuf_init(&o->obuf, 0); - memset(&o->current_file_set, 0, sizeof(struct string_list)); - o->current_file_set.strdup_strings = 1; - memset(&o->current_directory_set, 0, sizeof(struct string_list)); - o->current_directory_set.strdup_strings = 1; - memset(&o->df_conflict_file_set, 0, sizeof(struct string_list)); - o->df_conflict_file_set.strdup_strings = 1; + string_list_init(&o->current_file_set, 1); + string_list_init(&o->current_directory_set, 1); + string_list_init(&o->df_conflict_file_set, 1); } int parse_merge_opt(struct merge_options *o, const char *s) diff --git a/submodule.c b/submodule.c index 48e3b44..c3a61e7 100644 --- a/submodule.c +++ b/submodule.c @@ -544,10 +544,7 @@ static int push_submodule(const char *path) int push_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name) { int i, ret = 1; - struct string_list needs_pushing; - - memset(&needs_pushing, 0, sizeof(struct string_list)); - needs_pushing.strdup_strings = 1; + struct string_list needs_pushing = STRING_LIST_INIT_DUP; if (!find_unpushed_submodules(new_sha1, remotes_name, &needs_pushing)) return 1; diff --git a/transport.c b/transport.c index 59c9727..d32aaf2 100644 --- a/transport.c +++ b/transport.c @@ -1188,10 +1188,8 @@ int transport_push(struct transport *transport, if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND | TRANSPORT_RECURSE_SUBMODULES_CHECK)) && !is_bare_repository()) { struct ref *ref = remote_refs; - struct string_list needs_pushing; + struct string_list needs_pushing = STRING_LIST_INIT_DUP; - memset(&needs_pushing, 0, sizeof(struct string_list)); - needs_pushing.strdup_strings = 1; for (; ref; ref = ref->next) if (!is_null_sha1(ref->new_sha1) && find_unpushed_submodules(ref->new_sha1,
-- 1.9.0.GIT