remove debugging print statements

c-ares · kylebevans · Jan 25, 2021 · Jan 25, 2021 · Jan 30, 2021 · Jan 30, 2021
commit 73248f72daba1ec6880e6627740c28506515c21b
diff --git a/src/lib/ares_data.c b/src/lib/ares_data.c
@@ -22,7 +22,6 @@
 #include "ares.h"
 #include "ares_data.h"
 #include "ares_private.h"
-#include "stdio.h"
 
 /*
 ** ares_free_data() - c-ares external API function.
@@ -80,7 +79,6 @@ void ares_free_data(void *dataptr)
             next_data = ptr->data.srv_reply.next;
           if (ptr->data.srv_reply.host)
           {
-	    printf("free host srv\n");
             ares_free(ptr->data.srv_reply.host);
           }
           break;
@@ -89,7 +87,6 @@ void ares_free_data(void *dataptr)
 
           if (ptr->data.srv_reply.host)
           {
-	    printf("free host csrv\n");
             ares_free(ptr->data.csrv_reply.host);
           }
           break;

diff --git a/src/lib/ares_parse_srv_reply.c b/src/lib/ares_parse_srv_reply.c
@@ -34,7 +34,6 @@
 #include "ares_dns.h"
 #include "ares_data.h"
 #include "ares_private.h"
-#include "stdio.h"
 
 int
 ares_parse_srv_reply (const unsigned char *abuf, int alen,
@@ -56,7 +55,6 @@ ares_parse_srv_reply (const unsigned char *abuf, int alen,
   *srv_out = NULL;
 
   status = cares_parse_srv_reply(abuf, alen, &csrv_out);
-  printf("status after cares_parse_srv_reply: %d\n", status);
 
   /* clean up on error */
   if (status != ARES_SUCCESS)
@@ -105,14 +103,12 @@ ares_parse_srv_reply (const unsigned char *abuf, int alen,
 
   if (csrv_out)
   {
-    printf("free container in ares_parse\n");
     cares_free_container(csrv_out);
   }
 
   /* clean up on error */
   if (status != ARES_SUCCESS)
   {
-    printf("free srv_head in ares_parse\n");
     if (srv_head)
       ares_free_data (srv_head);
     return status;

diff --git a/src/lib/cares_free_container.c b/src/lib/cares_free_container.c
@@ -49,13 +49,11 @@ void cares_free_container(void *containerptr)
           case CARES_CONTAINER_SRV_REPLY_CONTAINER:
             if (ptr->container.srv_container.replies[i])
             {
-	      printf("before ares_free_data in free container; count: %u\n", count);
               ares_free_data(ptr->container.srv_container.replies[i]);
             }
 
             if (i == count - 1)
             {
-	      printf("before free replies in free container\n");
               ares_free(ptr->container.srv_container.replies);
             }
             break;

diff --git a/src/lib/cares_parse_srv_reply.c b/src/lib/cares_parse_srv_reply.c
@@ -57,7 +57,6 @@ cares_parse_srv_reply (const unsigned char *abuf, int alen,
   /* Give up if abuf doesn't have room for a header. */
   if (alen < HFIXEDSZ)
   {
-    printf("alen return\n");
     return ARES_EBADRESP;
   }
 
@@ -66,12 +65,10 @@ cares_parse_srv_reply (const unsigned char *abuf, int alen,
   ancount = DNS_HEADER_ANCOUNT (abuf);
   if (qdcount != 1)
   {
-    printf("qdcount return\n");
     return ARES_EBADRESP;
   }
   if (ancount == 0)
   {
-    printf("ancount return\n");
     return ARES_ENODATA;
   }
 
@@ -84,14 +81,12 @@ cares_parse_srv_reply (const unsigned char *abuf, int alen,
     {
       ares_free(hostname);
     }
-    printf("expand_name return\n");
     return status;
   }
 
   if (aptr + len + QFIXEDSZ > abuf + alen)
     {
       ares_free (hostname);
-      printf("aptr + len + QFIXED return\n");
       return ARES_EBADRESP;
     }
   aptr += len + QFIXEDSZ;
@@ -100,7 +95,6 @@ cares_parse_srv_reply (const unsigned char *abuf, int alen,
   if (srv_replies == NULL)
   {
     ares_free (hostname);
-    printf("srv_replies null return\n");
     return ARES_ENOMEM;
   }
 
@@ -109,8 +103,6 @@ cares_parse_srv_reply (const unsigned char *abuf, int alen,
     srv_replies[i] = NULL;
   }
 
-  printf("ancount: %u\n", ancount);
-
   /* Examine each answer resource record (RR) in turn. */
   for (i = 0; i < ancount; i++)
     {
@@ -140,7 +132,6 @@ cares_parse_srv_reply (const unsigned char *abuf, int alen,
       /* Check if we are really looking at a SRV record */
       if (rr_class == C_IN && rr_type == T_SRV)
         {
-          printf("rr is srv\n");
           /* parse the SRV record itself */
           if (rr_len < 6)
             {
@@ -168,7 +159,6 @@ cares_parse_srv_reply (const unsigned char *abuf, int alen,
           status = ares_expand_name (vptr, abuf, alen, &srv_host, &len);
           if (status != ARES_SUCCESS)
             break;
-	  printf("expand name succeeded; srv_host: %p\n", (void *)srv_host);
           cares_srv_reply_set_host(srv_curr, srv_host);
           srv_replies[count] = srv_curr;
           count++;
@@ -202,7 +192,6 @@ cares_parse_srv_reply (const unsigned char *abuf, int alen,
   /* clean up on error */
   if (status != ARES_SUCCESS)
     {
-      printf("status not success in cares_parse_srv\n");
       if (srv_replies)
       {
         for(i = 0; i < count; ++i) {
@@ -218,13 +207,11 @@ cares_parse_srv_reply (const unsigned char *abuf, int alen,
       {
         ares_free(srv_host);
       }
-      printf("should have been freed return\n");
       return status;
     }
 
   /* everything looks fine, return the data */
   (*srv_out)->replies = srv_replies;
   cares_srv_reply_container_set_count(*srv_out, count);
-  printf("should have been success return\n");
   return ARES_SUCCESS;
 }