simplify header inclusion

bradh352 · Jun 23, 2024 · 0ec8ec5 · 0ec8ec5
1 parent ef186fe
commit 0ec8ec5
Show file tree

Hide file tree

Showing 94 changed files with 365 additions and 797 deletions.
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
@@ -111,6 +111,5 @@ HHEADERS = ares__buf.h			\
   ares_str.h				\
   ares_strsplit.h			\
   ares_setup.h				\
-  setup_once.h				\
   thirdparty/apple/dnsinfo.h
 
diff --git a/src/lib/ares__addrinfo2hostent.c b/src/lib/ares__addrinfo2hostent.c
@@ -27,7 +27,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -47,8 +47,6 @@
 #  include <limits.h>
 #endif
 
-#include "ares.h"
-#include "ares_private.h"
 
 ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
                                      struct hostent **host)

diff --git a/src/lib/ares__addrinfo_localhost.c b/src/lib/ares__addrinfo_localhost.c
@@ -25,7 +25,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -49,10 +49,6 @@
 #  endif
 #endif
 
-#include "ares.h"
-#include "ares_inet_net_pton.h"
-#include "ares_private.h"
-
 ares_status_t ares_append_ai_node(int aftype, unsigned short port,
                                   unsigned int ttl, const void *adata,
                                   struct ares_addrinfo_node **nodes)

diff --git a/src/lib/ares__buf.c b/src/lib/ares__buf.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares__buf.h"
 #include <limits.h>

diff --git a/src/lib/ares__close_sockets.c b/src/lib/ares__close_sockets.c
@@ -25,9 +25,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-
-#include "ares.h"
 #include "ares_private.h"
 #include <assert.h>
 

diff --git a/src/lib/ares__hosts_file.c b/src/lib/ares__hosts_file.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>

diff --git a/src/lib/ares__htable.c b/src/lib/ares__htable.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares__llist.h"
 #include "ares__htable.h"

diff --git a/src/lib/ares__htable_asvp.c b/src/lib/ares__htable_asvp.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares__htable.h"
 #include "ares__htable_asvp.h"

diff --git a/src/lib/ares__htable_strvp.c b/src/lib/ares__htable_strvp.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares__htable.h"
 #include "ares__htable_strvp.h"

diff --git a/src/lib/ares__htable_szvp.c b/src/lib/ares__htable_szvp.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares__htable.h"
 #include "ares__htable_szvp.h"

diff --git a/src/lib/ares__htable_vpvp.c b/src/lib/ares__htable_vpvp.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares__htable.h"
 #include "ares__htable_vpvp.h"

diff --git a/src/lib/ares__iface_ips.c b/src/lib/ares__iface_ips.c
@@ -23,8 +23,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-
+#include "ares_private.h"
 
 #ifdef USE_WINSOCK
 #  include <winsock2.h>
@@ -59,8 +58,6 @@
 #  include <netdb.h>
 #endif
 
-#include "ares.h"
-#include "ares_private.h"
 
 static ares_status_t ares__iface_ips_enumerate(ares__iface_ips_t *ips,
                                                const char        *name);

diff --git a/src/lib/ares__llist.c b/src/lib/ares__llist.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares__llist.h"
 

diff --git a/src/lib/ares__parse_into_addrinfo.c b/src/lib/ares__parse_into_addrinfo.c
@@ -24,7 +24,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -44,8 +44,6 @@
 #  include <limits.h>
 #endif
 
