summaryrefslogtreecommitdiff
path: root/trailer.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-12 11:20:23 -0700
committerJunio C Hamano <gitster@pobox.com>2016-10-12 11:22:10 -0700
commit13092a916d7b8211fd828a6a7ee0d3cefff995e1 (patch)
treeedec0c5d32630cb5f78e06f8b0743199c503fcdd /trailer.c
parent74eeaf7b72a94bd3e0ff275edb90e6ee2423b529 (diff)
downloadgit-13092a916d7b8211fd828a6a7ee0d3cefff995e1.tar.gz
cocci: refactor common patterns to use xstrdup_or_null()jc/cocci-xstrdup-or-null
d64ea0f83b ("git-compat-util: add xstrdup_or_null helper", 2015-01-12) added a handy wrapper that allows us to get a duplicate of a string or NULL if the original is NULL, but a handful of codepath predate its introduction or just weren't aware of it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'trailer.c')
-rw-r--r--trailer.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/trailer.c b/trailer.c
index c6ea9ac64d..aecaf9232a 100644
--- a/trailer.c
+++ b/trailer.c
@@ -428,12 +428,9 @@ static int set_if_missing(struct conf_info *item, const char *value)
static void duplicate_conf(struct conf_info *dst, struct conf_info *src)
{
*dst = *src;
- if (src->name)
- dst->name = xstrdup(src->name);
- if (src->key)
- dst->key = xstrdup(src->key);
- if (src->command)
- dst->command = xstrdup(src->command);
+ dst->name = xstrdup_or_null(src->name);
+ dst->key = xstrdup_or_null(src->key);
+ dst->command = xstrdup_or_null(src->command);
}
static struct trailer_item *get_conf_item(const char *name)