diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-01-03 23:21:38 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-01-03 23:21:38 +0000 |
| commit | a2fa57b24c635b62d2641504a1d6c8aca7243401 (patch) | |
| tree | 0c3a643370c90d7dca90938776a66be4adb446c3 | |
| parent | 8692feeacc17c7b27750c43ac156520673866ae5 (diff) | |
| download | coreutils-a2fa57b24c635b62d2641504a1d6c8aca7243401.tar.xz | |
(xtime_make, xtime_nonnegative_nsec, xtime_nsec): Use
long int, not int, for nanosecond counts, so that people who are
used to POSIX struct timespec won't be surprised.
| -rw-r--r-- | lib/ChangeLog | 7 | ||||
| -rw-r--r-- | lib/xtime.h | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 0eb57d611..07fab530e 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2006-01-03 Paul Eggert <eggert@cs.ucla.edu> + + * xtime.h (xtime_make, xtime_nonnegative_nsec, xtime_nsec): Use + long int, not int, for nanosecond counts, so that people who are + used to POSIX struct timespec won't be surprised. Reported by Jim + Meyering. + 2006-01-01 Paul Eggert <eggert@cs.ucla.edu> * chmod-safer.c, chmod-safer.h: Remove. diff --git a/lib/xtime.h b/lib/xtime.h index 3c7f620db..297c6f53d 100644 --- a/lib/xtime.h +++ b/lib/xtime.h @@ -1,6 +1,6 @@ /* xtime -- extended-resolution integer time stamps - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,7 +41,7 @@ typedef long int xtime_t; /* Return an extended time value that contains S seconds and NS nanoseconds, without any overflow checking. */ static inline xtime_t -xtime_make (xtime_t s, int ns) +xtime_make (xtime_t s, long int ns) { if (XTIME_PRECISION == 1) return s; @@ -68,17 +68,17 @@ xtime_sec (xtime_t t) } /* Return the number of nanoseconds in T, which must be nonnegative. */ -static inline int +static inline long int xtime_nonnegative_nsec (xtime_t t) { return t % XTIME_PRECISION; } /* Return the number of nanoseconds in T. */ -static inline int +static inline long int xtime_nsec (xtime_t t) { - int ns = t % XTIME_PRECISION; + long int ns = t % XTIME_PRECISION; if (ns < 0) ns += XTIME_PRECISION; return ns; |