projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1b99214
)
machine: minor modernizations
author
Lennart Poettering
<lennart@poettering.net>
Thu, 12 Jun 2014 21:06:56 +0000
(23:06 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 12 Jun 2014 21:07:33 +0000
(23:07 +0200)
src/machine/machine.c
patch
|
blob
|
history
diff --git
a/src/machine/machine.c
b/src/machine/machine.c
index
a49cf81
..
0b0d45b
100644
(file)
--- a/
src/machine/machine.c
+++ b/
src/machine/machine.c
@@
-176,12
+176,13
@@
int machine_save(Machine *m) {
m->timestamp.realtime,
m->timestamp.monotonic);
- fflush(f);
+ r = fflush_and_check(f);
+ if (r < 0)
+ goto finish;
- if (
ferror(f) ||
rename(temp_path, m->state_file) < 0) {
+ if (rename(temp_path, m->state_file) < 0) {
r = -errno;
- unlink(m->state_file);
- unlink(temp_path);
+ goto finish;
}
if (m->unit) {
@@
-195,8
+196,12
@@
int machine_save(Machine *m) {
}
finish:
- if (r < 0)
+ if (r < 0) {
+ if (temp_path)
+ unlink(temp_path);
+
log_error("Failed to save machine data %s: %s", m->state_file, strerror(-r));
+ }
return r;
}