picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2628 from benjarobin/fix-pull-req-2611

Browse source 
time-util: Rename and fix call of deserialize_timestamp_value()
This commit is contained in:
Lennart Poettering 2016-02-16 00:05:20 +01:00
parent a6b8530aec b895a7353b
commit 6043679c6e
5 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/basic/time-util.c
View file

@ -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;
}

2
src/basic/time-util.h
View file

@ -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);

6
src/login/logind-session.c
View file

@ -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)

6
src/login/logind-user.c
View file

@ -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;
}

6
src/machine/machine.c
View file

@ -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;