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 --- git.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'git.c') diff --git a/git.c b/git.c index 0f1937fd0..f914490e1 100644 --- a/git.c +++ b/git.c @@ -35,8 +35,7 @@ static void save_env_before_alias(void) orig_cwd = xgetcwd(); for (i = 0; i < ARRAY_SIZE(env_names); i++) { orig_env[i] = getenv(env_names[i]); - if (orig_env[i]) - orig_env[i] = xstrdup(orig_env[i]); + orig_env[i] = xstrdup_or_null(orig_env[i]); } } -- cgit v1.2.1