Make oslib/linux-dev-lookup.c a stand-alone library

[fio.git] / gettime.c

diff --git a/gettime.c b/gettime.c
index b896b5bd9923e7b818e9e88fe99eb0a369dd9f63..85ba7cba8954aa3a70ae5e1faf9a76ab6ab22c72 100644 (file)
--- a/gettime.c
+++ b/gettime.c
@@ -381,8 +381,7 @@ void fio_clock_init(void)
 
 uint64_t utime_since(const struct timeval *s, const struct timeval *e)
 {
-       long sec, usec;
-       uint64_t ret;
+       int64_t sec, usec;
 
        sec = e->tv_sec - s->tv_sec;
        usec = e->tv_usec - s->tv_usec;
@@ -397,9 +396,7 @@ uint64_t utime_since(const struct timeval *s, const struct timeval *e)
        if (sec < 0 || (sec == 0 && usec < 0))
                return 0;
 
-       ret = sec * 1000000ULL + usec;
-
-       return ret;
+       return usec + (sec * 1000000);
 }
 
 uint64_t utime_since_now(const struct timeval *s)
@@ -412,7 +409,7 @@ uint64_t utime_since_now(const struct timeval *s)
 
 uint64_t mtime_since(const struct timeval *s, const struct timeval *e)
 {
-       long sec, usec, ret;
+       long sec, usec;
 
        sec = e->tv_sec - s->tv_sec;
        usec = e->tv_usec - s->tv_usec;
@@ -424,11 +421,9 @@ uint64_t mtime_since(const struct timeval *s, const struct timeval *e)
        if (sec < 0 || (sec == 0 && usec < 0))
                return 0;
 
-       sec *= 1000UL;
-       usec /= 1000UL;
-       ret = sec + usec;
-
-       return ret;
+       sec *= 1000;
+       usec /= 1000;
+       return sec + usec;
 }
 
 uint64_t mtime_since_now(const struct timeval *s)