fix errors and warnings

c-ares · kylebevans · Jan 25, 2021 · Jan 25, 2021 · Jan 30, 2021 · Jan 30, 2021
commit 9583762c4e4b0619f28ea0cdbf7f8b40f3e284e2
diff --git a/include/ares.h b/include/ares.h
@@ -773,7 +773,7 @@ CARES_EXTERN const cares_srv_reply*
 cares_srv_reply_container_get_first(const cares_srv_reply_container* container);
 
 CARES_EXTERN const cares_srv_reply*
-cares_srv_reply_container_get_next(const cares_srv_reply_container* container);
+cares_srv_reply_container_get_next(cares_srv_reply_container* container);
 
 CARES_EXTERN const cares_srv_reply*
 cares_srv_reply_container_get_last(const cares_srv_reply_container* container);
@@ -784,7 +784,7 @@ cares_srv_reply_container_get_count(const cares_srv_reply_container* container);
 CARES_EXTERN unsigned int
 cares_srv_reply_container_get_curr(const cares_srv_reply_container* container);
 
-CARES_EXTERN bool
+CARES_EXTERN int
 cares_srv_reply_container_at_end(const cares_srv_reply_container* container);
 
 CARES_EXTERN const char*

diff --git a/src/lib/ares_private.h b/src/lib/ares_private.h
@@ -471,7 +471,7 @@ struct cares_srv_reply {
 };
 
 struct cares_srv_reply_container {
-  cares_srv_reply        *replies;
+  cares_srv_reply       **replies;
   unsigned int            curr;
   unsigned int            count;
 };
@@ -534,7 +534,7 @@ void cares_srv_reply_set_ttl(cares_srv_reply* srv_reply,
                              const unsigned int ttl);
 
 void cares_srv_reply_container_set_replies(cares_srv_reply_container* container,
-                                           cares_srv_reply* replies);
+                                           cares_srv_reply** replies);
 
 void cares_srv_reply_container_set_curr(cares_srv_reply_container* container,
                                         const unsigned int index);

diff --git a/src/lib/cares_container.c b/src/lib/cares_container.c
@@ -19,37 +19,37 @@
 const cares_srv_reply*
 cares_srv_reply_container_get_first(const cares_srv_reply_container* container)
 {
-  return &container[0];
+  return container->replies[0];
 }
 
 const cares_srv_reply*
-cares_srv_reply_container_get_next(const cares_srv_reply_container* container)
+cares_srv_reply_container_get_next(cares_srv_reply_container* container)
 {
   if (cares_srv_reply_container_get_count(container) == 0)
   {
-    return container->replies;
+    return container->replies[0];
   }
 
   if (container->curr == cares_srv_reply_container_get_count(container) - 1)
   {
-    return &container->replies[cares_srv_reply_container_get_count(container) - 1];
+    return container->replies[cares_srv_reply_container_get_count(container) - 1];
   }
 
   cares_srv_reply_container_set_curr(container,
     cares_srv_reply_container_get_curr(container) + 1);
 
-  return &container->replies[container->curr];
+  return container->replies[container->curr];
 }
 
 const cares_srv_reply*
 cares_srv_reply_container_get_last(const cares_srv_reply_container* container)
 {
   if (cares_srv_reply_container_get_count(container) == 0)
   {
-    return container->replies;
+    return container->replies[0];
   }
 
-  return &container->replies[cares_srv_reply_container_get_count(container) - 1];
+  return container->replies[cares_srv_reply_container_get_count(container) - 1];
 }
 
 unsigned int
@@ -64,14 +64,15 @@ cares_srv_reply_container_get_curr(const cares_srv_reply_container* container)
   return container->curr;
 }
 
-bool
+int
 cares_srv_reply_container_at_end(const cares_srv_reply_container* container)
 {
-  return cares_srv_reply_get_curr(container) == cares_srv_reply_get_count(container);
+  return cares_srv_reply_container_get_curr(container) ==
+    cares_srv_reply_container_get_count(container);
 }
 
 void cares_srv_reply_container_set_replies(cares_srv_reply_container* container,
-                                           cares_srv_reply* replies)
+                                           cares_srv_reply** replies)
 {
   container->replies = replies;
 }
@@ -86,4 +87,4 @@ void cares_srv_reply_container_set_count(cares_srv_reply_container* container,
                                          const unsigned int count)
 {
   container->count = count;
-}
+}
diff --git a/src/lib/cares_free_container.c b/src/lib/cares_free_container.c
@@ -11,37 +11,52 @@
  * without express or implied warranty.
  */
 
+#include <stddef.h>
 #include "ares_setup.h"
 #include "ares.h"
 #include "ares_private.h"
