chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove duplicated includes
[elogind.git]
/
src
/
machine
/
machine.c
diff --git
a/src/machine/machine.c
b/src/machine/machine.c
index 0ed18d74ece89a8c0680e6f70b73a79ba0c74728..0d84213eeae784e28d5c892f79af47ccb96da88b 100644
(file)
--- a/
src/machine/machine.c
+++ b/
src/machine/machine.c
@@
-216,7
+216,7
@@
finish:
if (temp_path)
unlink(temp_path);
if (temp_path)
unlink(temp_path);
- log_error
("Failed to save machine data %s: %s", m->state_file, strerror(-r)
);
+ log_error
_errno(r, "Failed to save machine data %s: %m", m->state_file
);
}
return r;
}
return r;
@@
-259,8
+259,7
@@
int machine_load(Machine *m) {
if (r == -ENOENT)
return 0;
if (r == -ENOENT)
return 0;
- log_error("Failed to read %s: %s", m->state_file, strerror(-r));
- return r;
+ return log_error_errno(r, "Failed to read %s: %m", m->state_file);
}
if (id)
}
if (id)
@@
-291,14
+290,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;
@@
-377,10
+376,10
@@
int machine_start(Machine *m, sd_bus_message *properties, sd_bus_error *error) {
return r;
log_struct(LOG_INFO,
return r;
log_struct(LOG_INFO,
- MESSAGE_ID(SD_MESSAGE_MACHINE_START),
+
LOG_
MESSAGE_ID(SD_MESSAGE_MACHINE_START),
"NAME=%s", m->name,
"LEADER="PID_FMT, m->leader,
"NAME=%s", m->name,
"LEADER="PID_FMT, m->leader,
-
"MESSAGE=New machine %s.", m->name
,
+
LOG_MESSAGE("New machine %s.", m->name)
,
NULL);
if (!dual_timestamp_is_set(&m->timestamp))
NULL);
if (!dual_timestamp_is_set(&m->timestamp))
@@
-426,10
+425,10
@@
int machine_stop(Machine *m) {
if (m->started)
log_struct(LOG_INFO,
if (m->started)
log_struct(LOG_INFO,
- MESSAGE_ID(SD_MESSAGE_MACHINE_STOP),
+
LOG_
MESSAGE_ID(SD_MESSAGE_MACHINE_STOP),
"NAME=%s", m->name,
"LEADER="PID_FMT, m->leader,
"NAME=%s", m->name,
"LEADER="PID_FMT, m->leader,
-
"MESSAGE=Machine %s terminated.", m->name
,
+
LOG_MESSAGE("Machine %s terminated.", m->name)
,
NULL);
/* Kill cgroup */
NULL);
/* Kill cgroup */
@@
-493,6
+492,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 */