From: Sven Eden <yamakuzure@gmx.net>
Date: Fri, 28 Jul 2017 06:35:36 +0000 (+0200)
Subject: Prep v234.2: Apply upstream fixes in src/basic (3/6)
X-Git-Tag: chiark/234.4-1+devuan1.1+iwj1~47
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=adedf22e98a106a35eda5d5e38f69aced4d837ef;p=elogind.git

Prep v234.2: Apply upstream fixes in src/basic (3/6)
---

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 323c637fe..1137e167c 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -1111,7 +1111,6 @@ int cg_install_release_agent(const char *controller, const char *agent) {
                 return r;
 
         sc = strstrip(contents);
-
         if (isempty(sc)) {
                 r = write_string_file(fs, agent, 0);
                 if (r < 0)
diff --git a/src/basic/exec-util.c b/src/basic/exec-util.c
index e542d5c93..c4fea735c 100644
--- a/src/basic/exec-util.c
+++ b/src/basic/exec-util.c
@@ -130,7 +130,7 @@ static int do_execute(
         STRV_FOREACH(path, paths) {
                 _cleanup_free_ char *t = NULL;
                 _cleanup_close_ int fd = -1;
-                pid_t pid;
+                pid_t pid = 0;
 
                 t = strdup(*path);
                 if (!t)