summaryrefslogtreecommitdiffstats
path: root/usr.bin/netstat
diff options
context:
space:
mode:
authoraraujo <araujo@FreeBSD.org>2016-10-21 03:10:05 +0000
committeraraujo <araujo@FreeBSD.org>2016-10-21 03:10:05 +0000
commit13d5943eb1c48958acff57c5b739063af9033b4d (patch)
tree5f7a76897f4c6e25429c89bcd196e8dee33a922b /usr.bin/netstat
parentb5d55a96cbc8a6e7f907443e2ded5383320ae62c (diff)
downloadFreeBSD-src-13d5943eb1c48958acff57c5b739063af9033b4d.zip
FreeBSD-src-13d5943eb1c48958acff57c5b739063af9033b4d.tar.gz
MFC r303541, r303542, r303543, r303545, r303546, r303547, r304225, r304226, r304605, r304676, r305212, r305863:
r303541: Use nitems() from sys/param.h. Sponsored by: gandi.net (BSD Day Taiwan) MFC after: 2 weeks. r303542: Use nitems() from sys/param.h. MFC after: 2 weeks. Sponsored by: gandi.net (BSD Day Taiwan) r303543: Use nitems() from sys/param.h. MFC after: 2 weeks. Sponsored by: gandi.net (BSD Day Taiwan) r303545: Use nitems() from sys/param.h. MFC after: 2 weeks. Sponsored by: gandi.net (BSD Day Taiwan) r303546: Use nitems() from sys/param.h. MFC after: 2 weeks. Sponsored by: gandi.net (BSD Day Taiwan) r303547: Use nitems() from sys/param.h. MFC after: 2 weeks. Sponsored by: gandi.net (BSD Day Taiwan) r304225: Use nitems() from sys/param.h. MFC after: 2 weeks. r304226: Use nitems() from sys/param.h. MFC after: 2 weeks. r304605: Fix calloc(3) argument order. Reviewed by: trasz MFC after: 4 weeks. Differential Revision: https://reviews.freebsd.org/D7532 r304676: Fix calloc(3) argument order. MFC after: 4 weeks. r305212: - Invert calloc(3) argument order. MFC after: 4 weeks r305863: Invert calloc(3) argument order. Reviewed by: ed. MFC after: 4 weeks. Differential Revision: https://reviews.freebsd.org/D7902
Diffstat (limited to 'usr.bin/netstat')
-rw-r--r--usr.bin/netstat/pfkey.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.bin/netstat/pfkey.c b/usr.bin/netstat/pfkey.c
index 1a60b48..e12181b 100644
--- a/usr.bin/netstat/pfkey.c
+++ b/usr.bin/netstat/pfkey.c
@@ -101,8 +101,7 @@ static const char *pfkey_msgtype_names (int);
static const char *
pfkey_msgtype_names(int x)
{
- const int max =
- sizeof(pfkey_msgtypenames)/sizeof(pfkey_msgtypenames[0]);
+ const int max = nitems(pfkey_msgtypenames);
static char buf[20];
if (x < max && pfkey_msgtypenames[x])
OpenPOWER on IntegriCloud