From a7d40a88c91d105dcfe2f235bc84a522bfea3de2 Mon Sep 17 00:00:00 2001 From: pfg Date: Tue, 19 Apr 2016 23:48:27 +0000 Subject: kernel: use our nitems() macro when it is available through param.h. No functional change, only trivial cases are done in this sweep, Discussed in: freebsd-current --- sys/netipsec/key.c | 8 ++++---- sys/netipsec/keysock.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sys/netipsec') diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index 7070c1d..4e8c633 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -3365,7 +3365,7 @@ key_setdumpsa(struct secasvar *sav, u_int8_t type, u_int8_t satype, goto fail; result = m; - for (i = sizeof(dumporder)/sizeof(dumporder[0]) - 1; i >= 0; i--) { + for (i = nitems(dumporder) - 1; i >= 0; i--) { m = NULL; switch (dumporder[i]) { case SADB_EXT_SA: @@ -7410,7 +7410,7 @@ key_parse(struct mbuf *m, struct socket *so) */ } - if (msg->sadb_msg_type >= sizeof(key_typesw)/sizeof(key_typesw[0]) || + if (msg->sadb_msg_type >= nitems(key_typesw) || key_typesw[msg->sadb_msg_type] == NULL) { PFKEYSTAT_INC(out_invmsgtype); error = EINVAL; @@ -7562,8 +7562,8 @@ key_validate_ext(const struct sadb_ext *ext, int len) return EINVAL; /* if it does not match minimum/maximum length, bail */ - if (ext->sadb_ext_type >= sizeof(minsize) / sizeof(minsize[0]) || - ext->sadb_ext_type >= sizeof(maxsize) / sizeof(maxsize[0])) + if (ext->sadb_ext_type >= nitems(minsize) || + ext->sadb_ext_type >= nitems(maxsize)) return EINVAL; if (!minsize[ext->sadb_ext_type] || len < minsize[ext->sadb_ext_type]) return EINVAL; diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c index 73e54bb..c3092e4 100644 --- a/sys/netipsec/keysock.c +++ b/sys/netipsec/keysock.c @@ -564,7 +564,7 @@ struct domain keydomain = { .dom_destroy = key_destroy, #endif .dom_protosw = keysw, - .dom_protoswNPROTOSW = &keysw[sizeof(keysw)/sizeof(keysw[0])] + .dom_protoswNPROTOSW = &keysw[nitems(keysw)] }; VNET_DOMAIN_SET(key); -- cgit v1.1