From d8ad241f54b8c4ac76aafd960d89b47b0ed87fb6 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 9 Aug 2016 10:39:15 -0400 Subject: [PATCH] basic: drop unnecessary strempty() call in replace_env strempty() converts a NULL value to empty string, so that it can be passed on to functions that don't support NULL. replace_env calls strempty before passing its value on to strappend. strappend supports NULL just fine, though, so this commit drops the strempty call. --- src/basic/env-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/env-util.c b/src/basic/env-util.c index f9208d1475..86ac07e1b6 100644 --- a/src/basic/env-util.c +++ b/src/basic/env-util.c @@ -563,7 +563,7 @@ char *replace_env(const char *format, char **env) { if (*e == '}') { const char *t; - t = strempty(strv_env_get_n(env, word+2, e-word-2)); + t = strv_env_get_n(env, word+2, e-word-2); k = strappend(r, t); if (!k)