← Commit list

57ff2d6c91

Viktor Szakats
Viktor Szakats
2026-01-17
SUCCESS Duration: 653s

Subject

dns: flatten the include tree

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

lib/amigaos.c +1 -0lib/asyn-ares.c +1 -0lib/asyn-base.c +0 -1lib/asyn-thrdd.c +2 -0lib/asyn.h +4 -2lib/cf-https-connect.c +1 -0lib/cf-ip-happy.c +1 -0lib/cf-socket.c +1 -0lib/doh.c +1 -1lib/doh.h +0 -2lib/ftp.c +1 -0lib/hostip.c +2 -0lib/hostip.h +1 -3lib/hostip4.c +1 -0lib/hostip6.c +1 -0lib/socks.c +1 -0lib/url.c +1 -0lib/urldata.h +4 -4lib/vtls/openssl.c +1 -0lib/vtls/rustls.c +1 -0lib/vtls/wolfssl.c +1 -0tests/unit/unit1305.c +1 -0tests/unit/unit1608.c +3 -2tests/unit/unit1658.c +3 -2
lib/amigaos.c+1 -0
@@ -26,6 +26,7 @@
#ifdef __AMIGA__
#include "hostip.h"
+#include "curl_addrinfo.h"
#include "amigaos.h"
#ifdef HAVE_PROTO_BSDSOCKET_H
lib/asyn-ares.c+1 -0
@@ -47,6 +47,7 @@
#include "urldata.h"
#include "cfilters.h"
+#include "curl_addrinfo.h"
#include "curl_trc.h"
#include "hostip.h"
#include "url.h"
lib/asyn-base.c+0 -1
@@ -43,7 +43,6 @@
#endif
#include "urldata.h"
-#include "asyn.h"
#include "hostip.h"
#include "multiif.h"
#include "select.h"
lib/asyn-thrdd.c+2 -0
@@ -56,8 +56,10 @@
#include "urldata.h"
#include "cfilters.h"
+#include "curl_addrinfo.h"
#include "curl_trc.h"
#include "hostip.h"
+#include "httpsrr.h"
#include "url.h"
#include "multiif.h"
#include "curl_threads.h"
lib/asyn.h+4 -2
@@ -25,15 +25,17 @@
***************************************************************************/
#include "curl_setup.h"
+#if defined(USE_HTTPSRR) && defined(USE_ARES)
+#include "httpsrr.h"
+#endif
+
struct Curl_easy;
struct Curl_dns_entry;
#ifdef CURLRES_ASYNCH
#include "curl_addrinfo.h"
-#include "httpsrr.h"
-struct addrinfo;
struct hostent;
struct connectdata;
struct easy_pollset;
lib/cf-https-connect.c+1 -0
@@ -30,6 +30,7 @@
#include "cfilters.h"
#include "connect.h"
#include "hostip.h"
+#include "httpsrr.h"
#include "multiif.h"
#include "cf-https-connect.h"
#include "http2.h"
lib/cf-ip-happy.c+1 -0
@@ -50,6 +50,7 @@
#include "connect.h"
#include "cfilters.h"
#include "cf-ip-happy.h"
+#include "curl_addrinfo.h"
#include "curl_trc.h"
#include "multiif.h"
#include "progress.h"
lib/cf-socket.c+1 -0
@@ -61,6 +61,7 @@
#include "cfilters.h"
#include "cf-socket.h"
#include "connect.h"
+#include "curl_addrinfo.h"
#include "select.h"
#include "multiif.h"
#include "curlx/inet_pton.h"
lib/doh.c+1 -1
@@ -28,8 +28,8 @@
#include "urldata.h"
#include "curl_addrinfo.h"
#include "doh.h"
-
#include "curl_trc.h"
+#include "httpsrr.h"
#include "multiif.h"
#include "url.h"
#include "connect.h"
lib/doh.h+0 -2
@@ -25,10 +25,8 @@
***************************************************************************/
#include "urldata.h"
-#include "curl_addrinfo.h"
#ifdef USE_HTTPSRR
# include <stdint.h>
-# include "httpsrr.h"
#endif
#ifndef CURL_DISABLE_DOH
lib/ftp.c+1 -0
@@ -41,6 +41,7 @@
#include "urldata.h"
#include "sendf.h"
+#include "curl_addrinfo.h"
#include "curl_trc.h"
#include "if2ip.h"
#include "hostip.h"
lib/hostip.c+2 -0
@@ -44,10 +44,12 @@
#include <signal.h>
#include "urldata.h"
+#include "curl_addrinfo.h"
#include "curl_trc.h"
#include "connect.h"
#include "hostip.h"
#include "hash.h"
+#include "httpsrr.h"
#include "rand.h"
#include "curl_share.h"
#include "url.h"
lib/hostip.h+1 -3
@@ -26,10 +26,7 @@
#include "curl_setup.h"
#include "hash.h"
-#include "curl_addrinfo.h"
#include "curlx/timeval.h" /* for curltime, timediff_t */
-#include "asyn.h"
-#include "httpsrr.h"
#ifdef USE_HTTPSRR
# include <stdint.h>
@@ -50,6 +47,7 @@ struct hostent;
struct Curl_easy;
struct connectdata;
struct easy_pollset;
+struct Curl_https_rrinfo;
enum alpnid {
ALPN_none = 0,
lib/hostip4.c+1 -0
@@ -43,6 +43,7 @@
#endif
#include "urldata.h"
+#include "curl_addrinfo.h"
#include "curl_trc.h"
#include "hostip.h"
#include "url.h"
lib/hostip6.c+1 -0
@@ -44,6 +44,7 @@
#include "urldata.h"
#include "cfilters.h"
+#include "curl_addrinfo.h"
#include "curl_trc.h"
#include "hostip.h"
#include "url.h"
lib/socks.c+1 -0
@@ -34,6 +34,7 @@
#include "urldata.h"
#include "bufq.h"
+#include "curl_addrinfo.h"
#include "curl_trc.h"
#include "select.h"
#include "cfilters.h"
lib/url.c+1 -0
@@ -73,6 +73,7 @@
#include "vtls/vtls.h"
#include "hostip.h"
#include "transfer.h"
+#include "curl_addrinfo.h"
#include "curl_trc.h"
#include "progress.h"
#include "cookie.h"
lib/urldata.h+4 -4
@@ -131,10 +131,6 @@ typedef uint32_t curl_prot_t;
input easier and better. */
#define CURL_MAX_INPUT_LENGTH 8000000
-#include "cookie.h"
-#include "psl.h"
-#include "formdata.h"
-
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
@@ -144,6 +140,10 @@ typedef uint32_t curl_prot_t;
#include "curlx/timeval.h"
+#include "asyn.h"
+#include "cookie.h"
+#include "psl.h"
+#include "formdata.h"
#include "http_chunks.h" /* for the structs and enum stuff */
#include "hostip.h"
#include "hash.h"
lib/vtls/openssl.c+1 -0
@@ -43,6 +43,7 @@
#include "../urldata.h"
#include "../curl_trc.h"
+#include "../httpsrr.h"
#include "../formdata.h" /* for the boundary function */
#include "../url.h" /* for the ssl config check function */
#include "../curlx/inet_pton.h"
lib/vtls/rustls.c+1 -0
@@ -33,6 +33,7 @@
#include "../curlx/strerr.h"
#include "../urldata.h"
#include "../curl_trc.h"
+#include "../httpsrr.h"
#include "vtls.h"
#include "vtls_int.h"
#include "rustls.h"
lib/vtls/wolfssl.c+1 -0
@@ -53,6 +53,7 @@
#include "../urldata.h"
#include "../curl_trc.h"
+#include "../httpsrr.h"
#include "vtls.h"
#include "vtls_int.h"
#include "vtls_scache.h"
tests/unit/unit1305.c+1 -0
@@ -33,6 +33,7 @@
#include <arpa/inet.h>
#endif
+#include "curl_addrinfo.h"
#include "hash.h"
#include "hostip.h"
tests/unit/unit1608.c+3 -2
@@ -23,10 +23,11 @@
***************************************************************************/
#include "unitcheck.h"
-#include "hostip.h"
-
#ifndef CURL_DISABLE_SHUFFLE_DNS
+#include "urldata.h"
+#include "curl_addrinfo.h"
+
CURLcode Curl_shuffle_addr(struct Curl_easy *data,
struct Curl_addrinfo **addr);
tests/unit/unit1658.c+3 -2
@@ -23,11 +23,12 @@
***************************************************************************/
#include "unitcheck.h"
-#include "doh.h"
-
/* DoH + HTTPSRR are required */
#if !defined(CURL_DISABLE_DOH) && defined(USE_HTTPSRR)
+#include "doh.h"
+#include "httpsrr.h"
+
static CURLcode t1658_setup(void)
{
/* whatever you want done first */