chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: allow informing systemd about service status changes with RELOADING=1 and STOPP...
[elogind.git]
/
src
/
machine
/
machine.c
diff --git
a/src/machine/machine.c
b/src/machine/machine.c
index 0ed18d74ece89a8c0680e6f70b73a79ba0c74728..13d3448adf47422ce66a6da43bfc82fd7e5de664 100644
(file)
--- a/
src/machine/machine.c
+++ b/
src/machine/machine.c
@@
-291,14
+291,14
@@
int machine_load(Machine *m) {
if (netif) {
size_t l, allocated = 0, nr = 0;
if (netif) {
size_t l, allocated = 0, nr = 0;
- c
har *w
, *state;
+ c
onst char *word
, *state;
int *ni = NULL;
int *ni = NULL;
- FOREACH_WORD(w, l, netif, state) {
+ FOREACH_WORD(w
ord
, l, netif, state) {
char buf[l+1];
int ifi;
char buf[l+1];
int ifi;
- *(char*) (mempcpy(buf, w, l)) = 0;
+ *(char*) (mempcpy(buf, w
ord
, l)) = 0;
if (safe_atoi(buf, &ifi) < 0)
continue;
if (safe_atoi(buf, &ifi) < 0)
continue;
@@
-493,6
+493,8
@@
int machine_kill(Machine *m, KillWho who, int signo) {
if (kill(m->leader, signo) < 0)
return -errno;
if (kill(m->leader, signo) < 0)
return -errno;
+
+ return 0;
}
/* Otherwise make PID 1 do it for us, for the entire cgroup */
}
/* Otherwise make PID 1 do it for us, for the entire cgroup */