+#include "cares_free_container.h"
+#include "ares_data.h"
 
 void cares_free_container(void *containerptr)
 {
     if (containerptr == NULL) {
         return;
     }
 
+    struct cares_container *ptr;
+    unsigned int count;
+
     ptr = (void *)((char *)containerptr - offsetof(struct cares_container, container));
 
     if (ptr->mark != ARES_DATATYPE_MARK)
       return;
 
-    for (int i = 0; i < ptr->count; ++i)
+    switch (ptr->type)
+    {
+      case CARES_CONTAINER_SRV_REPLY_CONTAINER:
+        count = ptr->container.srv_container.count;
+        break;
+
+      default:
+        return;
+    }
+
+    for (unsigned int i = 0; i < count; ++i)
     {
-        curr = ptr->container->replies;
         switch (ptr->type)
         {
           case CARES_CONTAINER_SRV_REPLY_CONTAINER:
-            ares_free_data((cares_srv_reply *)curr[i]);
+            ares_free_data(ptr->container.srv_container.replies[i]);
+            if (i == count - 1)
+              ares_free(ptr->container.srv_container.replies);
             break;
 
           default:
             return;
         }
     }
 
-    ares_free(ptr->container->replies);
-    ares_free(ptr->container);
     ares_free(ptr);
 }
 
@@ -70,4 +85,4 @@ void *cares_malloc_container(cares_container_type type)
   ptr->type = type;
 
   return &ptr->container;
-}
+}
diff --git a/src/lib/cares_free_container.h b/src/lib/cares_free_container.h
@@ -12,7 +12,6 @@
  */
 
 #include "ares_private.h"
-#include "ares_data.h"
 
 typedef enum {
   CARES_CONTAINER_SRV_REPLY_CONTAINER,
@@ -22,10 +21,10 @@ typedef enum {
 
 struct cares_container {
   cares_container_type type;  /* Actual data type identifier. */
-  unsigned int  mark;  /* Private ares_data signature. */
+  unsigned int mark;  /* Private ares_data signature. */
   union {
     struct cares_srv_reply_container    srv_container;
   } container;
 };
 
-void *cares_malloc_container(cares_container_type type);
+void *cares_malloc_container(cares_container_type type);
diff --git a/src/lib/cares_parse_srv_reply.c b/src/lib/cares_parse_srv_reply.c
@@ -39,7 +39,7 @@ int
 cares_parse_srv_reply (const unsigned char *abuf, int alen,
                           cares_srv_reply_container **srv_out)
 {
-  unsigned int qdcount, ancount, i;
+  unsigned int qdcount, ancount, i, count;
   const unsigned char *aptr, *vptr;
   int status, rr_type, rr_class, rr_len;
   unsigned int rr_ttl;
@@ -49,8 +49,7 @@ cares_parse_srv_reply (const unsigned char *abuf, int alen,
   // cares_srv_reply *srv_head = NULL;
   // cares_srv_reply *srv_last = NULL;
   cares_srv_reply *srv_curr;
-  cares_srv_reply *srv_replies = NULL;
-  int count;
+  cares_srv_reply **srv_replies = NULL;
 
   /* Set *srv_out to NULL for all failure cases. */
   *srv_out = NULL;
@@ -72,7 +71,7 @@ cares_parse_srv_reply (const unsigned char *abuf, int alen,
     return ARES_ENODATA;
 
   cares_srv_reply_container_set_count(*srv_out, ancount);
-  srv_replies = ares_malloc(ancount * sizeof(*srv_replies));
+  *srv_replies = ares_malloc(ancount * sizeof(**srv_replies));
 
   /* Expand the name from the question, and skip past the question. */
   aptr = abuf + HFIXEDSZ;
@@ -145,7 +144,7 @@ cares_parse_srv_reply (const unsigned char *abuf, int alen,
           if (status != ARES_SUCCESS)
             break;
           cares_srv_reply_set_host(srv_curr, srv_host);
-          srv_replies[i] = *srv_curr;
+          srv_replies[i] = srv_curr;
         }
       else if (rr_type != T_CNAME)
         {
@@ -181,6 +180,6 @@ cares_parse_srv_reply (const unsigned char *abuf, int alen,
     }
 
   /* everything looks fine, return the data */
-  *srv_out->replies = srv_replies;
+  (*srv_out)->replies = srv_replies;
   return ARES_SUCCESS;
 }
diff --git a/src/lib/cares_reply.c b/src/lib/cares_reply.c
@@ -17,11 +17,11 @@
 #include "string.h"
 
 
-const cares_srv_reply*
-cares_srv_reply_get_next(const cares_srv_reply* srv_reply)
-{
-  return srv_reply->next;
-}
+// const cares_srv_reply*
+// cares_srv_reply_get_next(const cares_srv_reply* srv_reply)
+// {
+//   return srv_reply->next;
+// }
 
 const char* cares_srv_reply_get_host(const cares_srv_reply* srv_reply)
 {
@@ -51,11 +51,11 @@ unsigned int cares_srv_reply_get_ttl(const cares_srv_reply* srv_reply)
   return srv_reply->ttl;
 }
 
-void cares_srv_reply_set_next(cares_srv_reply* srv_reply,
-                              cares_srv_reply* next)
-{
-  srv_reply->next = next;
-}
+// void cares_srv_reply_set_next(cares_srv_reply* srv_reply,
+//                               cares_srv_reply* next)
+// {
+//   srv_reply->next = next;
+// }
 
 void cares_srv_reply_set_host(cares_srv_reply* srv_reply, char* host)
 {