From 13092a916d7b8211fd828a6a7ee0d3cefff995e1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 12 Oct 2016 11:20:23 -0700 Subject: cocci: refactor common patterns to use 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 --- trailer.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'trailer.c') 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) -- cgit v1.2.3