Consistency about byte vs character in string.texi

[thirdparty/glibc.git] / resolv / res_mkquery.c

diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c
index e2c6a742c0d0b3b4b840f19189a0f95c754f039d..1635e6a0351fb5e2ead565a8c9159331d901f038 100644 (file)
--- a/resolv/res_mkquery.c
+++ b/resolv/res_mkquery.c
@@ -77,6 +77,7 @@ static const char rcsid[] = "$BINDId: res_mkquery.c,v 8.12 1999/10/13 16:39:40 v
 #include <resolv.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/time.h>
 
 /* Options.  Leave them on. */
 /* #define DEBUG */
@@ -104,9 +105,9 @@ res_nmkquery(res_state statp,
             u_char *buf,               /* buffer to put query */
             int buflen)                /* size of buffer */
 {
-       register HEADER *hp;
-       register u_char *cp;
-       register int n;
+       HEADER *hp;
+       u_char *cp;
+       int n;
        u_char *dnptrs[20], **dpp, **lastdnptr;
 
 #ifdef DEBUG
@@ -179,7 +180,7 @@ res_nmkquery(res_state statp,
                n = ns_name_compress((char *)data, cp, buflen,
                                     (const u_char **) dnptrs,
                                     (const u_char **) lastdnptr);
-               if (__builtin_expect (n < 0, 0))
+               if (__glibc_unlikely (n < 0))
                        return (-1);
                cp += n;
                buflen -= n;
@@ -194,7 +195,7 @@ res_nmkquery(res_state statp,
                /*
                 * Initialize answer section
                 */
-               if (__builtin_expect (buflen < 1 + RRFIXEDSZ + datalen, 0))
+               if (__glibc_unlikely (buflen < 1 + RRFIXEDSZ + datalen))
                        return (-1);
                *cp++ = '\0';   /* no domain name */
                NS_PUT16 (type, cp);