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
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user