lib: drop, or replace `sendf.h` with `curl_trc.h` where possible

- replace `sendf.h` with `curl_trc.h` where it was included just for it.
- drop unused `curl_trc.h` includes.
- easy: delete obsolete comment about `send.h` include reason.

Also:
- move out `curl_trc.h` include from `sendf.h` and include it directly
  in users, where not done already. To flatten the include tree and
  to less rely on indirect includes.
- stop including `sendf.h` from other headers, replace it with forward
  declaration of `Curl_easy`, as done already elsewhere.

Verified with an all non-unity CI run.

Closes #20061

diff --git a/lib/altsvc.c b/lib/altsvc.c
index 3aa88c2cdbf6d01ae77a7764ae923adae8548aa6..b4bb875438f9a286c2548794db8e9aafebfd92dd 100644 (file)
--- a/lib/altsvc.c
+++ b/lib/altsvc.c
@@ -33,7 +33,7 @@
 #include "curl_fopen.h"
 #include "curl_get_line.h"
 #include "parsedate.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "curlx/inet_pton.h"
 #include "curlx/strparse.h"
 #include "curlx/timeval.h"

diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c
index 396ebe65e1d0b1896f9450829e853ea1311b5289..d723de987366a03dfab806c86e44fcc40eed7be8 100644 (file)
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@@ -48,7 +48,7 @@
 
 #include "urldata.h"
 #include "cfilters.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "hostip.h"
 #include "url.h"
 #include "multiif.h"

diff --git a/lib/asyn-base.c b/lib/asyn-base.c
index 4eb6979177dd712917536043c6e402ffb4c88649..398e41dffd0b47d7ce25d34ddadbd728cca8f6d8 100644 (file)
--- a/lib/asyn-base.c
+++ b/lib/asyn-base.c
@@ -46,7 +46,6 @@
 
 #include "urldata.h"
 #include "asyn.h"
-#include "sendf.h"
 #include "hostip.h"
 #include "multiif.h"
 #include "select.h"

diff --git a/lib/asyn-thrdd.c b/lib/asyn-thrdd.c
index b7fffa5a79ec33bfb53bed4943fdda48ce6b5a40..64251ae57ee14b4ec85430278d984b25759c521a 100644 (file)
--- a/lib/asyn-thrdd.c
+++ b/lib/asyn-thrdd.c
@@ -56,7 +56,7 @@
 
 #include "urldata.h"
 #include "cfilters.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "hostip.h"
 #include "url.h"
 #include "multiif.h"

diff --git a/lib/cf-socket.c b/lib/cf-socket.c
index 28326ee78f8ce43ade67c71b55f0e50cffc7e79f..ab28bc40aabb8b2b89c86e6f3677c8a1257d3f6d 100644 (file)
--- a/lib/cf-socket.c
+++ b/lib/cf-socket.c
@@ -57,7 +57,7 @@
 
 #include "urldata.h"
 #include "bufq.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "if2ip.h"
 #include "cfilters.h"
 #include "cf-socket.h"

diff --git a/lib/cfilters.c b/lib/cfilters.c
index 495ba078ba4e8ce0c1e1f5f63dbd421c94cde6ae..5f3e51111701074a4fc41c048b7fbceb3c3ea082 100644 (file)
--- a/lib/cfilters.c
+++ b/lib/cfilters.c
@@ -29,7 +29,7 @@
 #include "cfilters.h"
 #include "connect.h"
 #include "url.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "progress.h"
 #include "select.h"
 #include "curlx/strparse.h"

diff --git a/lib/conncache.c b/lib/conncache.c
index 755619317160f284a923e239b229a8c23b458b2b..7fccde05e1726a5e3a93a2c323f07b9525a107e0 100644 (file)
--- a/lib/conncache.c
+++ b/lib/conncache.c
@@ -30,7 +30,7 @@
 #include "cfilters.h"
 #include "progress.h"
 #include "multiif.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "cshutdn.h"
 #include "conncache.h"
 #include "curl_share.h"

diff --git a/lib/connect.c b/lib/connect.c
index 3e1cda561bcfe0b2e23a22f7909526682cb556f1..bb51701d0ce345007a6f6bb8dd6895a4a4c59d66 100644 (file)
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -51,7 +51,7 @@
 #endif
 
 #include "urldata.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "strerror.h"
 #include "cfilters.h"
 #include "connect.h"

diff --git a/lib/content_encoding.c b/lib/content_encoding.c
index 50e82fab3c066ce81def08088674ee0c9f646088..3139c5384c9575da2d266da2e7a9ecc784e6dd50 100644 (file)
--- a/lib/content_encoding.c
+++ b/lib/content_encoding.c
@@ -47,6 +47,7 @@
 #endif
 
 #include "sendf.h"
+#include "curl_trc.h"
 #include "http.h"
 #include "content_encoding.h"
 

diff --git a/lib/cookie.c b/lib/cookie.c
index 05a49f2d5e284a493365f5b10136deb3c212f983..cb81c8e6cc43b04df9040684957a64b5301ca47b 100644 (file)
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -29,7 +29,7 @@
 #include "urldata.h"
 #include "cookie.h"
 #include "psl.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "slist.h"
 #include "curl_share.h"
 #include "strcase.h"

