projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix badly merged dprint()
[fio.git]
/
time.c
diff --git
a/time.c
b/time.c
index 6d79ecdca3036515f89aa0df5bd9a38b4b7085f8..505058f53b270f973482bdd839245d6239d69e99 100644
(file)
--- a/
time.c
+++ b/
time.c
@@
-10,7
+10,7
@@
unsigned long long utime_since(struct timeval *s, struct timeval *e)
{
long sec, usec;
unsigned long long ret;
-
+
sec = e->tv_sec - s->tv_sec;
usec = e->tv_usec - s->tv_usec;
if (sec > 0 && usec < 0) {
@@
-23,9
+23,9
@@
unsigned long long utime_since(struct timeval *s, struct timeval *e)
*/
if (sec < 0 || (sec == 0 && usec < 0))
return 0;
-
+
ret = sec * 1000000ULL + usec;
-
+
return ret;
}