From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 9 May 2025 11:26:00 +0000 (+0200)
Subject: curlx: move curlx_inet_pton
X-Git-Tag: curl-8_14_0~121
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4dd43b20df3a0328f573f6108dfa15d2eff8e08;p=thirdparty%2Fcurl.git

curlx: move curlx_inet_pton

Used by test server code.

Closes #17300
---

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 08147ebb42..b384e09623 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -25,6 +25,7 @@
 LIB_CURLX_CFILES = \
   curlx/base64.c   \
   curlx/dynbuf.c   \
+  curlx/inet_pton.c \
   curlx/multibyte.c \
   curlx/nonblock.c \
   curlx/strparse.c \
@@ -38,6 +39,7 @@ LIB_CURLX_HFILES = \
   curlx/base64.h   \
   curlx/curlx.h    \
   curlx/dynbuf.h   \
+  curlx/inet_pton.h \
   curlx/multibyte.h \
   curlx/nonblock.h \
   curlx/strparse.h \
@@ -207,7 +209,6 @@ LIB_CFILES =         \
   if2ip.c            \
   imap.c             \
   inet_ntop.c        \
-  inet_pton.c        \
   krb5.c             \
   ldap.c             \
   llist.c            \
@@ -345,7 +346,6 @@ LIB_HFILES =         \
   if2ip.h            \
   imap.h             \
   inet_ntop.h        \
-  inet_pton.h        \
   llist.h            \
   macos.h            \
   memdebug.h         \
diff --git a/lib/altsvc.c b/lib/altsvc.c
index ad37af4db8..8a29ca4626 100644
--- a/lib/altsvc.c
+++ b/lib/altsvc.c
@@ -39,7 +39,7 @@
 #include "fopen.h"
 #include "rename.h"
 #include "strdup.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "curlx/strparse.h"
 #include "connect.h"
 
diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c
index 4f576c5cb0..340d3d51ce 100644
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@@ -54,7 +54,7 @@
 #include "share.h"
 #include "url.h"
 #include "multiif.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "connect.h"
 #include "select.h"
 #include "progress.h"
diff --git a/lib/cf-socket.c b/lib/cf-socket.c
index c625d7fda6..e31977201c 100644
--- a/lib/cf-socket.c
+++ b/lib/cf-socket.c
@@ -74,7 +74,7 @@
 #include "multiif.h"
 #include "sockaddr.h" /* required for Curl_sockaddr_storage */
 #include "inet_ntop.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "progress.h"
 #include "curlx/warnless.h"
 #include "conncache.h"
diff --git a/lib/connect.c b/lib/connect.c
index fcac5ac7f1..52f2c84a4e 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -67,7 +67,7 @@
 #include "multiif.h"
 #include "sockaddr.h" /* required for Curl_sockaddr_storage */
 #include "inet_ntop.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "vtls/vtls.h" /* for vtsl cfilters */
 #include "progress.h"
 #include "curlx/warnless.h"
diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index d858515a08..ad1769fdb0 100644
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -51,7 +51,7 @@
 
 #include "curl_addrinfo.h"
 #include "fake_addrinfo.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "curlx/warnless.h"
 /* The last 3 #include files should be in this order */
 #include "curl_printf.h"
diff --git a/lib/curlx/curlx.h b/lib/curlx/curlx.h
index e8249d7f61..983c7b5c75 100644
--- a/lib/curlx/curlx.h
+++ b/lib/curlx/curlx.h
@@ -68,4 +68,7 @@
 #include "winapi.h"
 /* for curlx_winapi_strerror */
 
+#include "inet_pton.h"
+/* for curlx_inet_pton */
+
 #endif /* HEADER_CURL_CURLX_H */
diff --git a/lib/inet_pton.c b/lib/curlx/inet_pton.c
similarity index 98%
rename from lib/inet_pton.c
rename to lib/curlx/inet_pton.c
index e197afd795..d2b39ae9f1 100644
--- a/lib/inet_pton.c
+++ b/lib/curlx/inet_pton.c
@@ -18,9 +18,9 @@
  * SPDX-License-Identifier: ISC
  */
 
-#include "curl_setup.h"
-#include "curl_ctype.h"
-#include "curlx/strparse.h"
+#include "../curl_setup.h"
+#include "../curl_ctype.h"
+#include "strparse.h"
 
 #ifndef HAVE_INET_PTON
 
