picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

basic: shorten the code a bit in two places

Browse source 
gcc complains that len might be used unitialized, but afaict, this is not true.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-02-25 17:26:22 +01:00
parent f2e3f36950
commit 00d4b1e684
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/basic/cgroup-util.c
View file

@ -1062,13 +1062,11 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
continue; continue;
*e = 0; *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) { if (k == cs && memcmp(word, controller_str, cs) == 0) {
found = true; found = true;
break; break;
} }
}
if (!found) if (!found)
continue; continue;
} }

22
src/basic/env-util.c
View file

@ -539,8 +539,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
assert(format); assert(format);
for (e = format, i = 0; *e && i < n; e ++, i ++) { for (e = format, i = 0; *e && i < n; e ++, i ++)
switch (state) { switch (state) {
case WORD: case WORD:
@ -554,8 +553,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
if (!k) if (!k)
return NULL; return NULL;
free(r); free_and_replace(r, k);
r = k;
word = e-1; word = e-1;
state = VARIABLE; state = VARIABLE;
@ -565,8 +563,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
if (!k) if (!k)
return NULL; return NULL;
free(r); free_and_replace(r, k);
r = k;
word = e+1; word = e+1;
state = WORD; state = WORD;
@ -576,8 +573,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
if (!k) if (!k)
return NULL; return NULL;
free(r); free_and_replace(r, k);
r = k;
word = e-1; word = e-1;
state = VARIABLE_RAW; state = VARIABLE_RAW;
@ -596,8 +592,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
if (!k) if (!k)
return NULL; return NULL;
free(r); free_and_replace(r, k);
r = k;
word = e+1; word = e+1;
state = WORD; state = WORD;
@ -653,8 +648,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
if (!k) if (!k)
return NULL; return NULL;
free(r); free_and_replace(r, k);
r = k;
word = e+1; word = e+1;
state = WORD; state = WORD;
@ -673,8 +667,7 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
if (!k) if (!k)
return NULL; return NULL;
free(r); free_and_replace(r, k);
r = k;
word = e--; word = e--;
i--; i--;
@ -682,7 +675,6 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
} }
break; break;
} }
}
if (state == VARIABLE_RAW) { if (state == VARIABLE_RAW) {
const char *t; const char *t;