diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-02-16 00:05:20 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-02-16 00:05:20 +0100 |
| commit | 6043679c6ec485a96926f07c26d77f2c0c246fe2 (patch) | |
| tree | e38fdd2dd906b9b2eb53d7ec7f1ffa1aa9cd550c /src/machine/machine.c | |
| parent | a6b8530aecfa4df0debb0dd89ed089053d3fc926 (diff) | |
| parent | b895a7353b739e7186f6f51f3a415485b5afd80f (diff) | |
Merge pull request #2628 from benjarobin/fix-pull-req-2611
time-util: Rename and fix call of deserialize_timestamp_value()
Diffstat (limited to 'src/machine/machine.c')
| -rw-r--r-- | src/machine/machine.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/machine/machine.c b/src/machine/machine.c index 7e92ffc474..7a7a1bb42b 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -299,8 +299,10 @@ int machine_load(Machine *m) { m->class = c; } - deserialize_timestamp_value(realtime, &m->timestamp.realtime); - deserialize_timestamp_value(monotonic, &m->timestamp.monotonic); + if (realtime) + timestamp_deserialize(realtime, &m->timestamp.realtime); + if (monotonic) + timestamp_deserialize(monotonic, &m->timestamp.monotonic); if (netif) { size_t allocated = 0, nr = 0; |