From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 25 Feb 2018 16:26:22 +0000 (+0100)
Subject: basic: shorten the code a bit in two places
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ac0b078399d2c59fa50c197c7370e45a37d76d6b;p=elogind.git

basic: shorten the code a bit in two places

gcc complains that len might be used unitialized, but afaict, this is not true.
---

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index a11ec58ed..7b6f66661 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -1076,13 +1076,11 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
                                 continue;
 
                         *e = 0;
-                        FOREACH_WORD_SEPARATOR(word, k, l, ",", state) {
+                        FOREACH_WORD_SEPARATOR(word, k, l, ",", state)
                                 if (k == cs && memcmp(word, controller_str, cs) == 0) {
                                         found = true;
                                         break;
                                 }
-                        }
-
                         if (!found)
                                 continue;
                 }
diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index 648851bcb..cb2c54cd8 100644
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -540,8 +540,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
 
         assert(format);
 
-        for (e = format, i = 0; *e && i < n; e ++, i ++) {
-
+        for (e = format, i = 0; *e && i < n; e ++, i ++)
                 switch (state) {
 
                 case WORD:
@@ -555,8 +554,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
                                 if (!k)
                                         return NULL;
 
-                                free(r);
-                                r = k;
+                                free_and_replace(r, k);
 
                                 word = e-1;
                                 state = VARIABLE;
@@ -566,8 +564,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
                                 if (!k)
                                         return NULL;
 
-                                free(r);
-                                r = k;
+                                free_and_replace(r, k);
 
                                 word = e+1;
                                 state = WORD;
@@ -577,8 +574,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
                                 if (!k)
                                         return NULL;
 
-                                free(r);
-                                r = k;
+                                free_and_replace(r, k);
 
                                 word = e-1;
                                 state = VARIABLE_RAW;
@@ -597,8 +593,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
                                 if (!k)
                                         return NULL;
 
-                                free(r);
-                                r = k;
+                                free_and_replace(r, k);
 
                                 word = e+1;
                                 state = WORD;
@@ -654,8 +649,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
                                 if (!k)
                                         return NULL;
 
-                                free(r);
-                                r = k;
+                                free_and_replace(r, k);
 
                                 word = e+1;
                                 state = WORD;
@@ -674,8 +668,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
                                 if (!k)
                                         return NULL;
 
-                                free(r);
-                                r = k;
+                                free_and_replace(r, k);
 
                                 word = e--;
                                 i--;
@@ -683,7 +676,6 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
                         }
                         break;
                 }
-        }
 
         if (state == VARIABLE_RAW) {
                 const char *t;