diff --git a/lib/inet_pton.h b/lib/curlx/inet_pton.h
similarity index 98%
rename from lib/inet_pton.h
rename to lib/curlx/inet_pton.h
index fa6ee7a0ba..a9dc43085f 100644
--- a/lib/inet_pton.h
+++ b/lib/curlx/inet_pton.h
@@ -24,7 +24,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "../curl_setup.h"
 
 int curlx_inet_pton(int, const char *, void *);
 
diff --git a/lib/ftp.c b/lib/ftp.c
index 40e08be47b..8804ce5e61 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -61,7 +61,7 @@
 #include "connect.h"
 #include "strerror.h"
 #include "inet_ntop.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "select.h"
 #include "parsedate.h" /* for the week day and month names */
 #include "sockaddr.h" /* required for Curl_sockaddr_storage */
diff --git a/lib/hostip.c b/lib/hostip.c
index 77b69d1449..266ba8e549 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -55,7 +55,7 @@
 #include "share.h"
 #include "url.h"
 #include "inet_ntop.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "multiif.h"
 #include "doh.h"
 #include "curlx/warnless.h"
diff --git a/lib/hostip6.c b/lib/hostip6.c
index 0d5770d3cf..35cc2d737b 100644
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@@ -49,7 +49,7 @@
 #include "hash.h"
 #include "share.h"
 #include "url.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "connect.h"
 /* The last 3 #include files should be in this order */
 #include "curl_printf.h"
diff --git a/lib/noproxy.c b/lib/noproxy.c
index f84ce1e7b7..0ecd8e1787 100644
--- a/lib/noproxy.c
+++ b/lib/noproxy.c
@@ -26,7 +26,7 @@
 
 #ifndef CURL_DISABLE_PROXY
 
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "strcase.h"
 #include "noproxy.h"
 #include "curlx/strparse.h"
diff --git a/lib/socks.c b/lib/socks.c
index 1d0f4d97c0..18cefe8bc8 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -41,7 +41,7 @@
 #include "curlx/timeval.h"
 #include "socks.h"
 #include "multiif.h" /* for getsock macros */
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "url.h"
 
 /* The last 3 #include files should be in this order */
diff --git a/lib/urlapi.c b/lib/urlapi.c
index 73292b1dcc..f2196a8062 100644
--- a/lib/urlapi.c
+++ b/lib/urlapi.c
@@ -30,7 +30,7 @@
 #include "url.h"
 #include "escape.h"
 #include "curl_ctype.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "inet_ntop.h"
 #include "strdup.h"
 #include "idn.h"
diff --git a/lib/vquic/curl_ngtcp2.c b/lib/vquic/curl_ngtcp2.c
index ed14710cdf..c0bb20446e 100644
--- a/lib/vquic/curl_ngtcp2.c
+++ b/lib/vquic/curl_ngtcp2.c
@@ -61,7 +61,7 @@
 #include "../curlx/dynbuf.h"
 #include "../http1.h"
 #include "../select.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "../transfer.h"
 #include "vquic.h"
 #include "vquic_int.h"
diff --git a/lib/vquic/curl_osslq.c b/lib/vquic/curl_osslq.c
index 39eaf268d5..f942eef843 100644
--- a/lib/vquic/curl_osslq.c
+++ b/lib/vquic/curl_osslq.c
@@ -46,7 +46,7 @@
 #include "../curlx/dynbuf.h"
 #include "../http1.h"
 #include "../select.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "../uint-hash.h"
 #include "vquic.h"
 #include "vquic_int.h"
diff --git a/lib/vquic/curl_quiche.c b/lib/vquic/curl_quiche.c
index a1d184fc38..8806532889 100644
--- a/lib/vquic/curl_quiche.c
+++ b/lib/vquic/curl_quiche.c
@@ -47,7 +47,7 @@
 #include "vquic-tls.h"
 #include "curl_quiche.h"
 #include "../transfer.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "../vtls/openssl.h"
 #include "../vtls/keylog.h"
 #include "../vtls/vtls.h"
diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c
index 39abf0f0c1..4b65244451 100644
--- a/lib/vtls/bearssl.c
+++ b/lib/vtls/bearssl.c
@@ -31,7 +31,7 @@
 #include "cipher_suite.h"
 #include "../urldata.h"
 #include "../sendf.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "vtls.h"
 #include "vtls_int.h"
 #include "vtls_scache.h"
diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index 17051ca069..bb2a0265cd 100644
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -42,7 +42,7 @@
 
 #include "../urldata.h"
 #include "../sendf.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "keylog.h"
 #include "gtls.h"
 #include "vtls.h"
diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
index be5a802364..7af207caa7 100644
--- a/lib/vtls/mbedtls.c
+++ b/lib/vtls/mbedtls.c
@@ -60,7 +60,7 @@
 #include "../strcase.h"
 #include "../urldata.h"
 #include "../sendf.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "mbedtls.h"
 #include "vtls.h"
 #include "vtls_int.h"
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index e0baaff9ed..8817b835d7 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -49,7 +49,7 @@
 #include "../sendf.h"
 #include "../formdata.h" /* for the boundary function */
 #include "../url.h" /* for the ssl config check function */
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "openssl.h"
 #include "../connect.h"
 #include "../slist.h"
diff --git a/lib/vtls/rustls.c b/lib/vtls/rustls.c
index 3c4a2752de..cb9fd6230a 100644
--- a/lib/vtls/rustls.c
+++ b/lib/vtls/rustls.c
@@ -32,7 +32,7 @@
 
 #include <rustls.h>
 
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "../urldata.h"
 #include "../sendf.h"
 #include "vtls.h"
diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
index d77bb2da9a..bea8eef8c0 100644
--- a/lib/vtls/schannel.c
+++ b/lib/vtls/schannel.c
@@ -47,7 +47,7 @@
 #include "../connect.h" /* for the connect timeout */
 #include "../strerror.h"
 #include "../select.h" /* for the socket readiness */
-#include "../inet_pton.h" /* for IP addr SNI check */
+#include "../curlx/inet_pton.h" /* for IP addr SNI check */
 #include "../curlx/multibyte.h"
 #include "../curlx/warnless.h"
 #include "x509asn1.h"
diff --git a/lib/vtls/schannel_verify.c b/lib/vtls/schannel_verify.c
index 4834fc450f..efa240534f 100644
--- a/lib/vtls/schannel_verify.c
+++ b/lib/vtls/schannel_verify.c
@@ -39,7 +39,7 @@
 #include "schannel.h"
 #include "schannel_int.h"
 
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "vtls.h"
 #include "vtls_int.h"
 #include "../sendf.h"
diff --git a/lib/vtls/sectransp.c b/lib/vtls/sectransp.c
index 12aa2f2a91..2ae2ef35a2 100644
--- a/lib/vtls/sectransp.c
+++ b/lib/vtls/sectransp.c
@@ -135,7 +135,7 @@
 #endif /* CURL_BUILD_MAC */
 
 #include "../sendf.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "../connect.h"
 #include "../select.h"
 #include "vtls.h"
diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 3b335e2871..2f2c544a8e 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -79,7 +79,7 @@
 #include "../curlx/warnless.h"
 #include "../curlx/base64.h"
 #include "../curl_printf.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "../connect.h"
 #include "../select.h"
 #include "../strdup.h"
diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c
index ab7ab46dbd..ee3f650fce 100644
--- a/lib/vtls/wolfssl.c
+++ b/lib/vtls/wolfssl.c
@@ -58,7 +58,7 @@
 
 #include "../urldata.h"
 #include "../sendf.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.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 7f9d332ecf..dd2aa145af 100644
--- a/lib/vtls/x509asn1.c
+++ b/lib/vtls/x509asn1.c
@@ -46,7 +46,7 @@
 #include "vtls.h"
 #include "vtls_int.h"
 #include "../sendf.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "../curlx/base64.h"
 #include "x509asn1.h"
 #include "../curlx/dynbuf.h"
diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc
index a4e26a529e..c3ed7c5e11 100644
--- a/tests/server/Makefile.inc
+++ b/tests/server/Makefile.inc
@@ -70,7 +70,7 @@ FIRSTFILES = \
   first.h
 
 INET_PTON = \
-  ../../lib/inet_pton.c
+  ../../lib/curlx/inet_pton.c
 
 resolve_SOURCES = $(MEMDEBUG) $(CURLX_SRCS) $(CURLX_HDRS) $(UTIL) \
   resolve.c