use string_list initializer consistently

There are two types of string_lists: those that own the
string memory, and those that don't. You can tell the
difference by the strdup_strings flag, and one should use
either STRING_LIST_INIT_DUP, or STRING_LIST_INIT_NODUP as an
initializer.

Historically, the normal all-zeros initialization has
corresponded to the NODUP case. Many sites use no
initializer at all, and that works as a shorthand for that
case. But for a reader of the code, it can be hard to
remember which is which. Let's be more explicit and actually
have each site declare which type it means to use.

This is a fairly mechanical conversion; I assumed each site
was correct as-is, and just switched them all to NODUP.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/apply.c b/builtin/apply.c
index 8e4da2e1bdaf02590289f54750a9602281f4a365..955af4db6cc11321cae85bf320ea25fb1220d4d6 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -270,7 +270,7 @@ struct image {
  * the case where more than one patches touch the same file.
  */
 
  * the case where more than one patches touch the same file.
  */
 

-static struct string_list fn_table;
+static struct string_list fn_table = STRING_LIST_INIT_NODUP;

 
 static uint32_t hash_line(const char *cp, size_t len)
 {
 
 static uint32_t hash_line(const char *cp, size_t len)
 {


@@ -1936,7 +1936,7 @@ static void prefix_patch(struct patch *p)
  * include/exclude
  */
 
  * include/exclude
  */
 

-static struct string_list limit_by_name;
+static struct string_list limit_by_name = STRING_LIST_INIT_NODUP;

 static int has_include;
 static void add_name_limit(const char *name, int exclude)
 {
 static int has_include;
 static void add_name_limit(const char *name, int exclude)
 {


@@ -3582,7 +3582,7 @@ static int check_to_create(const char *new_name, int ok_if_exists)
  * it is perfectly fine, as the patch removes a/b to make room
  * to create a directory a/b so that a/b/c can be created.
  */
  * it is perfectly fine, as the patch removes a/b to make room
  * to create a directory a/b so that a/b/c can be created.
  */

-static struct string_list symlink_changes;
+static struct string_list symlink_changes = STRING_LIST_INIT_NODUP;

 #define SYMLINK_GOES_AWAY 01
 #define SYMLINK_IN_RESULT 02
 
 #define SYMLINK_GOES_AWAY 01
 #define SYMLINK_IN_RESULT 02
 

diff --git a/builtin/blame.c b/builtin/blame.c
index 80d24315b3ae3b7bbf3674356673b1af37fc4084..de701536851662f9d9b3c8e88dd4d80e7e866800 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -56,7 +56,7 @@ static int show_progress;
 static struct date_mode blame_date_mode = { DATE_ISO8601 };
 static size_t blame_date_width;
 
 static struct date_mode blame_date_mode = { DATE_ISO8601 };
 static size_t blame_date_width;
 

-static struct string_list mailmap;
+static struct string_list mailmap = STRING_LIST_INIT_NODUP;

 
 #ifndef DEBUG
 #define DEBUG 0
 
 #ifndef DEBUG
 #define DEBUG 0

diff --git a/builtin/clone.c b/builtin/clone.c
index 5f867e67d8066fe70fdd67c3d8e2853ea6c3eaa1..70d8213472d10ee269d538b23bdd5ea945abeb52 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -49,8 +49,8 @@ static char *option_upload_pack = "git-upload-pack";
 static int option_verbosity;
 static int option_progress = -1;
 static enum transport_family family;
 static int option_verbosity;
 static int option_progress = -1;
 static enum transport_family family;

-static struct string_list option_config;
-static struct string_list option_reference;
+static struct string_list option_config = STRING_LIST_INIT_NODUP;
+static struct string_list option_reference = STRING_LIST_INIT_NODUP;

 static int option_dissociate;
 static int max_jobs = -1;
 
 static int option_dissociate;
 static int max_jobs = -1;
 

diff --git a/builtin/log.c b/builtin/log.c
index dff3fbbb437c462e51544dbf1d4781c550a14d1a..c11bd66f3930818f4bacf88bea26e24bc5fbe245 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -674,9 +674,9 @@ static int auto_number = 1;
 
 static char *default_attach = NULL;
 
 
 static char *default_attach = NULL;
 

-static struct string_list extra_hdr;
-static struct string_list extra_to;
-static struct string_list extra_cc;
+static struct string_list extra_hdr = STRING_LIST_INIT_NODUP;
+static struct string_list extra_to = STRING_LIST_INIT_NODUP;
+static struct string_list extra_cc = STRING_LIST_INIT_NODUP;

 
 static void add_header(const char *value)
 {
 
 static void add_header(const char *value)
 {

diff --git a/builtin/remote.c b/builtin/remote.c
index fda5c2e53d28ae84f4876ca77ac9fefebee9ada2..e1cc55e13c34b806f68fec5ee476dc3345fd2e8d 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -247,7 +247,7 @@ struct branch_info {
        enum { NO_REBASE, NORMAL_REBASE, INTERACTIVE_REBASE } rebase;
 };
 
        enum { NO_REBASE, NORMAL_REBASE, INTERACTIVE_REBASE } rebase;
 };
 

-static struct string_list branch_list;
+static struct string_list branch_list = STRING_LIST_INIT_NODUP;

 
 static const char *abbrev_ref(const char *name, const char *prefix)
 {
 
 static const char *abbrev_ref(const char *name, const char *prefix)
 {

diff --git a/notes.c b/notes.c
index e4e4854d69fb965e68a712dd342121d3276be945..df4660fe62ae64356950ca51c1acead0398f93f1 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -70,7 +70,7 @@ struct non_note {
 
 struct notes_tree default_notes_tree;
 
 
 struct notes_tree default_notes_tree;
 

-static struct string_list display_notes_refs;
+static struct string_list display_notes_refs = STRING_LIST_INIT_NODUP;

 static struct notes_tree **display_notes_trees;
 
 static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
 static struct notes_tree **display_notes_trees;
 
 static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,

diff --git a/submodule.c b/submodule.c
index 4532b11d66f8cdc0abdf003b3a16a632bd923890..abc2ac2a1014e27b9dd56df178cadda6a88c1270 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -17,7 +17,7 @@
 
 static int config_fetch_recurse_submodules = RECURSE_SUBMODULES_ON_DEMAND;
 static int parallel_jobs = 1;
 
 static int config_fetch_recurse_submodules = RECURSE_SUBMODULES_ON_DEMAND;
 static int parallel_jobs = 1;

-static struct string_list changed_submodule_paths;
+static struct string_list changed_submodule_paths = STRING_LIST_INIT_NODUP;

 static int initialized_fetch_ref_tips;
 static struct sha1_array ref_tips_before_fetch;
 static struct sha1_array ref_tips_after_fetch;
 static int initialized_fetch_ref_tips;
 static struct sha1_array ref_tips_before_fetch;
 static struct sha1_array ref_tips_after_fetch;

diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
index 2c8c8f18edb46378b39c170b4ae6f7250ec631f5..37a196781dc1a53b925dd68235fe17284978777e 100644 (file)
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -11,7 +11,7 @@ static int verbose = 0, dry_run = 0, quiet = 0;
 static char *string = NULL;
 static char *file = NULL;
 static int ambiguous;
 static char *string = NULL;
 static char *file = NULL;
 static int ambiguous;

-static struct string_list list;
+static struct string_list list = STRING_LIST_INIT_NODUP;

 
 static int length_callback(const struct option *opt, const char *arg, int unset)
 {
 
 static int length_callback(const struct option *opt, const char *arg, int unset)
 {