=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/netstat/inet.c,v retrieving revision 1.122 retrieving revision 1.123 diff -c -r1.122 -r1.123 *** src/usr.bin/netstat/inet.c 2013/03/20 15:23:37 1.122 --- src/usr.bin/netstat/inet.c 2013/04/18 15:43:22 1.123 *************** *** 1,4 **** ! /* $OpenBSD: inet.c,v 1.122 2013/03/20 15:23:37 deraadt Exp $ */ /* $NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $ */ /* --- 1,4 ---- ! /* $OpenBSD: inet.c,v 1.123 2013/04/18 15:43:22 deraadt Exp $ */ /* $NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $ */ /* *************** *** 1175,1180 **** --- 1175,1181 ---- kread(off, &so, sizeof(so)); #define p(fmt, v, sep) printf(#v " " fmt sep, so.v); + #define pll(fmt, v, sep) printf(#v " " fmt sep, (long long) so.v); #define pp(fmt, v, sep) printf(#v " " fmt sep, hideroot ? 0 : so.v); printf("socket %#lx\n ", hideroot ? 0 : off); p("%#0.4x", so_type, "\n "); *************** *** 1197,1203 **** pp("%p", so_spliceback, "\n "); p("%lld", so_splicelen, ", "); p("%lld", so_splicemax, ", "); ! p("%ld", so_idletv.tv_sec, ", "); p("%ld", so_idletv.tv_usec, "\n "); sockbuf_dump(&so.so_rcv, "so_rcv"); sockbuf_dump(&so.so_snd, "so_snd"); --- 1198,1204 ---- pp("%p", so_spliceback, "\n "); p("%lld", so_splicelen, ", "); p("%lld", so_splicemax, ", "); ! pll("%lld", so_idletv.tv_sec, ", "); p("%ld", so_idletv.tv_usec, "\n "); sockbuf_dump(&so.so_rcv, "so_rcv"); sockbuf_dump(&so.so_snd, "so_snd");