chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
65de039
)
time: minor simplification
author
Lennart Poettering
<lennart@poettering.net>
Fri, 24 Oct 2014 17:09:36 +0000
(19:09 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 24 Oct 2014 17:09:36 +0000
(19:09 +0200)
src/shared/time-util.c
patch
|
blob
|
history
diff --git
a/src/shared/time-util.c
b/src/shared/time-util.c
index 43ad9db91e5ce4114c4086487b84383267a8678c..33d0822f335ace06ff2583a4869f535c7254297a 100644
(file)
--- a/
src/shared/time-util.c
+++ b/
src/shared/time-util.c
@@
-49,25
+49,20
@@
dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u) {
int64_t delta;
assert(ts);
int64_t delta;
assert(ts);
- if (u == USEC_INFINITY) {
- ts->realtime = ts->monotonic =
USEC_INFINITY
;
+ if (u == USEC_INFINITY
|| u <= 0
) {
+ ts->realtime = ts->monotonic =
u
;
return ts;
}
ts->realtime = u;
return ts;
}
ts->realtime = u;
- if (u == 0)
- ts->monotonic = 0;
- else {
- delta = (int64_t) now(CLOCK_REALTIME) - (int64_t) u;
-
- ts->monotonic = now(CLOCK_MONOTONIC);
+ delta = (int64_t) now(CLOCK_REALTIME) - (int64_t) u;
+ ts->monotonic = now(CLOCK_MONOTONIC);
- if ((int64_t) ts->monotonic > delta)
- ts->monotonic -= delta;
- else
- ts->monotonic = 0;
- }
+ if ((int64_t) ts->monotonic > delta)
+ ts->monotonic -= delta;
+ else
+ ts->monotonic = 0;
return ts;
}
return ts;
}