summaryrefslogtreecommitdiff
path: root/builtin/apply.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-06-13 10:04:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-13 17:37:51 (GMT)
commit2721ce21e439ee0726dc69073acd7e0d2b2407b3 (patch)
tree204966369741352a8abc9651805ed0c88677598f /builtin/apply.c
parent7013220d2b3181d4ae55e21e0f18b9abfd6e011d (diff)
downloadgit-2721ce21e439ee0726dc69073acd7e0d2b2407b3.zip
git-2721ce21e439ee0726dc69073acd7e0d2b2407b3.tar.gz
git-2721ce21e439ee0726dc69073acd7e0d2b2407b3.tar.bz2
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>
Diffstat (limited to 'builtin/apply.c')
-rw-r--r--builtin/apply.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/apply.c b/builtin/apply.c
index 8e4da2e..955af4d 100644
--- 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.
*/
-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)
{
@@ -1936,7 +1936,7 @@ static void prefix_patch(struct patch *p)
* 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)
{
@@ -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.
*/
-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