diff options
| author | Zack Weinberg <zackw@panix.com> | 2019-08-16 21:10:11 -0400 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2019-08-21 08:26:36 -0400 |
| commit | 1baae4aa6f3313da77d799f12f963910b05db637 (patch) | |
| tree | 8e355e8254a1e5f93b381f552ab5e95a3dd64fcf | |
| parent | f9fabc1b02d252d5d9b2e0df406bb394b8a7b46a (diff) | |
| download | glibc-1baae4aa6f3313da77d799f12f963910b05db637.tar.gz glibc-1baae4aa6f3313da77d799f12f963910b05db637.tar.xz glibc-1baae4aa6f3313da77d799f12f963910b05db637.zip | |
Don't use the argument to time.
It doesn't make sense to remove all the internal uses of time. It's still a standard ISO C function, and its callers don't need sub-second resolution and would be unnecessarily complicated if they had to declare a struct timespec instead of just a time_t. However, a handful of places were using the vestigial "result" argument instead of the return value, which is slightly less efficient and also looks strange. Correct this. * misc/syslog.c (__vsyslog_internal) * time/getdate.c (__getdate_r) * time/tst_wcsftime.c (main): Use return value of time, not its argument. * string/strfry.c (strfry) * sysdeps/mach/sleep.c (__sleep): Remove unnecessary casts of NULL in calls to time.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | misc/syslog.c | 2 | ||||
| -rw-r--r-- | string/strfry.c | 2 | ||||
| -rw-r--r-- | sysdeps/mach/sleep.c | 4 | ||||
| -rw-r--r-- | time/getdate.c | 2 | ||||
| -rw-r--r-- | time/tst_wcsftime.c | 2 |
6 files changed, 17 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index ee96090964..5e07cee941 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2019-08-21 Zack Weinberg <zackw@panix.com> + + * misc/syslog.c (__vsyslog_internal) + * time/getdate.c (__getdate_r) + * time/tst_wcsftime.c (main): + Use return value of time, not its argument. + + * string/strfry.c (strfry) + * sysdeps/mach/sleep.c (__sleep): + Remove unnecessary casts of NULL in calls to time. + 2019-08-21 Joseph Myers <joseph@codesourcery.com> * math/tgmath.h [__HAVE_FLOAT128X]: Give error. diff --git a/misc/syslog.c b/misc/syslog.c index 3a15da41ce..cf2deef533 100644 --- a/misc/syslog.c +++ b/misc/syslog.c @@ -205,7 +205,7 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap, { __fsetlocking (f, FSETLOCKING_BYCALLER); fprintf (f, "<%d>", pri); - (void) time (&now); + now = time (NULL); f->_IO_write_ptr += __strftime_l (f->_IO_write_ptr, f->_IO_write_end - f->_IO_write_ptr, diff --git a/string/strfry.c b/string/strfry.c index af6087bee5..71686d45c2 100644 --- a/string/strfry.c +++ b/string/strfry.c @@ -30,7 +30,7 @@ strfry (char *string) { static char state[32]; rdata.state = NULL; - __initstate_r (time ((time_t *) NULL) ^ getpid (), + __initstate_r (time (NULL) ^ getpid (), state, sizeof (state), &rdata); init = 1; } diff --git a/sysdeps/mach/sleep.c b/sysdeps/mach/sleep.c index 11e1bb87f3..c63ef926b7 100644 --- a/sysdeps/mach/sleep.c +++ b/sysdeps/mach/sleep.c @@ -33,10 +33,10 @@ __sleep (unsigned int seconds) recv = __mach_reply_port (); - before = time ((time_t *) NULL); + before = time (NULL); (void) __mach_msg (NULL, MACH_RCV_MSG|MACH_RCV_TIMEOUT|MACH_RCV_INTERRUPT, 0, 0, recv, seconds * 1000, MACH_PORT_NULL); - after = time ((time_t *) NULL); + after = time (NULL); __mach_port_destroy (__mach_task_self (), recv); return seconds - (after - before); diff --git a/time/getdate.c b/time/getdate.c index aee96f7163..8a567c3fcd 100644 --- a/time/getdate.c +++ b/time/getdate.c @@ -219,7 +219,7 @@ __getdate_r (const char *string, struct tm *tp) return 7; /* Get current time. */ - time (&timer); + timer = time (NULL); __localtime_r (&timer, &tm); /* If only the weekday is given, today is assumed if the given day diff --git a/time/tst_wcsftime.c b/time/tst_wcsftime.c index 3f6f0d9f77..55c45f6a81 100644 --- a/time/tst_wcsftime.c +++ b/time/tst_wcsftime.c @@ -10,7 +10,7 @@ main (int argc, char *argv[]) int result = 0; size_t n; - time (&t); + t = time (NULL); tp = gmtime (&t); n = wcsftime (buf, sizeof (buf) / sizeof (buf[0]), |