Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make this compile on the Alpha again.

Browse Source
This commit is contained in:
thorpej 1999-12-16 00:58:17 +00:00
parent 628b8470c7
commit 2b9d9a9499
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/netstat/inet6.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: inet6.c,v 1.5 1999/12/13 15:22:55 itojun Exp $ */ /* $NetBSD: inet6.c,v 1.6 1999/12/16 00:58:17 thorpej Exp $ */
/* BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp */ /* BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp */
/* /*
@ -39,7 +39,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)inet.c 8.4 (Berkeley) 4/20/94"; static char sccsid[] = "@(#)inet.c 8.4 (Berkeley) 4/20/94";
#else #else
__RCSID("$NetBSD: inet6.c,v 1.5 1999/12/13 15:22:55 itojun Exp $"); __RCSID("$NetBSD: inet6.c,v 1.6 1999/12/16 00:58:17 thorpej Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -679,7 +679,8 @@ ip6_ifstats(ifname)
struct in6_ifreq ifr; struct in6_ifreq ifr;
int s; int s;
#define p(f, m) if (ifr.ifr_ifru.ifru_stat.f || sflag <= 1) \ #define p(f, m) if (ifr.ifr_ifru.ifru_stat.f || sflag <= 1) \
printf(m, ifr.ifr_ifru.ifru_stat.f, plural(ifr.ifr_ifru.ifru_stat.f)) printf(m, (unsigned long long)ifr.ifr_ifru.ifru_stat.f, \
plural(ifr.ifr_ifru.ifru_stat.f))
#define p_5(f, m) if (ifr.ifr_ifru.ifru_stat.f || sflag <= 1) \ #define p_5(f, m) if (ifr.ifr_ifru.ifru_stat.f || sflag <= 1) \
printf(m, ip6stat.f) printf(m, ip6stat.f)
@ -1044,7 +1045,8 @@ icmp6_ifstats(ifname)
struct in6_ifreq ifr; struct in6_ifreq ifr;
int s; int s;
#define p(f, m) if (ifr.ifr_ifru.ifru_icmp6stat.f || sflag <= 1) \ #define p(f, m) if (ifr.ifr_ifru.ifru_icmp6stat.f || sflag <= 1) \
printf(m, (u_quad_t)ifr.ifr_ifru.ifru_icmp6stat.f, plural(ifr.ifr_ifru.ifru_icmp6stat.f)) printf(m, (unsigned long long)ifr.ifr_ifru.ifru_icmp6stat.f, \
plural(ifr.ifr_ifru.ifru_icmp6stat.f))
if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
perror("Warning: socket(AF_INET6)"); perror("Warning: socket(AF_INET6)");

7
usr.bin/netstat/mroute6.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mroute6.c,v 1.5 1999/12/13 15:22:55 itojun Exp $ */ /* $NetBSD: mroute6.c,v 1.6 1999/12/16 00:58:17 thorpej Exp $ */
/* /*
* Copyright (C) 1998 WIDE Project. * Copyright (C) 1998 WIDE Project.
@ -163,7 +163,8 @@ mroute6pr(mrpaddr, mfcaddr, mifaddr)
printf(" %5s", (mifp->m6_flags & MIFF_REGISTER) ? printf(" %5s", (mifp->m6_flags & MIFF_REGISTER) ?
"reg0" : if_indextoname(ifnet.if_index, ifname)); "reg0" : if_indextoname(ifnet.if_index, ifname));
printf(" %9llu %9llu\n", mifp->m6_pkt_in, mifp->m6_pkt_out); printf(" %9llu %9llu\n", (unsigned long long)mifp->m6_pkt_in,
(unsigned long long)mifp->m6_pkt_out);
} }
if (!banner_printed) if (!banner_printed)
printf("\nIPv6 Multicast Interface Table is empty\n"); printf("\nIPv6 Multicast Interface Table is empty\n");
@ -187,7 +188,7 @@ mroute6pr(mrpaddr, mfcaddr, mifaddr)
routename6(&mfc.mf6c_origin)); routename6(&mfc.mf6c_origin));
printf(" %-*.*s", WID_GRP, WID_GRP, printf(" %-*.*s", WID_GRP, WID_GRP,
routename6(&mfc.mf6c_mcastgrp)); routename6(&mfc.mf6c_mcastgrp));
printf(" %9llu", mfc.mf6c_pkt_cnt); printf(" %9llu", (unsigned long long)mfc.mf6c_pkt_cnt);
for (waitings = 0, rtep = mfc.mf6c_stall; rtep; ) { for (waitings = 0, rtep = mfc.mf6c_stall; rtep; ) {
waitings++; waitings++;