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:
008d348
)
unit: suppress incorrect deserialization errors
author
Lennart Poettering
<lennart@poettering.net>
Thu, 28 Oct 2010 00:19:21 +0000
(
02:19
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 28 Oct 2010 00:19:21 +0000
(
02:19
+0200)
src/unit.c
patch
|
blob
|
history
diff --git
a/src/unit.c
b/src/unit.c
index 0e9325dfa497067f141b4d7004d9f80d6b4114ab..fd9bdae1ad66ff6923ee46efd8cf4ab5a954fc2b 100644
(file)
--- a/
src/unit.c
+++ b/
src/unit.c
@@
-2087,14
+2087,19
@@
int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {
u->meta.deserialized_job = type;
continue;
u->meta.deserialized_job = type;
continue;
- } else if (streq(l, "inactive-exit-timestamp"))
+ } else if (streq(l, "inactive-exit-timestamp"))
{
dual_timestamp_deserialize(f, v, &u->meta.inactive_exit_timestamp);
dual_timestamp_deserialize(f, v, &u->meta.inactive_exit_timestamp);
- else if (streq(l, "active-enter-timestamp"))
+ continue;
+ } else if (streq(l, "active-enter-timestamp")) {
dual_timestamp_deserialize(f, v, &u->meta.active_enter_timestamp);
dual_timestamp_deserialize(f, v, &u->meta.active_enter_timestamp);
- else if (streq(l, "active-exit-timestamp"))
+ continue;
+ } else if (streq(l, "active-exit-timestamp")) {
dual_timestamp_deserialize(f, v, &u->meta.active_exit_timestamp);
dual_timestamp_deserialize(f, v, &u->meta.active_exit_timestamp);
- else if (streq(l, "inactive-enter-timestamp"))
+ continue;
+ } else if (streq(l, "inactive-enter-timestamp")) {
dual_timestamp_deserialize(f, v, &u->meta.inactive_enter_timestamp);
dual_timestamp_deserialize(f, v, &u->meta.inactive_enter_timestamp);
+ continue;
+ }
if ((r = UNIT_VTABLE(u)->deserialize_item(u, l, v, fds)) < 0)
return r;
if ((r = UNIT_VTABLE(u)->deserialize_item(u, l, v, fds)) < 0)
return r;