From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 3 Aug 2019 15:46:56 +0000 (+0200)
Subject: pid1: replace asprintf() with strjoin()
X-Git-Tag: v243-rc2~66^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F13256%2Fhead;p=thirdparty%2Fsystemd.git

pid1: replace asprintf() with strjoin()

It's nicer. And coverity doesn't need to complain about unchecked return
value (CID#1401780).
---

diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index c816569f2b6..85c310cd33d 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -1000,16 +1000,11 @@ int bus_property_get_exec_ex_command_list(
 }
 
 static char *exec_command_flags_to_exec_chars(ExecCommandFlags flags) {
-        char *res = NULL;
-
-        asprintf(&res, "%s%s%s%s%s",
-                FLAGS_SET(flags, EXEC_COMMAND_IGNORE_FAILURE)   ? "-" : "",
-                FLAGS_SET(flags, EXEC_COMMAND_NO_ENV_EXPAND)    ? ":" : "",
-                FLAGS_SET(flags, EXEC_COMMAND_FULLY_PRIVILEGED) ? "+" : "",
-                FLAGS_SET(flags, EXEC_COMMAND_NO_SETUID)        ? "!" : "",
-                FLAGS_SET(flags, EXEC_COMMAND_AMBIENT_MAGIC)    ? "!!" : "");
-
-        return res;
+        return strjoin(FLAGS_SET(flags, EXEC_COMMAND_IGNORE_FAILURE)   ? "-" : "",
+                       FLAGS_SET(flags, EXEC_COMMAND_NO_ENV_EXPAND)    ? ":" : "",
+                       FLAGS_SET(flags, EXEC_COMMAND_FULLY_PRIVILEGED) ? "+" : "",
+                       FLAGS_SET(flags, EXEC_COMMAND_NO_SETUID)        ? "!" : "",
+                       FLAGS_SET(flags, EXEC_COMMAND_AMBIENT_MAGIC)    ? "!!" : "");
 }
 
 int bus_set_transient_exec_command(