summaryrefslogtreecommitdiffstats
path: root/lib/libc/resolv
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2016-04-16 17:52:00 +0000
committerpfg <pfg@FreeBSD.org>2016-04-16 17:52:00 +0000
commit282f928dc777faf3cee67a648bb770bbd54276d0 (patch)
tree9591d290a7b32152d9fdda623974bad433ef861f /lib/libc/resolv
parentd758bd7be40b8aeb4b09c640dd54153bfe5592ca (diff)
downloadFreeBSD-src-282f928dc777faf3cee67a648bb770bbd54276d0.zip
FreeBSD-src-282f928dc777faf3cee67a648bb770bbd54276d0.tar.gz
libc: make some more use of the nitems() macro.
We have an nitems() macro in the <sys/param.h> header that is convenient to re-use as it makes things easier to read. Given that it is available already without adding additional headers and other parts of libc already use it, extend a bit more its use.
Diffstat (limited to 'lib/libc/resolv')
-rw-r--r--lib/libc/resolv/herror.c2
-rw-r--r--lib/libc/resolv/res_mkquery.c2
-rw-r--r--lib/libc/resolv/res_mkupdate.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/libc/resolv/herror.c b/lib/libc/resolv/herror.c
index d987609..aeb308c 100644
--- a/lib/libc/resolv/herror.c
+++ b/lib/libc/resolv/herror.c
@@ -76,7 +76,7 @@ const char *h_errlist[] = {
"Unknown server error", /*%< 3 NO_RECOVERY */
"No address associated with name", /*%< 4 NO_ADDRESS */
};
-const int h_nerr = { sizeof h_errlist / sizeof h_errlist[0] };
+const int h_nerr = { nitems(h_errlist) };
#undef h_errno
int h_errno;
diff --git a/lib/libc/resolv/res_mkquery.c b/lib/libc/resolv/res_mkquery.c
index 0d45e34..349160f 100644
--- a/lib/libc/resolv/res_mkquery.c
+++ b/lib/libc/resolv/res_mkquery.c
@@ -133,7 +133,7 @@ res_nmkquery(res_state statp,
dpp = dnptrs;
*dpp++ = buf;
*dpp++ = NULL;
- lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
+ lastdnptr = dnptrs + nitems(dnptrs);
/*
* perform opcode specific processing
*/
diff --git a/lib/libc/resolv/res_mkupdate.c b/lib/libc/resolv/res_mkupdate.c
index 3ebb242..79402a7 100644
--- a/lib/libc/resolv/res_mkupdate.c
+++ b/lib/libc/resolv/res_mkupdate.c
@@ -127,7 +127,7 @@ res_nmkupdate(res_state statp, ns_updrec *rrecp_in, u_char *buf, int buflen) {
dpp = dnptrs;
*dpp++ = buf;
*dpp++ = NULL;
- lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
+ lastdnptr = dnptrs + nitems(dnptrs);
if (rrecp_start == NULL)
return (-5);
OpenPOWER on IntegriCloud