summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-02-16 00:05:20 +0100
committerLennart Poettering <lennart@poettering.net>2016-02-16 00:05:20 +0100
commit6043679c6ec485a96926f07c26d77f2c0c246fe2 (patch)
treee38fdd2dd906b9b2eb53d7ec7f1ffa1aa9cd550c /src
parenta6b8530aecfa4df0debb0dd89ed089053d3fc926 (diff)
parentb895a7353b739e7186f6f51f3a415485b5afd80f (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')
-rw-r--r--src/basic/time-util.c7
-rw-r--r--src/basic/time-util.h2
-rw-r--r--src/login/logind-session.c6
-rw-r--r--src/login/logind-user.c6
-rw-r--r--src/machine/machine.c6
5 files changed, 16 insertions, 11 deletions
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index ac5988fdf9..0b4f5ab5b9 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -449,7 +449,7 @@ int dual_timestamp_deserialize(const char *value, dual_timestamp *t) {
assert(t);
if (sscanf(value, "%llu %llu", &a, &b) != 2) {
- log_debug("Failed to parse finish timestamp value %s.", value);
+ log_debug("Failed to parse dual timestamp value \"%s\": %m", value);
return -EINVAL;
}
@@ -459,15 +459,14 @@ int dual_timestamp_deserialize(const char *value, dual_timestamp *t) {
return 0;
}
-int deserialize_timestamp_value(const char *value, usec_t *timestamp) {
+int timestamp_deserialize(const char *value, usec_t *timestamp) {
int r;
assert(value);
r = safe_atou64(value, timestamp);
-
if (r < 0)
- return log_debug_errno(r, "Failed to parse finish timestamp value \"%s\": %m", value);
+ return log_debug_errno(r, "Failed to parse timestamp value \"%s\": %m", value);
return r;
}
diff --git a/src/basic/time-util.h b/src/basic/time-util.h
index a826ad75ec..77e3cd08d4 100644
--- a/src/basic/time-util.h
+++ b/src/basic/time-util.h
@@ -99,7 +99,7 @@ char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy);
void dual_timestamp_serialize(FILE *f, const char *name, dual_timestamp *t);
int dual_timestamp_deserialize(const char *value, dual_timestamp *t);
-int deserialize_timestamp_value(const char *value, usec_t *timestamp);
+int timestamp_deserialize(const char *value, usec_t *timestamp);
int parse_timestamp(const char *t, usec_t *usec);
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 9874cdae5e..e088225beb 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -446,8 +446,10 @@ int session_load(Session *s) {
safe_close(fd);
}
- deserialize_timestamp_value(realtime, &s->timestamp.realtime);
- deserialize_timestamp_value(monotonic, &s->timestamp.monotonic);
+ if (realtime)
+ timestamp_deserialize(realtime, &s->timestamp.realtime);
+ if (monotonic)
+ timestamp_deserialize(monotonic, &s->timestamp.monotonic);
if (controller) {
if (bus_name_has_owner(s->manager->bus, controller, NULL) > 0)
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index aa27f73a87..a826321bf0 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -321,8 +321,10 @@ int user_load(User *u) {
if (s && s->display && display_is_local(s->display))
u->display = s;
- deserialize_timestamp_value(realtime, &u->timestamp.realtime);
- deserialize_timestamp_value(monotonic, &u->timestamp.monotonic);
+ if (realtime)
+ timestamp_deserialize(realtime, &u->timestamp.realtime);
+ if (monotonic)
+ timestamp_deserialize(monotonic, &u->timestamp.monotonic);
return r;
}
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;