diff --git a/lib/cshutdn.c b/lib/cshutdn.c
index 34aacf949bc654a79431ad4212dc0b34ef03567f..c7f2d6610ab4eda71993a2b3e1f1c560e0bf6faa 100644 (file)
--- a/lib/cshutdn.c
+++ b/lib/cshutdn.c
@@ -31,7 +31,7 @@
 #include "progress.h"
 #include "multiif.h"
 #include "multi_ev.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "cshutdn.h"
 #include "sigpipe.h"
 #include "connect.h"

diff --git a/lib/curl_gssapi.c b/lib/curl_gssapi.c
index 31addb8fbc7fa87f19ec646f51b397159629b831..efd293f15ec3e613ace0c65d06c05c3f63f48679 100644 (file)
--- a/lib/curl_gssapi.c
+++ b/lib/curl_gssapi.c
@@ -27,7 +27,7 @@
 #ifdef HAVE_GSSAPI
 
 #include "curl_gssapi.h"
-#include "sendf.h"
+#include "curl_trc.h"
 
 #ifdef DEBUGBUILD
 #if defined(HAVE_GSSGNU) || !defined(_WIN32)

diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 22acd23411361a0ef63453f54fac822a0ea46491..f71c909a681b5401eb7dc99266f1ee6e00aca5bd 100644 (file)
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -44,7 +44,7 @@
 #include "vauth/vauth.h"
 #include "cfilters.h"
 #include "curl_sasl.h"
