diff options
| author |   jca <jca@openbsd.org> | 2015-10-25 23:50:23 +0000 |
|---|---|---|
| committer | jca <jca@openbsd.org> | 2015-10-25 23:50:23 +0000 |
| commit | b01f4a61e269dbee7a43b3e6da053c7203738d51 (patch) | |
| tree | 9b3285801cb82f1a6d488fa14b80c990d9cc9457 /usr.sbin/route6d | |
| parent | Expand tildes in filenames passed to -i before checking whether or not the (diff) | |
| download | wireguard-openbsd-b01f4a61e269dbee7a43b3e6da053c7203738d51.tar.xz wireguard-openbsd-b01f4a61e269dbee7a43b3e6da053c7203738d51.zip | |
Correctly print size_t/time_t.
No functional change.
Diffstat (limited to 'usr.sbin/route6d')
| -rw-r--r-- | usr.sbin/route6d/route6d.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c index a190a9d71ff..c6581fc1999 100644 --- a/usr.sbin/route6d/route6d.c +++ b/usr.sbin/route6d/route6d.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route6d.c,v 1.75 2015/10/25 23:41:50 jca Exp $ */ +/* $OpenBSD: route6d.c,v 1.76 2015/10/25 23:50:23 jca Exp $ */ /* $KAME: route6d.c,v 1.111 2006/10/25 06:38:13 jinmei Exp $ */ /* @@ -1544,8 +1544,8 @@ rtrecv(void) exit(1); } if (len < sizeof(*rtm)) { - trace(1, "short read from rtsock: %d (should be > %lu)\n", - len, (u_long)sizeof(*rtm)); + trace(1, "short read from rtsock: %d (should be > %zu)\n", + len, sizeof(*rtm)); return; } if (dflag >= 2) { @@ -2453,8 +2453,8 @@ krtread(int again) } } while (retry < 5 && errmsg != NULL); if (errmsg) { - fatal("%s (with %d retries, msize=%lu)", errmsg, retry, - (u_long)msize); + fatal("%s (with %d retries, msize=%zu)", errmsg, retry, + msize); /*NOTREACHED*/ } else if (1 < retry) syslog(LOG_INFO, "NET_RT_DUMP %d retires", retry); @@ -2932,11 +2932,11 @@ rtdump(int sig) age = t - rrt->rrt_t; inet_ntop(AF_INET6, (void *)&rrt->rrt_info.rip6_dest, buf, sizeof(buf)); - fprintf(dump, " %s/%d if(%d:%s) gw(%s) [%d] age(%ld)", + fprintf(dump, " %s/%d if(%d:%s) gw(%s) [%d] age(%lld)", buf, rrt->rrt_info.rip6_plen, rrt->rrt_index, index2ifc[rrt->rrt_index]->ifc_name, inet6_n2p(&rrt->rrt_gw), - rrt->rrt_info.rip6_metric, (long)age); + rrt->rrt_info.rip6_metric, (long long)age); if (rrt->rrt_info.rip6_tag) { fprintf(dump, " tag(0x%04x)", ntohs(rrt->rrt_info.rip6_tag) & 0xffff); |