[PATCH] string-list.h: Add STRING_LIST_INIT macro and make use of it.
From: Thiago Farina <hidden>
Date: 2016-06-15 22:49:00
Subsystem:
the rest · Maintainer:
Linus Torvalds
Acked-by: Jonathan Nieder <redacted> Signed-off-by: Thiago Farina <redacted> --- builtin/fast-export.c | 2 +- builtin/fetch.c | 8 ++++---- builtin/receive-pack.c | 2 +- builtin/remote.c | 4 ++-- builtin/show-ref.c | 2 +- merge-recursive.c | 3 ++- remote.c | 4 ++-- string-list.h | 2 ++ 8 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index c6dd71a..89945bc 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c@@ -566,7 +566,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix) { struct rev_info revs; struct object_array commits = { 0, 0, NULL }; - struct string_list extra_refs = { NULL, 0, 0, 0 }; + struct string_list extra_refs = STRING_LIST_INIT; struct commit *commit; char *export_filename = NULL, *import_filename = NULL; struct option options[] = {
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 5cb369c..a16fb43 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c@@ -572,8 +572,8 @@ static void find_non_local_tags(struct transport *transport, struct ref **head, struct ref ***tail) { - struct string_list existing_refs = { NULL, 0, 0, 0 }; - struct string_list remote_refs = { NULL, 0, 0, 0 }; + struct string_list existing_refs = STRING_LIST_INIT; + struct string_list remote_refs = STRING_LIST_INIT; struct tag_data data; const struct ref *ref; struct string_list_item *item = NULL;
@@ -667,7 +667,7 @@ static int truncate_fetch_head(void) static int do_fetch(struct transport *transport, struct refspec *refs, int ref_count) { - struct string_list existing_refs = { NULL, 0, 0, 0 }; + struct string_list existing_refs = STRING_LIST_INIT; struct string_list_item *peer_item = NULL; struct ref *ref_map; struct ref *rm;
@@ -890,7 +890,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv) int cmd_fetch(int argc, const char **argv, const char *prefix) { int i; - struct string_list list = { NULL, 0, 0, 0 }; + struct string_list list = STRING_LIST_INIT; struct remote *remote; int result = 0;
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 29bc8d5..c40a4ba 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c@@ -530,7 +530,7 @@ static void check_aliased_update(struct command *cmd, struct string_list *list) static void check_aliased_updates(struct command *commands) { struct command *cmd; - struct string_list ref_list = { NULL, 0, 0, 0 }; + struct string_list ref_list = STRING_LIST_INIT; for (cmd = commands; cmd; cmd = cmd->next) { struct string_list_item *item =
diff --git a/builtin/remote.c b/builtin/remote.c
index 0a52667..9d41792 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c@@ -596,7 +596,7 @@ static int mv(int argc, const char **argv) }; struct remote *oldremote, *newremote; struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT, buf3 = STRBUF_INIT; - struct string_list remote_branches = { NULL, 0, 0, 0 }; + struct string_list remote_branches = STRING_LIST_INIT; struct rename_info rename; int i;
@@ -1044,7 +1044,7 @@ static int show(int argc, const char **argv) OPT_END() }; struct ref_states states; - struct string_list info_list = { NULL, 0, 0, 0 }; + struct string_list info_list = STRING_LIST_INIT; struct show_info info; argc = parse_options(argc, argv, NULL, options, builtin_remote_show_usage,
diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 17ada88..25c280a 100644
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c@@ -120,7 +120,7 @@ static int add_existing(const char *refname, const unsigned char *sha1, int flag */ static int exclude_existing(const char *match) { - static struct string_list existing_refs = { NULL, 0, 0, 0 }; + static struct string_list existing_refs = STRING_LIST_INIT; char buf[1024]; int matchlen = match ? strlen(match) : 0;
diff --git a/merge-recursive.c b/merge-recursive.c
index 206c103..e9a5513 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c@@ -806,7 +806,8 @@ static int process_renames(struct merge_options *o, struct string_list *b_renames) { int clean_merge = 1, i, j; - struct string_list a_by_dst = {NULL, 0, 0, 0}, b_by_dst = {NULL, 0, 0, 0}; + struct string_list a_by_dst = STRING_LIST_INIT; + struct string_list b_by_dst = STRING_LIST_INIT; const struct rename *sre; for (i = 0; i < a_renames->nr; i++) {
diff --git a/remote.c b/remote.c
index e51cd22..059d757 100644
--- a/remote.c
+++ b/remote.c@@ -754,7 +754,7 @@ int for_each_remote(each_remote_fn fn, void *priv) void ref_remove_duplicates(struct ref *ref_map) { - struct string_list refs = { NULL, 0, 0, 0 }; + struct string_list refs = STRING_LIST_INIT; struct string_list_item *item = NULL; struct ref *prev = NULL, *next = NULL; for (; ref_map; prev = ref_map, ref_map = next) {
@@ -1704,7 +1704,7 @@ static int get_stale_heads_cb(const char *refname, struct ref *get_stale_heads(struct remote *remote, struct ref *fetch_map) { struct ref *ref, *stale_refs = NULL; - struct string_list ref_names = { NULL, 0, 0, 0 }; + struct string_list ref_names = STRING_LIST_INIT; struct stale_heads_info info; info.remote = remote; info.ref_names = &ref_names;
diff --git a/string-list.h b/string-list.h
index 63b69c8..037d058 100644
--- a/string-list.h
+++ b/string-list.h@@ -12,6 +12,8 @@ struct string_list unsigned int strdup_strings:1; }; +#define STRING_LIST_INIT { NULL, 0, 0, 0 } + void print_string_list(const char *text, const struct string_list *p); void string_list_clear(struct string_list *list, int free_util);
--
1.7.1.576.gef57c