chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: if we managed to reexec the init system via the bus don't retry via signal
[elogind.git]
/
src
/
strv.c
diff --git
a/src/strv.c
b/src/strv.c
index a52440d832cc84b542fffe6398e4b6dbdc0588db..92851b223375516b5144f52afcc2ca4b471333fd 100644
(file)
--- a/
src/strv.c
+++ b/
src/strv.c
@@
-482,8
+482,8
@@
static bool env_match(const char *t, const char *pattern) {
}
char **strv_env_delete(char **x, unsigned n_lists, ...) {
}
char **strv_env_delete(char **x, unsigned n_lists, ...) {
- size_t n
= 0
, i = 0;
- char **
l, **k, **r, **j
;
+ size_t n, i = 0;
+ char **
k, **r
;
va_list ap;
/* Deletes every entry from x that is mentioned in the other
va_list ap;
/* Deletes every entry from x that is mentioned in the other
@@
-491,29
+491,34
@@
char **strv_env_delete(char **x, unsigned n_lists, ...) {
n = strv_length(x);
n = strv_length(x);
- if (!(r = new(char*, n+1)))
+ r = new(char*, n+1);
+ if (!r)
return NULL;
STRV_FOREACH(k, x) {
return NULL;
STRV_FOREACH(k, x) {
+ unsigned v;
+
va_start(ap, n_lists);
va_start(ap, n_lists);
+ for (v = 0; v < n_lists; v++) {
+ char **l, **j;
- for (i = 0; i < n_lists; i++) {
l = va_arg(ap, char**);
STRV_FOREACH(j, l)
if (env_match(*k, *j))
l = va_arg(ap, char**);
STRV_FOREACH(j, l)
if (env_match(*k, *j))
- goto
delete
;
+ goto
skip
;
}
}
-
va_end(ap);
va_end(ap);
- if (!(r[i++] = strdup(*k))) {
+ r[i] = strdup(*k);
+ if (!r[i]) {
strv_free(r);
return NULL;
}
strv_free(r);
return NULL;
}
+ i++;
continue;
continue;
-
delete
:
+
skip
:
va_end(ap);
}
va_end(ap);
}