summaryrefslogtreecommitdiff
path: root/src/machine
diff options
context:
space:
mode:
authorBenjamin Robin <dev@benjarobin.fr>2016-02-15 23:26:34 +0100
committerBenjamin Robin <dev@benjarobin.fr>2016-02-15 23:26:34 +0100
commitb895a7353b739e7186f6f51f3a415485b5afd80f (patch)
treeb49160f789b98e93b979ce4cc53c47f5ee871880 /src/machine
parent11ab173d4067a4ed6fab811ba2159456053fd4c1 (diff)
time-util: Rename and fix call of deserialize_timestamp_value()
The deserialize_timestamp_value() is renamed timestamp_deserialize() to be more consistent with dual_timestamp_deserialize() And add the NULL check back on realtime and monotonic
Diffstat (limited to 'src/machine')
-rw-r--r--src/machine/machine.c6
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;