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 323c637fe926badb6400e8d983f6bf88bff43cec..1137e167c29a9b2a1e999fd2c3e97b53c294532e 100644 (file)
--- 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 e542d5c93ec22c43c2819cf8ffa26695dea97566..c4fea735c43c69b385207dfa038b032bad63c705 100644 (file)
--- 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)