-#include "ares.h"
-#include "ares_private.h"
 
 ares_status_t ares__parse_into_addrinfo(const ares_dns_record_t *dnsrec,
                                         ares_bool_t    cname_only_is_enodata,

diff --git a/src/lib/ares__slist.c b/src/lib/ares__slist.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares__slist.h"
 

diff --git a/src/lib/ares__socket.c b/src/lib/ares__socket.c
@@ -24,7 +24,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_SYS_UIO_H
 #  include <sys/uio.h>
@@ -56,8 +56,6 @@
 #include <fcntl.h>
 #include <limits.h>
 
-#include "ares.h"
-#include "ares_private.h"
 
 ares_ssize_t ares__socket_recvfrom(ares_channel_t *channel, ares_socket_t s,
                                    void *data, size_t data_len, int flags,

diff --git a/src/lib/ares__sortaddrinfo.c b/src/lib/ares__sortaddrinfo.c
@@ -36,7 +36,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -51,8 +51,6 @@
 #include <assert.h>
 #include <limits.h>
 
-#include "ares.h"
-#include "ares_private.h"
 
 struct addrinfo_sort_elem {
   struct ares_addrinfo_node *ai;

diff --git a/src/lib/ares__threads.c b/src/lib/ares__threads.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 
 #ifdef CARES_THREADS

diff --git a/src/lib/ares__timeval.c b/src/lib/ares__timeval.c
@@ -24,8 +24,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 
 #if defined(_WIN32) && !defined(MSDOS)

diff --git a/src/lib/ares_android.c b/src/lib/ares_android.c
@@ -24,13 +24,8 @@
  * SPDX-License-Identifier: MIT
  */
 #if defined(ANDROID) || defined(__ANDROID__)
-
-#  include <jni.h>
-
-#  include "ares_setup.h"
-#  include "ares.h"
-#  include "ares_android.h"
 #  include "ares_private.h"
+#  include <jni.h>
 
 static JavaVM   *android_jvm                  = NULL;
 static jobject   android_connectivity_manager = NULL;

diff --git a/src/lib/ares_cancel.c b/src/lib/ares_cancel.c
@@ -24,10 +24,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-#include <assert.h>
-
-#include "ares.h"
 #include "ares_private.h"
 
 /*

diff --git a/src/lib/ares_create_query.c b/src/lib/ares_create_query.c
@@ -24,8 +24,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 
 static int ares_create_query_int(const char *name, int dnsclass, int type,

diff --git a/src/lib/ares_data.c b/src/lib/ares_data.c
@@ -24,14 +24,10 @@
  * SPDX-License-Identifier: MIT
  */
 
-
-#include "ares_setup.h"
-
+#include "ares_private.h"
 #include <stddef.h>
-
-#include "ares.h"
+#include <assert.h>
 #include "ares_data.h"
-#include "ares_private.h"
 
 /*
 ** ares_free_data() - c-ares external API function.

diff --git a/src/lib/ares_destroy.c b/src/lib/ares_destroy.c
@@ -25,13 +25,9 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-
-#include <assert.h>
-
-#include "ares.h"
 #include "ares_private.h"
 #include "ares_event.h"
+#include <assert.h>
 
 void ares_destroy(ares_channel_t *channel)
 {

diff --git a/src/lib/ares_dns_mapping.c b/src/lib/ares_dns_mapping.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 
 ares_bool_t ares_dns_opcode_isvalid(ares_dns_opcode_t opcode)

diff --git a/src/lib/ares_dns_name.c b/src/lib/ares_dns_name.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 
 typedef struct {

diff --git a/src/lib/ares_dns_parse.c b/src/lib/ares_dns_parse.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include <limits.h>
 #ifdef HAVE_STDINT_H

diff --git a/src/lib/ares_dns_record.c b/src/lib/ares_dns_record.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include <limits.h>
 #ifdef HAVE_STDINT_H

diff --git a/src/lib/ares_dns_write.c b/src/lib/ares_dns_write.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include <limits.h>
 #ifdef HAVE_STDINT_H

diff --git a/src/lib/ares_event.h b/src/lib/ares_event.h
@@ -26,8 +26,6 @@
 #ifndef __ARES__EVENT_H
 #define __ARES__EVENT_H
 
-#include "ares_setup.h"
-
 struct ares_event;
 typedef struct ares_event ares_event_t;
 

diff --git a/src/lib/ares_event_configchg.c b/src/lib/ares_event_configchg.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares_event.h"
 

diff --git a/src/lib/ares_event_epoll.c b/src/lib/ares_event_epoll.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares_event.h"
 

diff --git a/src/lib/ares_event_kqueue.c b/src/lib/ares_event_kqueue.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares_event.h"
 

diff --git a/src/lib/ares_event_poll.c b/src/lib/ares_event_poll.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares_event.h"
 #ifdef HAVE_POLL_H

diff --git a/src/lib/ares_event_select.c b/src/lib/ares_event_select.c
@@ -29,8 +29,6 @@
  * anyhow */
 #define FD_SETSIZE 4096
 
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares_event.h"
 #ifdef HAVE_SYS_SELECT_H