resolv: Remove DEBUG from resolv/res_query.c

diff --git a/ChangeLog b/ChangeLog
index aa6b71af7e4e2e36e9ddb251768160f19e966547..6e8e456b27f47cfb48d33c8e6c8be80be9690637 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-30  Florian Weimer  <fweimer@redhat.com>
+
+       * resolv/res_query.c (DEBUG): Remove preprocessor conditional.
+
 2017-06-30  Florian Weimer  <fweimer@redhat.com>
 
        * resolv/res_data.c: Reformat to GNU style.

diff --git a/resolv/res_query.c b/resolv/res_query.c
index 5312c8e729c395165fca38a709ebbf0eebea4926..760bf324e817c79e37e61a56f770fcaee69f6b45 100644 (file)
--- a/resolv/res_query.c
+++ b/resolv/res_query.c
@@ -80,9 +80,6 @@
 #include <string.h>
 #include <shlib-compat.h>
 
-/* Options.  Leave them on. */
-/* #undef DEBUG */
-
 #if PACKETSZ > 65536
 #define MAXPACKET      PACKETSZ
 #else
@@ -133,11 +130,6 @@ __libc_res_nquery(res_state statp,
  again:
        hp->rcode = NOERROR;    /* default */
 
-#ifdef DEBUG
-       if (statp->options & RES_DEBUG)
-               printf(";; res_query(%s, %d, %d)\n", name, class, type);
-#endif
-
        if (type == T_QUERY_A_AND_AAAA)
          {
            n = res_nmkquery(statp, QUERY, name, class, T_A, NULL, 0, NULL,
@@ -211,10 +203,6 @@ __libc_res_nquery(res_state statp,
                }
        }
        if (__glibc_unlikely (n <= 0))       {
-#ifdef DEBUG
-               if (statp->options & RES_DEBUG)
-                       printf(";; res_query: mkquery failed\n");
-#endif
                RES_SET_H_ERRNO(statp, NO_RECOVERY);
                if (use_malloc)
                        free (buf);
@@ -227,10 +215,6 @@ __libc_res_nquery(res_state statp,
        if (use_malloc)
                free (buf);
        if (n < 0) {
-#ifdef DEBUG
-               if (statp->options & RES_DEBUG)
-                       printf(";; res_query: send error\n");
-#endif
                RES_SET_H_ERRNO(statp, TRY_AGAIN);
                return (n);
        }
@@ -260,15 +244,6 @@ __libc_res_nquery(res_state statp,
 
        if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0)
            && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) {
-#ifdef DEBUG
-               if (statp->options & RES_DEBUG) {
-                       printf(";; rcode = %d, ancount=%d\n", hp->rcode,
-                           ntohs(hp->ancount));
-                       if (hp != hp2)
-                         printf(";; rcode2 = %d, ancount2=%d\n", hp2->rcode,
-                                ntohs(hp2->ancount));
-               }
-#endif
                switch (hp->rcode == NOERROR ? hp2->rcode : hp->rcode) {
                case NXDOMAIN:
                        if ((hp->rcode == NOERROR && ntohs (hp->ancount) != 0)
@@ -374,12 +349,6 @@ __libc_res_nsearch(res_state statp,
                                          anslen, answerp, answerp2,
                                          nanswerp2, resplen2, answerp2_malloced));
 
-#ifdef DEBUG
-       if (statp->options & RES_DEBUG)
-               printf("dots=%d, statp->ndots=%d, trailing_dot=%d, name=%s\n",
-                      (int)dots,(int)statp->ndots,(int)trailing_dot,name);
-#endif
-
        /*
         * If there are enough dots in the name, let's just give it a
         * try 'as is'. The threshold can be set with the "ndots" option.
@@ -590,11 +559,6 @@ __libc_res_nquerydomain(res_state statp,
        const char *longname = nbuf;
        size_t n, d;
 
-#ifdef DEBUG
-       if (statp->options & RES_DEBUG)
-               printf(";; res_nquerydomain(%s, %s, %d, %d)\n",
-                      name, domain?domain:"<Nil>", class, type);
-#endif
        if (domain == NULL) {
                n = strlen(name);