diff options
| author | dim <dim@FreeBSD.org> | 2011-12-19 20:29:50 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2011-12-19 20:29:50 +0000 |
| commit | feb552d6f384c256abba17a6722c24e709ed6bc4 (patch) | |
| tree | d7fe90d2ca4c3332900e2e185a2189c4bdcab062 | |
| parent | 8d78bfbee05852f5ebc3b662b38339d054324ce7 (diff) | |
| download | FreeBSD-src-feb552d6f384c256abba17a6722c24e709ed6bc4.zip FreeBSD-src-feb552d6f384c256abba17a6722c24e709ed6bc4.tar.gz | |
Some people pointed out long is 32-bit on some arches, while time_t is
64-bit, so better cast time_t to intmax_t, and use the appropriate
printf format strings.
MFC after: 1 week
| -rw-r--r-- | usr.sbin/timed/timed/correct.c | 4 | ||||
| -rw-r--r-- | usr.sbin/timed/timed/readmsg.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/timed/timed/correct.c b/usr.sbin/timed/timed/correct.c index 2334e75..0eab083 100644 --- a/usr.sbin/timed/timed/correct.c +++ b/usr.sbin/timed/timed/correct.c @@ -162,8 +162,8 @@ adjclock(corr) } } else { syslog(LOG_WARNING, - "clock correction %ld sec too large to adjust", - (long)adj.tv_sec); + "clock correction %jd sec too large to adjust", + (intmax_t)adj.tv_sec); (void) gettimeofday(&now, 0); timevaladd(&now, corr); if (settimeofday(&now, 0) < 0) diff --git a/usr.sbin/timed/timed/readmsg.c b/usr.sbin/timed/timed/readmsg.c index 68a5fad..9bbb3d7 100644 --- a/usr.sbin/timed/timed/readmsg.c +++ b/usr.sbin/timed/timed/readmsg.c @@ -181,8 +181,8 @@ again: rwait.tv_usec = 1000000/CLK_TCK; if (trace) { - fprintf(fd, "readmsg: wait %ld.%6ld at %s\n", - (long)rwait.tv_sec, rwait.tv_usec, date()); + fprintf(fd, "readmsg: wait %jd.%6ld at %s\n", + (intmax_t)rwait.tv_sec, rwait.tv_usec, date()); /* Notice a full disk, as we flush trace info. * It is better to flush periodically than at * every line because the tracing consists of bursts |