-#include "sendf.h"
+#include "curl_trc.h"
 
 /* Supported mechanisms */
 static const struct {

diff --git a/lib/cw-out.c b/lib/cw-out.c
index e0cf54b814a900a3c08b6eb4557368e82f61eaea..ad880504a8a2525bf124dcd72a456af40a10f6fa 100644 (file)
--- a/lib/cw-out.c
+++ b/lib/cw-out.c
@@ -28,6 +28,7 @@
 #include "cfilters.h"
 #include "multiif.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "transfer.h"
 #include "cw-out.h"
 #include "cw-pause.h"

diff --git a/lib/cw-out.h b/lib/cw-out.h
index 89b9985bb546c49707c5028a4895093322d74a02..fce868d4e44f58fa2bd573b54cedce2b473814f1 100644 (file)
--- a/lib/cw-out.h
+++ b/lib/cw-out.h
@@ -26,7 +26,7 @@
 
 #include "curl_setup.h"
 
-#include "sendf.h"
+struct Curl_easy;
 
 /**
  * The client writer type "cw-out" that does the actual writing to

diff --git a/lib/cw-pause.c b/lib/cw-pause.c
index 4b8cf4ec1ee5a993fc9f1abaccbffc2791a7469e..69fd675c3820669d538df529d8ef85e64f6024ba 100644 (file)
--- a/lib/cw-pause.c
+++ b/lib/cw-pause.c
@@ -28,6 +28,7 @@
 #include "bufq.h"
 #include "cfilters.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "cw-pause.h"
 
 

diff --git a/lib/cw-pause.h b/lib/cw-pause.h
index 5421bfd663f759a73651733fe2984188d76dad7e..4f436059ce5c41848754c5eb6e1e42614e6d1a9a 100644 (file)
--- a/lib/cw-pause.h
+++ b/lib/cw-pause.h
@@ -26,7 +26,7 @@
 
 #include "curl_setup.h"
 
-#include "sendf.h"
+struct Curl_easy;
 
 /**
  * The client writer type "cw-pause" that buffers writes for

diff --git a/lib/dict.c b/lib/dict.c
index 2e5883770f473782b2f33af51d0ea3d18a6bf906..38d79db0571f1f7e8f0fa5642021922685b8d080 100644 (file)
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -54,7 +54,7 @@
 
 #include "urldata.h"
 #include "transfer.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "escape.h"
 #include "dict.h"
 

diff --git a/lib/doh.c b/lib/doh.c
index 610469222ad468bad15d1a4c92dd07dbdda7e9cf..d7d25694c809f0ee07ef5d22ace58ad58fb2a57d 100644 (file)
--- a/lib/doh.c
+++ b/lib/doh.c
@@ -30,7 +30,7 @@
 #include "curl_addrinfo.h"
 #include "doh.h"
 
-#include "sendf.h"
+#include "curl_trc.h"
 #include "multiif.h"
 #include "url.h"
 #include "connect.h"

diff --git a/lib/easy.c b/lib/easy.c
index 3e3ac4cff86de460730441aae61e0ee594ba26be..8926422780f45e2bb55593c8a97ecda3919d0db5 100644 (file)
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -58,7 +58,8 @@
 #include "multi_ev.h"
 #include "select.h"
 #include "cfilters.h"
-#include "sendf.h" /* for failf function prototype */
+#include "sendf.h"
+#include "curl_trc.h"
 #include "connect.h" /* for Curl_getconnectinfo */
 #include "slist.h"
 #include "mime.h"

diff --git a/lib/file.c b/lib/file.c
index be2f354f60c16c053fef6ff302557f514198178b..a8617c213a298b3c8843739a631f1c251074409c 100644 (file)
--- a/lib/file.c
+++ b/lib/file.c
@@ -57,6 +57,7 @@
 #include "urldata.h"
 #include "progress.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "escape.h"
 #include "file.h"
 #include "multiif.h"

diff --git a/lib/formdata.c b/lib/formdata.c
index 358bb4c49853bbc38a9faf1ae1b40ebfe93902df..576b64449661e668bb905e3d916e410424f8843c 100644 (file)
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -32,7 +32,6 @@ struct Curl_easy;
 
 #include "urldata.h" /* for struct Curl_easy */
 #include "mime.h"
-#include "sendf.h"
 #include "strdup.h"
 #include "bufref.h"
 #include "curlx/fopen.h"

diff --git a/lib/ftp.c b/lib/ftp.c
index 94735d22f5dfe7ceb1974c07a2f19cb1b1222a6e..a402dde5d8f4182453e8c4516de3d516c48ceac0 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -42,6 +42,7 @@
 
 #include "urldata.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "if2ip.h"
 #include "hostip.h"
 #include "progress.h"

diff --git a/lib/gopher.c b/lib/gopher.c
index 348e675561a7e1f8fb016cef278edbc88cf84c4c..826de91512c188b1d9a43f81452b16f7c2e55052 100644 (file)
--- a/lib/gopher.c
+++ b/lib/gopher.c
@@ -29,6 +29,7 @@
 #include "urldata.h"
 #include "transfer.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "cfilters.h"
 #include "connect.h"
 #include "gopher.h"

diff --git a/lib/headers.c b/lib/headers.c
index 3ce3e01483d5d9ce81e09b0dc54330146cd99046..5ad73dad01b65894cf6da1604f2d14bf855578e1 100644 (file)
--- a/lib/headers.c
+++ b/lib/headers.c
@@ -26,6 +26,7 @@
 
 #include "urldata.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "headers.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_HEADERS_API)

diff --git a/lib/hostip.c b/lib/hostip.c
index aa10839c20a605d5ec016c9574dad51eb535b371..2cf8d4bb1ed83d7f08189c5790df39fe3cf74d18 100644 (file)
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -45,7 +45,7 @@
 #include <signal.h>
 
 #include "urldata.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "connect.h"
 #include "hostip.h"
 #include "hash.h"

diff --git a/lib/hostip4.c b/lib/hostip4.c
index 40f709fdc02602c7acdf6b3d52052cd3046b5d51..785ca249331685fae6c06307926de543b26d3c30 100644 (file)
--- a/lib/hostip4.c
+++ b/lib/hostip4.c
@@ -44,7 +44,7 @@
 #endif
 
 #include "urldata.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "hostip.h"
 #include "url.h"
 

diff --git a/lib/hostip6.c b/lib/hostip6.c
index 2eabf753f41ef7290e7eec3324148c387666c2ca..d0d67196c4b3faec22929a72f56cadd5f55759a9 100644 (file)
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@@ -45,7 +45,7 @@
 
 #include "urldata.h"
 #include "cfilters.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "hostip.h"
 #include "url.h"
 #include "curlx/inet_pton.h"

diff --git a/lib/hsts.c b/lib/hsts.c
index d9b9f916b11a1f03ffef62bea9e7b790872cdaf3..393572a6c2efa83238fad47aeab3e151a76ad8b5 100644 (file)
--- a/lib/hsts.c
+++ b/lib/hsts.c
@@ -33,7 +33,6 @@
 #include "hsts.h"
 #include "curl_fopen.h"
 #include "curl_get_line.h"
-#include "sendf.h"
 #include "parsedate.h"
 #include "curl_share.h"
 #include "curlx/strparse.h"

diff --git a/lib/http.c b/lib/http.c
index 69361b88ec64da464c1701f0d000611e4523f6c9..bf38d35dde2bed931ae8c3b40fbde569fbe0dad9 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -50,6 +50,7 @@
 #include "urldata.h"
 #include "transfer.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "formdata.h"
 #include "mime.h"
 #include "progress.h"

diff --git a/lib/http2.c b/lib/http2.c
index 29ca95cb0925cefbca3d969219b4ba4f4edb43b0..061c4d67fb986cbf2391a5eaebbb1a12990830bb 100644 (file)
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -35,6 +35,7 @@
 #include "http2.h"
 #include "http.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "select.h"
 #include "curlx/base64.h"
 #include "multiif.h"

diff --git a/lib/http_aws_sigv4.c b/lib/http_aws_sigv4.c
index 7bc3af8b4236bf3f261d46445c8aa0a39bd50e8a..d2493b0b0ead6ac5cbcadf01a4da8d8bef597d7d 100644 (file)
--- a/lib/http_aws_sigv4.c
+++ b/lib/http_aws_sigv4.c
@@ -32,7 +32,7 @@
 #include "http_aws_sigv4.h"
 #include "curl_sha256.h"
 #include "transfer.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "escape.h"
 #include "curlx/strparse.h"
 #include "curlx/timeval.h"

diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c
index 2929f7980affdf6227824dce1fc88efba79c639d..a8e715a7b9f8f9bc914cad376aa22db0286820f1 100644 (file)
--- a/lib/http_negotiate.c
+++ b/lib/http_negotiate.c
@@ -28,7 +28,7 @@
 
 #include "urldata.h"
 #include "cfilters.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "http_negotiate.h"
 #include "vauth/vauth.h"
 #include "vtls/vtls.h"

diff --git a/lib/http_ntlm.c b/lib/http_ntlm.c
index 62a33021baabaeff9da7d2bbf24ade220359920d..e5c97269b1d95f63fb410a29b4a29ae9caf481ce 100644 (file)
--- a/lib/http_ntlm.c
+++ b/lib/http_ntlm.c
@@ -34,7 +34,7 @@
  */
 
 #include "urldata.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "strcase.h"
 #include "http_ntlm.h"
 #include "curl_ntlm_core.h"

diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index 3101f5f0a916a09cd410d606448349143addf1ef..088954f230a37784698bee85ff9e4b80e3df33ed 100644 (file)
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -28,7 +28,7 @@
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY)
 
