Module Name: src
Committed By: martin
Date: Thu Jun 20 10:43:18 UTC 2013
Modified Files:
src/usr.bin/netstat: inet.c inet6.c
Log Message:
Not all pointers are 64bit - use uintptr_t instead of uint64_t.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/usr.bin/netstat/inet.c
cvs rdiff -u -r1.61 -r1.62 src/usr.bin/netstat/inet6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/netstat/inet.c
diff -u src/usr.bin/netstat/inet.c:1.102 src/usr.bin/netstat/inet.c:1.103
--- src/usr.bin/netstat/inet.c:1.102 Wed Jun 19 21:12:03 2013
+++ src/usr.bin/netstat/inet.c Thu Jun 20 10:43:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: inet.c,v 1.102 2013/06/19 21:12:03 christos Exp $ */
+/* $NetBSD: inet.c,v 1.103 2013/06/20 10:43:18 martin Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)inet.c 8.4 (Berkeley) 4/20/94";
#else
-__RCSID("$NetBSD: inet.c,v 1.102 2013/06/19 21:12:03 christos Exp $");
+__RCSID("$NetBSD: inet.c,v 1.103 2013/06/20 10:43:18 martin Exp $");
#endif
#endif /* not lint */
@@ -306,7 +306,7 @@ getpcblist_kmem(u_long off, const char *
(char *)&tcpcb, sizeof (tcpcb));
}
pcblist[i].ki_ppcbaddr =
- istcp ? (uint64_t) inpcb.inp_ppcb : (uint64_t) prev;
+ istcp ? (uintptr_t) inpcb.inp_ppcb : (uintptr_t) prev;
pcblist[i].ki_rcvq = (uint64_t)sockb.so_rcv.sb_cc;
pcblist[i].ki_sndq = (uint64_t)sockb.so_snd.sb_cc;
Index: src/usr.bin/netstat/inet6.c
diff -u src/usr.bin/netstat/inet6.c:1.61 src/usr.bin/netstat/inet6.c:1.62
--- src/usr.bin/netstat/inet6.c:1.61 Wed Jun 19 21:12:03 2013
+++ src/usr.bin/netstat/inet6.c Thu Jun 20 10:43:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: inet6.c,v 1.61 2013/06/19 21:12:03 christos Exp $ */
+/* $NetBSD: inet6.c,v 1.62 2013/06/20 10:43:18 martin Exp $ */
/* BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp */
/*
@@ -64,7 +64,7 @@
#if 0
static char sccsid[] = "@(#)inet.c 8.4 (Berkeley) 4/20/94";
#else
-__RCSID("$NetBSD: inet6.c,v 1.61 2013/06/19 21:12:03 christos Exp $");
+__RCSID("$NetBSD: inet6.c,v 1.62 2013/06/20 10:43:18 martin Exp $");
#endif
#endif /* not lint */
@@ -323,7 +323,7 @@ getpcblist_kmem(u_long off, const char *
#endif
}
pcblist[i].ki_ppcbaddr =
- istcp ? (uint64_t) in6pcb.in6p_ppcb : (uint64_t) prev;
+ istcp ? (uintptr_t) in6pcb.in6p_ppcb : (uintptr_t) prev;
pcblist[i].ki_rcvq = (uint64_t)sockb.so_rcv.sb_cc;
pcblist[i].ki_sndq = (uint64_t)sockb.so_snd.sb_cc;
sin6.sin6_addr = in6pcb.in6p_laddr;
