change struct cares_ to just cares_ for declarations

c-ares · kylebevans · Jan 25, 2021 · Jan 25, 2021 · Jan 30, 2021 · Jan 30, 2021
commit 281489419f9b61f54e117e6ed369acd6ef2422f0
diff --git a/include/ares.h b/include/ares.h
@@ -623,6 +623,7 @@ struct ares_soa_reply {
 struct cares_soa_reply;
 
 typedef struct cares_soa_reply cares_soa_reply;
+
 struct ares_uri_reply {
   struct ares_uri_reply  *next;
   unsigned short          priority;

diff --git a/src/lib/ares_private.h b/src/lib/ares_private.h
@@ -440,7 +440,7 @@ int ares__connect_socket(ares_channel channel,
  * cares reply structs can be modified without breaking ABI.
  */
  struct cares_caa_reply {
-  struct cares_caa_reply  *next;
+  cares_caa_reply         *next;
   int                      critical;
   unsigned char           *property;
   size_t                   plength;  /* plength excludes null termination */
@@ -450,19 +450,19 @@ int ares__connect_socket(ares_channel channel,
 };
 
 struct cares_ptr_reply {
-  struct cares_ptr_reply *next;
+  cares_ptr_reply        *next;
   char                   *host;
   unsigned int            ttl;
 };
 
 struct cares_ns_reply {
-  struct cares_ns_reply *next;
+  cares_ns_reply        *next;
   char                  *host;
   unsigned int           ttl;
 };
 
 struct cares_srv_reply {
-  struct cares_srv_reply *next;
+  cares_srv_reply        *next;
   char                   *host;
   unsigned short          priority;
   unsigned short          weight;
@@ -471,14 +471,14 @@ struct cares_srv_reply {
 };
 
 struct cares_mx_reply {
-  struct cares_mx_reply   *next;
+  cares_mx_reply          *next;
   char                    *host;
   unsigned short           priority;
   unsigned int             ttl;
 };
 
 struct cares_txt_reply {
-  struct cares_txt_reply *next;
+  cares_txt_reply        *next;
   unsigned char          *txt;
   size_t                  length;
   /* 1 - if start of new record
@@ -488,7 +488,7 @@ struct cares_txt_reply {
 };
 
 struct cares_naptr_reply {
-  struct cares_naptr_reply *next;
+  cares_naptr_reply        *next;
   unsigned char            *flags;
   unsigned char            *service;
   unsigned char            *regexp;

diff --git a/src/lib/cares_parse_mx_reply.c b/src/lib/cares_parse_mx_reply.c
@@ -45,9 +45,9 @@ cares_parse_mx_reply (const unsigned char *abuf, int alen,
   unsigned int rr_ttl;
   long len;
   char *hostname = NULL, *rr_name = NULL;
-  struct cares_mx_reply *mx_head = NULL;
-  struct cares_mx_reply *mx_last = NULL;
-  struct cares_mx_reply *mx_curr;
+  cares_mx_reply *mx_head = NULL;
+  cares_mx_reply *mx_last = NULL;
+  cares_mx_reply *mx_curr;
 
   /* Set *mx_out to NULL for all failure cases. */
   *mx_out = NULL;

diff --git a/src/lib/cares_parse_naptr_reply.c b/src/lib/cares_parse_naptr_reply.c
@@ -36,7 +36,7 @@
 
 int
 cares_parse_naptr_reply (const unsigned char *abuf, int alen,
-                        struct cares_naptr_reply **naptr_out)
+                         cares_naptr_reply **naptr_out)
 {
   unsigned int qdcount, ancount, i;
   const unsigned char *aptr, *vptr;
@@ -48,9 +48,9 @@ cares_parse_naptr_reply (const unsigned char *abuf, int alen,
   unsigned char* service = NULL;
   unsigned char* regexp = NULL;
   char* replacement = NULL;
-  struct cares_naptr_reply *naptr_head = NULL;
-  struct cares_naptr_reply *naptr_last = NULL;
-  struct cares_naptr_reply *naptr_curr;
+  cares_naptr_reply *naptr_head = NULL;
+  cares_naptr_reply *naptr_last = NULL;
+  cares_naptr_reply *naptr_curr;
 
   /* Set *naptr_out to NULL for all failure cases. */
   *naptr_out = NULL;

diff --git a/src/lib/cares_parse_soa_reply.c b/src/lib/cares_parse_soa_reply.c
@@ -36,14 +36,14 @@
 
 int
 cares_parse_soa_reply(const unsigned char *abuf, int alen,
-                      struct cares_soa_reply **soa_out)
+                      cares_soa_reply **soa_out)
 {
   const unsigned char *aptr;
   char* nsname = NULL;
   char* hostmaster = NULL;
   long len;
   char *qname = NULL, *rr_name = NULL;
-  struct cares_soa_reply *soa = NULL;
+  cares_soa_reply *soa = NULL;
   int qdcount, ancount, qclass;
   int status, i, rr_type, rr_class, rr_len;
   unsigned int rr_ttl;

diff --git a/src/lib/cares_parse_txt_reply.c b/src/lib/cares_parse_txt_reply.c
@@ -50,9 +50,9 @@ int cares_parse_txt_reply (const unsigned char *abuf, int alen,
   unsigned int rr_ttl;
   long len;
   char *hostname = NULL, *rr_name = NULL;
-  struct cares_txt_reply *txt_head = NULL;
-  struct cares_txt_reply *txt_last = NULL;
-  struct cares_txt_reply *txt_curr;
+  cares_txt_reply *txt_head = NULL;
+  cares_txt_reply *txt_last = NULL;
+  cares_txt_reply *txt_curr;
 
   /* Set *txt_out to NULL for all failure cases. */
   *txt_out = NULL;

diff --git a/test/ares-test-parse-caa.cc b/test/ares-test-parse-caa.cc
@@ -123,7 +123,7 @@ TEST_F(LibraryTest, ParseCCaaBogusReply1) {
     0x6B, 0x69, 0x2E, 0x67, 0x6F, 0x6F, 0x67                                                          //  ki.goog
   };
 
-  struct cares_caa_reply* caa = nullptr;
+  cares_caa_reply* caa = nullptr;
   EXPECT_EQ(ARES_EBADRESP, cares_parse_caa_reply(data.data(), data.size(), &caa));
   ASSERT_EQ(nullptr, caa);
 }
@@ -149,7 +149,7 @@ TEST_F(LibraryTest, ParseCCaaBogusReply2) {
     0x6B, 0x69, 0x2E, 0x67, 0x6F, 0x6F, 0x67                                                          //  ki.goog
   };
 
-  struct cares_caa_reply* caa = nullptr;
+  cares_caa_reply* caa = nullptr;
   EXPECT_EQ(ARES_EBADRESP, cares_parse_caa_reply(data.data(), data.size(), &caa));
   ASSERT_EQ(nullptr, caa);
 }
@@ -175,7 +175,7 @@ TEST_F(LibraryTest, ParseCCaaBogusReply3) {
     0x6B, 0x69, 0x2E, 0x67, 0x6F, 0x6F, 0x67                                                          //  ki.goog
   };
 
-  struct cares_caa_reply* caa = nullptr;
+  cares_caa_reply* caa = nullptr;
   EXPECT_EQ(ARES_EBADRESP, cares_parse_caa_reply(data.data(), data.size(), &caa));
   ASSERT_EQ(nullptr, caa);
 }
@@ -207,7 +207,7 @@ TEST_F(LibraryTest, ParseCCaaEmptyReply) {
     0x80, 0x00, 0x00, 0x02, 0x58                                                                      //  ....X
   };
 
-  struct cares_caa_reply* caa = nullptr;
+  cares_caa_reply* caa = nullptr;
   EXPECT_EQ(ARES_ENODATA, cares_parse_caa_reply(data.data(), data.size(), &caa));
   ASSERT_EQ(nullptr, caa);
 }

diff --git a/test/ares-test-parse-mx.cc b/test/ares-test-parse-mx.cc
@@ -38,14 +38,14 @@ TEST_F(LibraryTest, ParseCMxReplyOK) {
     .add_answer(new DNSMxRR("example.com", 100, 200, "mx2.example.com"));
   std::vector<byte> data = pkt.data();
 
-  struct cares_mx_reply* mx = nullptr;
+  cares_mx_reply* mx = nullptr;
   EXPECT_EQ(ARES_SUCCESS, cares_parse_mx_reply(data.data(), data.size(), &mx));
   ASSERT_NE(nullptr, mx);
   EXPECT_EQ("mx1.example.com", std::string(cares_mx_reply_get_host(mx)));
   EXPECT_EQ(100, cares_mx_reply_get_priority(mx));
   EXPECT_EQ(100, cares_mx_reply_get_ttl(mx));
 
-  struct cares_mx_reply* mx2 = cares_mx_reply_get_next(mx);
+  cares_mx_reply* mx2 = cares_mx_reply_get_next(mx);
   ASSERT_NE(nullptr, mx2);
   EXPECT_EQ("mx2.example.com", std::string(cares_mx_reply_get_host(mx2)));
   EXPECT_EQ(200, cares_mx_reply_get_priority(mx2));
@@ -112,7 +112,7 @@ TEST_F(LibraryTest, ParseCMxReplyMalformed) {
     0x02,
   };
 
-  struct cares_mx_reply* mx = nullptr;
+  cares_mx_reply* mx = nullptr;
   EXPECT_EQ(ARES_EBADRESP, cares_parse_mx_reply(data.data(), data.size(), &mx));
   ASSERT_EQ(nullptr, mx);
 }
@@ -182,7 +182,7 @@ TEST_F(LibraryTest, ParseCMxReplyErrors) {
     .add_question(new DNSQuestion("example.com", T_MX))
     .add_answer(new DNSMxRR("example.com", 100, 100, "mx1.example.com"));
   std::vector<byte> data;
-  struct cares_mx_reply* mx = nullptr;
+  cares_mx_reply* mx = nullptr;
 
   // No question.
   pkt.questions_.clear();

diff --git a/test/ares-test-parse-naptr.cc b/test/ares-test-parse-naptr.cc
@@ -50,7 +50,7 @@ TEST_F(LibraryTest, ParseCNaptrReplyOK) {
                                11, 21, "SP", "service2", "regexp2", "replace2"));
   std::vector<byte> data = pkt.data();
 
-  struct cares_naptr_reply* naptr = nullptr;
+  cares_naptr_reply* naptr = nullptr;
   EXPECT_EQ(ARES_SUCCESS, cares_parse_naptr_reply(data.data(), data.size(), &naptr));
   ASSERT_NE(nullptr, naptr);
   EXPECT_EQ("SP", std::string((char*)cares_naptr_reply_get_flags(naptr)));
@@ -61,7 +61,7 @@ TEST_F(LibraryTest, ParseCNaptrReplyOK) {
   EXPECT_EQ(20, cares_naptr_reply_get_preference(naptr));
   EXPECT_EQ(100, cares_naptr_reply_get_ttl(naptr));
 
-  struct cares_naptr_reply* naptr2 = cares_naptr_reply_get_next(naptr);
+  cares_naptr_reply* naptr2 = cares_naptr_reply_get_next(naptr);
   ASSERT_NE(nullptr, naptr2);
   EXPECT_EQ("SP", std::string((char*)cares_naptr_reply_get_flags(naptr2)));
   EXPECT_EQ("service2", std::string((char*)cares_naptr_reply_get_service(naptr2)));
@@ -139,7 +139,7 @@ TEST_F(LibraryTest, ParseCNaptrReplyErrors) {
     .add_answer(new DNSNaptrRR("example.com", 100,
                                10, 20, "SP", "service", "regexp", "replace"));
   std::vector<byte> data;
-  struct cares_naptr_reply* naptr = nullptr;
+  cares_naptr_reply* naptr = nullptr;
 
   // No question.
   pkt.questions_.clear();
@@ -243,7 +243,7 @@ TEST_F(LibraryTest, ParseCNaptrReplyTooShort) {
     0x00, 0x01,  // rdata length
     0x00,  // Too short: expect 2 x int16 and 3 x name (min 1 byte each)
   };
-  struct cares_naptr_reply* naptr = nullptr;
+  cares_naptr_reply* naptr = nullptr;
   EXPECT_EQ(ARES_EBADRESP, cares_parse_naptr_reply(data.data(), data.size(), &naptr));
 }
 
@@ -274,7 +274,7 @@ TEST_F(LibraryTest, ParseCNaptrReplyAllocFail) {
     .add_answer(new DNSNaptrRR("example.com", 0x0010,
                                11, 21, "SP", "service2", "regexp2", "replace2"));
   std::vector<byte> data = pkt.data();
-  struct cares_naptr_reply* naptr = nullptr;
+  cares_naptr_reply* naptr = nullptr;
 
   for (int ii = 1; ii <= 13; ii++) {
     ClearFails();

diff --git a/test/ares-test-parse-ptr.cc b/test/ares-test-parse-ptr.cc
@@ -32,7 +32,7 @@ TEST_F(LibraryTest, ParseCPtrReplyOK) {
     .add_answer(new DNSPtrRR("64.48.32.16.in-addr.arpa", 100, "other.com"));
   std::vector<byte> data = pkt.data();
 
-  struct cares_ptr_reply *ptr = nullptr;
+  cares_ptr_reply *ptr = nullptr;
   EXPECT_EQ(ARES_SUCCESS, cares_parse_ptr_reply(data.data(), data.size(), &ptr));
   ASSERT_NE(nullptr, ptr);
 
@@ -68,7 +68,7 @@ TEST_F(LibraryTest, ParseCPtrReplyCname) {
     .add_answer(new DNSPtrRR("64.48.32.8.in-addr.arpa", 100, "other.com"));
   std::vector<byte> data = pkt.data();
 
-  struct cares_ptr_reply *ptr = nullptr;
+  cares_ptr_reply *ptr = nullptr;
   EXPECT_EQ(ARES_SUCCESS, cares_parse_ptr_reply(data.data(), data.size(), &ptr));
   ASSERT_NE(nullptr, ptr);
 
@@ -115,7 +115,7 @@ TEST_F(LibraryTest, ParseCPtrReplyMalformedCname) {
     .add_answer(new DNSPtrRR("64.48.32.8.in-addr.arpa", 100, "other.com"));
   std::vector<byte> data = pkt.data();
 
-  struct cares_ptr_reply *ptr = nullptr;
+  cares_ptr_reply *ptr = nullptr;
   EXPECT_EQ(ARES_EBADRESP, cares_parse_ptr_reply(data.data(), data.size(), &ptr));
   ASSERT_EQ(nullptr, ptr);
 }
@@ -160,7 +160,7 @@ TEST_F(LibraryTest, ParseManyCPtrReply) {
     .add_answer(new DNSPtrRR("64.48.32.16.in-addr.arpa", 100, "other9.com"));
   std::vector<byte> data = pkt.data();
 
-  struct cares_ptr_reply *ptr = nullptr;
+  cares_ptr_reply *ptr = nullptr;
   EXPECT_EQ(ARES_SUCCESS, cares_parse_ptr_reply(data.data(), data.size(), &ptr));
   ASSERT_NE(nullptr, ptr);
   ares_free_data(ptr);
@@ -203,7 +203,7 @@ TEST_F(LibraryTest, ParseCPtrReplyAdditional) {
     .add_additional(new DNSARR("ns3.other.com", 229, {10,20,30,43}));
   std::vector<byte> data = pkt.data();
 
-  struct cares_ptr_reply *ptr = nullptr;
+  cares_ptr_reply *ptr = nullptr;
   EXPECT_EQ(ARES_SUCCESS, cares_parse_ptr_reply(data.data(), data.size(), &ptr));
   ASSERT_NE(nullptr, ptr);
   EXPECT_EQ("other.com", std::string(cares_ptr_reply_get_host(ptr)));
@@ -288,7 +288,7 @@ TEST_F(LibraryTest, ParseCPtrReplyErrors) {
     .add_question(new DNSQuestion("64.48.32.16.in-addr.arpa", T_PTR))
     .add_answer(new DNSPtrRR("64.48.32.16.in-addr.arpa", 100, "other.com"));
   std::vector<byte> data;
-  struct cares_ptr_reply *ptr = nullptr;
+  cares_ptr_reply *ptr = nullptr;
 
   // No question.
   pkt.questions_.clear();
@@ -374,7 +374,7 @@ TEST_F(LibraryTest, ParseCPtrReplyAllocFailSome) {
     .add_answer(new DNSPtrRR("64.48.32.16.in-addr.arpa", 100, "other2.com"))
     .add_answer(new DNSPtrRR("64.48.32.16.in-addr.arpa", 100, "other3.com"));
   std::vector<byte> data = pkt.data();
-  struct cares_ptr_reply *ptr = nullptr;
+  cares_ptr_reply *ptr = nullptr;
 
   for (int ii = 1; ii <= 13; ii++) {
     ClearFails();
@@ -429,7 +429,7 @@ TEST_F(LibraryTest, ParseCPtrReplyAllocFailMany) {
     .add_answer(new DNSPtrRR("64.48.32.16.in-addr.arpa", 100, "other8.com"))
     .add_answer(new DNSPtrRR("64.48.32.16.in-addr.arpa", 100, "other9.com"));
   std::vector<byte> data = pkt.data();
-  struct cares_ptr_reply *ptr = nullptr;
+  cares_ptr_reply *ptr = nullptr;
 
   for (int ii = 1; ii <= 63; ii++) {
     ClearFails();

diff --git a/test/ares-test-parse-soa-any.cc b/test/ares-test-parse-soa-any.cc
@@ -44,7 +44,7 @@ TEST_F(LibraryTest, ParseCSoaAnyReplyOK) {
                              1, 2, 3, 4, 5));
   std::vector<byte> data = pkt.data();
 
-  struct cares_soa_reply* soa = nullptr;
+  cares_soa_reply* soa = nullptr;
   EXPECT_EQ(ARES_SUCCESS, cares_parse_soa_reply(data.data(), data.size(), &soa));
   ASSERT_NE(nullptr, soa);
   EXPECT_EQ("soa1.example.com", std::string(cares_soa_reply_get_nsname(soa)));
@@ -124,7 +124,7 @@ TEST_F(LibraryTest, ParseCSoaAnyReplyErrors) {
                              "soa1.example.com", "fred.example.com",
                              1, 2, 3, 4, 5));
   std::vector<byte> data;
-  struct cares_soa_reply* soa = nullptr;
+  cares_soa_reply* soa = nullptr;
 
   // No question.
   pkt.questions_.clear();
@@ -199,7 +199,7 @@ TEST_F(LibraryTest, ParseCSoaAnyReplyAllocFail) {
                              "soa1.example.com", "fred.example.com",
                              1, 2, 3, 4, 5));
   std::vector<byte> data = pkt.data();
-  struct cares_soa_reply* soa = nullptr;
+  cares_soa_reply* soa = nullptr;
 
   for (int ii = 1; ii <= 5; ii++) {
     ClearFails();

diff --git a/test/ares-test-parse-soa.cc b/test/ares-test-parse-soa.cc
@@ -38,7 +38,7 @@ TEST_F(LibraryTest, ParseCSoaReplyOK) {
                              1, 2, 3, 4, 5));
   std::vector<byte> data = pkt.data();
 
-  struct cares_soa_reply* soa = nullptr;
+  cares_soa_reply* soa = nullptr;
   EXPECT_EQ(ARES_SUCCESS, cares_parse_soa_reply(data.data(), data.size(), &soa));
   ASSERT_NE(nullptr, soa);
   EXPECT_EQ("soa1.example.com", std::string(cares_soa_reply_get_nsname(soa)));
@@ -118,7 +118,7 @@ TEST_F(LibraryTest, ParseCSoaReplyErrors) {
                              "soa1.example.com", "fred.example.com",
                              1, 2, 3, 4, 5));
   std::vector<byte> data;
-  struct cares_soa_reply* soa = nullptr;
+  cares_soa_reply* soa = nullptr;
 
   // No question.
   pkt.questions_.clear();
@@ -193,7 +193,7 @@ TEST_F(LibraryTest, ParseCSoaReplyAllocFail) {
                              "soa1.example.com", "fred.example.com",
                              1, 2, 3, 4, 5));
   std::vector<byte> data = pkt.data();
-  struct cares_soa_reply* soa = nullptr;
+  cares_soa_reply* soa = nullptr;
 
   for (int ii = 1; ii <= 5; ii++) {
     ClearFails();