chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
37370d0
)
systemctl: minor coding style fixes
author
Lennart Poettering
<lennart@poettering.net>
Thu, 13 Sep 2012 20:42:22 +0000
(22:42 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 13 Sep 2012 20:42:22 +0000
(22:42 +0200)
src/systemctl/systemctl.c
patch
|
blob
|
history
diff --git
a/src/systemctl/systemctl.c
b/src/systemctl/systemctl.c
index dd835aa37a3b0286d4996370ecc4d2a408710443..efb9ae29462be9ed911fb88c04afd2e4738f3e53 100644
(file)
--- a/
src/systemctl/systemctl.c
+++ b/
src/systemctl/systemctl.c
@@
-3552,23
+3552,25
@@
finish:
}
static int mangle_names(char **original_names, char ***mangled_names) {
}
static int mangle_names(char **original_names, char ***mangled_names) {
- char **names_it = NULL;
- char **name = NULL;
+ char **i, **l, **name;
-
(*mangled_names) = new(char*, strv_length(original_names)+
1);
- if
(!(*mangled_names)
)
+
l = new(char*, strv_length(original_names) +
1);
+ if
(!l
)
return log_oom();
return log_oom();
- names_it = *mangled_names;
-
+ i = l;
STRV_FOREACH(name, original_names) {
STRV_FOREACH(name, original_names) {
-
char *n
= unit_name_mangle(*name);
- (*names_it) = n ? n : strdup(*name);
- if(!(*names_it))
+
*i
= unit_name_mangle(*name);
+ if (!*i) {
+ strv_free(l);
return log_oom();
return log_oom();
- names_it++;
+ }
+
+ i++;
}
}
- *names_it = NULL;
+
+ *i = NULL;
+ *mangled_names = l;
return 0;
}
return 0;
}