-#include "sendf.h"
+#include "curl_trc.h"
 #include "http.h"
 #include "url.h"
 #include "cfilters.h"

diff --git a/lib/httpsrr.c b/lib/httpsrr.c
index 25abd80e11837c4c315f60838c22c380de2f9860..7013be5b6665900674da75ca045229e6ceed5759 100644 (file)
--- a/lib/httpsrr.c
+++ b/lib/httpsrr.c
@@ -29,7 +29,7 @@
 #include "urldata.h"
 #include "httpsrr.h"
 #include "connect.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "strdup.h"
 
 static CURLcode httpsrr_decode_alpn(const uint8_t *cp, size_t len,

diff --git a/lib/idn.c b/lib/idn.c
index 1907a224bf262626f19bb7d6e2e9b8a7623809f5..b3618c2de399504d5e9d4e4c39f247b69240c383 100644 (file)
--- a/lib/idn.c
+++ b/lib/idn.c
@@ -30,7 +30,6 @@
 
 #include "urldata.h"
 #include "idn.h"
-#include "sendf.h"
 
 #ifdef USE_LIBIDN2
 #include <idn2.h>

diff --git a/lib/imap.c b/lib/imap.c
index b826b67bde0c4500cdf1cf4dad15c1805adb118b..20455a957a6eaafe8e4e8369b72894fa564d70f7 100644 (file)
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -56,6 +56,7 @@
 #include "curlx/dynbuf.h"
 #include "urldata.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "hostip.h"
 #include "progress.h"
 #include "transfer.h"

diff --git a/lib/ldap.c b/lib/ldap.c
index 7e8ffcae34f1c39aecc8edfd5abdbab3b6930ea6..cad6203eeb355752ba05f53e845ab32a91b8ea59 100644 (file)
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -79,6 +79,7 @@
 #include "urldata.h"
 #include "cfilters.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "escape.h"
 #include "progress.h"
 #include "transfer.h"

diff --git a/lib/mime.c b/lib/mime.c
index 31b5306bf1de01b71e607bc7fdb6ccdf8b313144..393d709ed5db32d7e56f296c77f82b915ee448da 100644 (file)
--- a/lib/mime.c
+++ b/lib/mime.c
@@ -29,6 +29,7 @@ struct Curl_easy;
 #include "mime.h"
 #include "urldata.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "transfer.h"
 #include "strdup.h"
 #include "curlx/fopen.h"

diff --git a/lib/mqtt.c b/lib/mqtt.c
index 27b163317896d2d433482458c6be4052862de3d0..bc9671cc1796ebabb21d33350876b297e6cd2b90 100644 (file)
--- a/lib/mqtt.c
+++ b/lib/mqtt.c
@@ -30,6 +30,7 @@
 #include "urldata.h"
 #include "transfer.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "progress.h"
 #include "mqtt.h"
 #include "select.h"

diff --git a/lib/multi.c b/lib/multi.c
index 710df8548d5cf66a6d824dfb78c9815c80e95a6d..7c03de20a2a2d646721b5a660ea313723726f57b 100644 (file)
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -35,6 +35,7 @@
 #include "multiif.h"
 #include "multi_ev.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "curlx/timeval.h"
 #include "http.h"
 #include "select.h"

diff --git a/lib/openldap.c b/lib/openldap.c
index b33e7a1d36b57dfd05cd04b36274b876c5efb985..e78080ab83f3259c446b0beb820753c6587b49da 100644 (file)
--- a/lib/openldap.c
+++ b/lib/openldap.c
@@ -43,6 +43,7 @@
 #include "urldata.h"
 #include "url.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "vtls/vtls.h"
 #include "transfer.h"
 #include "curl_ldap.h"

diff --git a/lib/pingpong.c b/lib/pingpong.c
index 5b10bd61642655179f8bf181c32d0063bfe2eef7..8c5cf05fc219e56d95e982ccf71cf207e2b0c0d5 100644 (file)
--- a/lib/pingpong.c
+++ b/lib/pingpong.c
@@ -31,6 +31,7 @@
 #include "cfilters.h"
 #include "connect.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "select.h"
 #include "progress.h"
 #include "pingpong.h"

diff --git a/lib/pop3.c b/lib/pop3.c
index a1321125b9e767d44faef58b8bbefb7873f97742..f0216db25a52fe34f14858ac183001c42ebd46c8 100644 (file)
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -57,6 +57,7 @@
 
 #include "urldata.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "hostip.h"
 #include "progress.h"
 #include "transfer.h"

diff --git a/lib/progress.c b/lib/progress.c
index ed842cefcdda0f712566cebfb80698a443a81f9a..18dde191632e7335370c1bbe0ae666db245f8fa4 100644 (file)
--- a/lib/progress.c
+++ b/lib/progress.c
@@ -25,7 +25,7 @@
 #include "curl_setup.h"
 
 #include "urldata.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "multiif.h"
 #include "progress.h"
 #include "transfer.h"

diff --git a/lib/rand.c b/lib/rand.c
index 15c5a3296e370c6f98dec8f9286572003b2eb676..4689a04b006a4ec7fc89dec2af0217816fe7a0a2 100644 (file)
--- a/lib/rand.c
+++ b/lib/rand.c
@@ -30,7 +30,7 @@
 
 #include "urldata.h"
 #include "vtls/vtls.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "curlx/timeval.h"
 #include "rand.h"
 #include "escape.h"

diff --git a/lib/request.c b/lib/request.c
index fd916768ad221cc946d5b28eb4bd6e17afc0230e..c8781b70bf482ef6c402dea37dc0c3f74c4fc022 100644 (file)
--- a/lib/request.c
+++ b/lib/request.c
@@ -31,6 +31,7 @@
 #include "progress.h"
 #include "request.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "transfer.h"
 #include "url.h"
 #include "curlx/strparse.h"

diff --git a/lib/rtsp.c b/lib/rtsp.c
index 47c993c9601b46bd7bc3f7bae14c17fdb0193674..063ab7eb925d07f2d1347609d42f1fb2e44883b2 100644 (file)
--- a/lib/rtsp.c
+++ b/lib/rtsp.c
@@ -29,6 +29,7 @@
 #include "urldata.h"
 #include "transfer.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "multiif.h"
 #include "http.h"
 #include "url.h"

diff --git a/lib/sendf.c b/lib/sendf.c
index b2b5d0f9fe58dceab858f799da99fdaf7a1304e1..b50e3dcac1b076ec12d8cd9d9cd77fb1ac9b9f6d 100644 (file)
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -36,6 +36,7 @@
 
 #include "urldata.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "transfer.h"
 #include "cfilters.h"
 #include "connect.h"

diff --git a/lib/sendf.h b/lib/sendf.h
index 7b983c5271b22cf43f961d49eb75a98b918394e3..a11010d8ad6a7f891c39ed20822009fda7000957 100644 (file)
--- a/lib/sendf.h
+++ b/lib/sendf.h
@@ -26,8 +26,6 @@
 
 #include "curl_setup.h"
 
-#include "curl_trc.h"
-
 /**
  * Type of data that is being written to the client (application)
  * - data written can be either BODY or META data
@@ -55,6 +53,7 @@
 /* Forward declarations */
 struct Curl_creader;
 struct Curl_cwriter;
+struct Curl_easy;
 
 /**
  * Write `len` bytes at `prt` to the client. `type` indicates what

diff --git a/lib/setopt.c b/lib/setopt.c
index f6e1d7643f26036dad2c6976c3b905f84a3ad502..2bdb6a3473b411692ff8ee8d465e753e5d0b3e26 100644 (file)
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -41,7 +41,7 @@
 #include "strcase.h"
 #include "curl_share.h"
 #include "vtls/vtls.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "hostip.h"
 #include "http2.h"
 #include "setopt.h"

diff --git a/lib/smb.c b/lib/smb.c
index 45f9ca9e0bf742e292d33837c3e84b1eae1e86e4..d9eeec83a5445f7d3a5e6358ab4f75af2772e822 100644 (file)
--- a/lib/smb.c
+++ b/lib/smb.c
@@ -31,6 +31,7 @@
 #include "urldata.h"
 #include "url.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "cfilters.h"
 #include "connect.h"
 #include "progress.h"

diff --git a/lib/smtp.c b/lib/smtp.c
index f868179bed1eb77b005bab1ecf14be24c58395fb..031dcc9bdad65c974fcd458e1d74bfb3cdede35f 100644 (file)
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -59,6 +59,7 @@
 
 #include "urldata.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "hostip.h"
 #include "progress.h"
 #include "transfer.h"

diff --git a/lib/socks.c b/lib/socks.c
index 21c9aa6369152c5343bb738ec4c5357a277cf3de..53062145571864cc4df20d4ad4fac1114be9411a 100644 (file)
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -35,7 +35,7 @@
 
 #include "urldata.h"
 #include "bufq.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "select.h"
 #include "cfilters.h"
 #include "connect.h"

diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c
index 9523d936dd9051dc2ff979b63e5bad344d847608..ce493c03931c3d28f43c7facfbbb9ae390d9bfde 100644 (file)
--- a/lib/socks_gssapi.c
+++ b/lib/socks_gssapi.c
@@ -29,7 +29,7 @@
 
 #include "curl_gssapi.h"
 #include "urldata.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "cfilters.h"
 #include "connect.h"
 #include "curlx/nonblock.h"

diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c
index 560df242056892cd5429b317b0ecf682b3de5a64..4a206a06ad07b08b605616b762dce16fd784d8f7 100644 (file)
--- a/lib/socks_sspi.c
+++ b/lib/socks_sspi.c
@@ -28,7 +28,7 @@
 #if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_PROXY)
 
 #include "urldata.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "cfilters.h"
 #include "connect.h"
 #include "strerror.h"

diff --git a/lib/telnet.c b/lib/telnet.c
index 03a5bb7f452c4086e7d0f089d2dd8df75dac6486..b4589158e9df069e76a21792e4fa574f3e148bad 100644 (file)
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -50,6 +50,7 @@
 #include "url.h"
 #include "transfer.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "telnet.h"
 #include "connect.h"
 #include "progress.h"

diff --git a/lib/tftp.c b/lib/tftp.c
index d60ab52fc26f4f98756c9b9bce8661457e7870c7..d457611662b0202aac228e048d5d3149e8c81d12 100644 (file)
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -51,6 +51,7 @@
 #include "cf-socket.h"
 #include "transfer.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "tftp.h"
 #include "progress.h"
 #include "connect.h"

diff --git a/lib/transfer.c b/lib/transfer.c
index 30ca3cb4de13dccf76fe149ff6f8ebebf961a836..c365d0896ddd360a38ad79ed183d5284fd8ddc5e 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -62,6 +62,7 @@
 #include "cw-out.h"
 #include "transfer.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "progress.h"
 #include "http.h"
 #include "url.h"

diff --git a/lib/url.c b/lib/url.c
index d605adb3a0b19afd4a29fd5941bf7c73c80a6541..7f439b5449fc4569be994bffa02766e974143281 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -74,7 +74,7 @@
 #include "vtls/vtls.h"
 #include "hostip.h"
 #include "transfer.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "progress.h"
 #include "cookie.h"
 #include "strcase.h"

diff --git a/lib/vauth/cleartext.c b/lib/vauth/cleartext.c
index 90e9178491ed8a61128de3ab0158dd3ed6700b62..a3e83d74f4757ae9714c649557951921e0041798 100644 (file)
--- a/lib/vauth/cleartext.c
+++ b/lib/vauth/cleartext.c
@@ -32,7 +32,6 @@
   (!defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP))
 
 #include "vauth.h"
-#include "../sendf.h"
 
 /*
  * Curl_auth_create_plain_message()

diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c
index 46377d22b2a78d8c1a88dba2a4de9fa36f29f260..bc681d13dc8877e36da8483d6335815d407148e3 100644 (file)
--- a/lib/vauth/digest_sspi.c
+++ b/lib/vauth/digest_sspi.c
@@ -32,7 +32,7 @@
 #include "vauth.h"
 #include "digest.h"
 #include "../curlx/multibyte.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../strdup.h"
 #include "../strcase.h"
 #include "../strerror.h"

diff --git a/lib/vauth/gsasl.c b/lib/vauth/gsasl.c
index 896a246932def831ea2ac1dfc76b2ec686670ea1..2f82254608dba6034fbe324e0cfb594f26372303 100644 (file)
--- a/lib/vauth/gsasl.c
+++ b/lib/vauth/gsasl.c
@@ -29,7 +29,7 @@
 #ifdef USE_GSASL
 
 #include "vauth.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 
 #include <gsasl.h>
 

diff --git a/lib/vauth/krb5_gssapi.c b/lib/vauth/krb5_gssapi.c
index ac794184351d5b2c29a12bbf1a2785e5cbc33c04..64797190ce301c7614271f3fbcd9cf918c1a6a30 100644 (file)
--- a/lib/vauth/krb5_gssapi.c
+++ b/lib/vauth/krb5_gssapi.c
@@ -32,7 +32,7 @@
 #include "vauth.h"
 #include "../curl_sasl.h"
 #include "../curl_gssapi.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 
 #if defined(__GNUC__) && defined(__APPLE__)
 #pragma GCC diagnostic push

diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c
index 8159c88aec1ece9cf8ce405ffa2df8c695c8243a..d88ee79bdec9d8249dccd0c450af583b00888858 100644 (file)
--- a/lib/vauth/krb5_sspi.c
+++ b/lib/vauth/krb5_sspi.c
@@ -29,7 +29,7 @@
 #if defined(USE_WINDOWS_SSPI) && defined(USE_KERBEROS5)
 
 #include "vauth.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 
 /*
  * Curl_auth_is_gssapi_supported()

diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c
index c5b226362288a3ff8f803a76a9ee3a014d574a49..620f2a5c845239f93f84a786895f144587a1853f 100644 (file)
--- a/lib/vauth/ntlm.c
+++ b/lib/vauth/ntlm.c
@@ -36,7 +36,7 @@
 #define DEBUG_ME 0
 
 #include "vauth.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../curl_ntlm_core.h"
 #include "../rand.h"
 #include "../strdup.h"

diff --git a/lib/vauth/ntlm_sspi.c b/lib/vauth/ntlm_sspi.c
index eea18281e5ceabd736b99d6ca9553cf97a4cc81b..3d6712766ebbf5890f5822addf7349595c82b9f1 100644 (file)
--- a/lib/vauth/ntlm_sspi.c
+++ b/lib/vauth/ntlm_sspi.c
@@ -28,7 +28,7 @@
 
 #include "vauth.h"
 #include "../curl_ntlm_core.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../strdup.h"
 
 /*

diff --git a/lib/vauth/spnego_gssapi.c b/lib/vauth/spnego_gssapi.c
index a1c92612c6fc295ebbb91f761a37537acd48b432..08689fe5e0aeed766fd6138924d39c3c7f60bc46 100644 (file)
--- a/lib/vauth/spnego_gssapi.c
+++ b/lib/vauth/spnego_gssapi.c
@@ -31,7 +31,7 @@
 #include "vauth.h"
 #include "../curlx/base64.h"
 #include "../curl_gssapi.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 
 #if defined(__GNUC__) && defined(__APPLE__)
 #pragma GCC diagnostic push

diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c
index 68adb8591b8d6f36ba4c258c04505eb2b96e6160..280753e3967790f0ae2fddc9e4bdf8b3467cebdc 100644 (file)
--- a/lib/vauth/spnego_sspi.c
+++ b/lib/vauth/spnego_sspi.c
@@ -30,7 +30,7 @@
 
 #include "vauth.h"
 #include "../curlx/base64.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../strerror.h"
 
 /*

diff --git a/lib/vquic/curl_ngtcp2.c b/lib/vquic/curl_ngtcp2.c
index 167e68aa33fcca92bb855024cbea164bb49d9b01..20b9240f09ed4fb08c9142856cfb7683f7d094b3 100644 (file)
--- a/lib/vquic/curl_ngtcp2.c
+++ b/lib/vquic/curl_ngtcp2.c
@@ -49,7 +49,7 @@
 #include "../urldata.h"
 #include "../url.h"
 #include "../uint-hash.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../rand.h"
 #include "../multiif.h"
 #include "../cfilters.h"

diff --git a/lib/vquic/curl_osslq.c b/lib/vquic/curl_osslq.c
index 0afae1a25aa528d5aa2d4ba42cebb186d0f1b2bb..b2394d287c0213fc29779ba38cda44f317a32b36 100644 (file)
--- a/lib/vquic/curl_osslq.c
+++ b/lib/vquic/curl_osslq.c
@@ -33,7 +33,7 @@
 #include <nghttp3/nghttp3.h>
 
 #include "../urldata.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../multiif.h"
 #include "../cfilters.h"
 #include "../cf-socket.h"

diff --git a/lib/vquic/curl_quiche.c b/lib/vquic/curl_quiche.c
index 454de658ce6b5bccd86fd4fce00e02945854781f..c85336cd02d7cc3cb9284ce202576f23eae54469 100644 (file)
--- a/lib/vquic/curl_quiche.c
+++ b/lib/vquic/curl_quiche.c
@@ -33,7 +33,7 @@
 #include "../urldata.h"
 #include "../cfilters.h"
 #include "../cf-socket.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../rand.h"
 #include "../multiif.h"
 #include "../connect.h"

diff --git a/lib/vquic/vquic-tls.c b/lib/vquic/vquic-tls.c
index 1edbbd54e68a76a62f1cf09fe091146b7830a74b..204a72224996545b435e2c55956f734d69d6dd0f 100644 (file)
--- a/lib/vquic/vquic-tls.c
+++ b/lib/vquic/vquic-tls.c
@@ -45,7 +45,6 @@
 #endif
 
 #include "../urldata.h"
-#include "../curl_trc.h"
 #include "../cfilters.h"
 #include "../vtls/keylog.h"
 #include "../vtls/vtls.h"

diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c
index b9cffa4b97e2ee7a82304165a51a356a17087632..327f3ee661628f0d8b76a03b43b58d0017d691ec 100644 (file)
--- a/lib/vssh/libssh.c
+++ b/lib/vssh/libssh.c
@@ -45,6 +45,7 @@
 
 #include "../urldata.h"
 #include "../sendf.h"
+#include "../curl_trc.h"
 #include "../hostip.h"
 #include "../progress.h"
 #include "../transfer.h"

diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c
index b448d9ea346d7e59e213da280d4ee7d4472e08d3..3f81dbd853b1a95ef6814b38b2e7ac3dbcb1b7d2 100644 (file)
--- a/lib/vssh/libssh2.c
+++ b/lib/vssh/libssh2.c
@@ -44,6 +44,7 @@
 
 #include "../urldata.h"
 #include "../sendf.h"
+#include "../curl_trc.h"
 #include "../hostip.h"
 #include "../progress.h"
 #include "../transfer.h"

diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index 62e81556ddb488af747f73727a54fdbbb4c01906..dbc72c521d4a1dc506c31382f5a4078f413d693a 100644 (file)
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -41,7 +41,7 @@
 #include <nettle/sha2.h>
 
 #include "../urldata.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "keylog.h"
 #include "gtls.h"
 #include "vtls.h"

diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
index 6ef267f6394985a4f21b4db334bc550f2766f0e8..46bfa0967e555ef368fe221dfc459272f71ba40e 100644 (file)
--- a/lib/vtls/mbedtls.c
+++ b/lib/vtls/mbedtls.c
@@ -60,7 +60,7 @@
 #endif
 #include "cipher_suite.h"
 #include "../urldata.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "mbedtls.h"
 #include "vtls.h"
 #include "vtls_int.h"

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index de747926facc3279dd05abe4b267a7668fca00e5..99ee20974c0163adbd1f3066f5ceff2580ce543c 100644 (file)
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -44,7 +44,7 @@
 #endif
 
 #include "../urldata.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../formdata.h" /* for the boundary function */
 #include "../url.h" /* for the ssl config check function */
 #include "../curlx/inet_pton.h"

diff --git a/lib/vtls/rustls.c b/lib/vtls/rustls.c
index ae03311d125f0ed83ff1b93c4f7c26236acd2864..014f11b4f0ec432fb10042048dc441c9a711b7c6 100644 (file)
--- a/lib/vtls/rustls.c
+++ b/lib/vtls/rustls.c
@@ -33,7 +33,7 @@
 #include "../curlx/fopen.h"
 #include "../curlx/strerr.h"
 #include "../urldata.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "vtls.h"
 #include "vtls_int.h"
 #include "rustls.h"

diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
index 823844e7e574fb16ef9cb137179f7bec38fb46c6..2575a9f8f97aa24519a87136a4185eaf45f49c64 100644 (file)
--- a/lib/vtls/schannel.c
+++ b/lib/vtls/schannel.c
@@ -42,7 +42,7 @@
 #include "vtls.h"
 #include "vtls_int.h"
 #include "vtls_scache.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../connect.h" /* for the connect timeout */
 #include "../strdup.h"
 #include "../strerror.h"

diff --git a/lib/vtls/schannel_verify.c b/lib/vtls/schannel_verify.c
index bb8a30919b614419d71e2c1dd87cd483c4fd3e73..e3525a110516b55429076a4e22264360cad6c9b4 100644 (file)
--- a/lib/vtls/schannel_verify.c
+++ b/lib/vtls/schannel_verify.c
@@ -43,7 +43,7 @@
 #include "../curlx/inet_pton.h"
 #include "vtls.h"
 #include "vtls_int.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../strerror.h"
 #include "../curlx/winapi.h"
 #include "../curlx/multibyte.h"

diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 3375e33c270744ed539a163b89b3c58b21b480b4..ed63842b3630a210b2b25952d61df28e0b751d3a 100644 (file)
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -59,7 +59,7 @@
 #include "rustls.h"         /* Rustls versions */
 
 #include "../slist.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../strcase.h"
 #include "../url.h"
 #include "../progress.h"

diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c
index b5c78a56b521c6ccfe99740ee0e479ebb80321e0..9f75b54df39a6287ee87e30f8d3c170aa28f9e58 100644 (file)
--- a/lib/vtls/wolfssl.c
+++ b/lib/vtls/wolfssl.c
@@ -54,7 +54,7 @@
 #endif
 
 #include "../urldata.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "vtls.h"
 #include "vtls_int.h"
 #include "vtls_scache.h"

diff --git a/lib/vtls/x509asn1.c b/lib/vtls/x509asn1.c
index c8752b848e5e5dd2489829eb43cab2318e6ed455..e23331e9d676f39c40682d3431baedcd92b16052 100644 (file)
--- a/lib/vtls/x509asn1.c
+++ b/lib/vtls/x509asn1.c
@@ -39,7 +39,7 @@
 
 #include "../urldata.h"
 #include "vtls.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../curlx/base64.h"
 #include "x509asn1.h"
 #include "../curlx/dynbuf.h"

diff --git a/lib/ws.c b/lib/ws.c
index 0884ac58eff598ea1ba3e7745ca0322af5ae657d..c97586ec02e31618a3602140fe978531ced10a61 100644 (file)
--- a/lib/ws.c
+++ b/lib/ws.c
@@ -33,6 +33,7 @@
 #include "curlx/base64.h"
 #include "connect.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "multiif.h"
 #include "ws.h"
 #include "easyif.h"

diff --git a/tests/unit/unit1652.c b/tests/unit/unit1652.c
index aa4de802d6f26cd34b108c3ac78359a982d3550d..da0df33b4da149dcc1f7ef23e835bd2d3ea89599 100644 (file)
--- a/tests/unit/unit1652.c
+++ b/tests/unit/unit1652.c
@@ -24,7 +24,7 @@
 #include "unitcheck.h"
 
 #include "urldata.h"
-#include "sendf.h"
+#include "curl_trc.h"
 
 /*
  * This test hardcodes the knowledge of the buffer size which is internal to