lib: move multibyte.[ch] to curlx/

This file provides functions in the curlx set.

Closes #17285

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 8515afe80526b8594b7728aa078721b96c6d3077..c62382020098cbd0247015063897e0c6a8869752 100644 (file)
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -520,7 +520,7 @@ Windows:
               .github/workflows/windows.yml,\
               CMake/win32-cache.cmake,\
               lib/*win32*,\
-              lib/curl_multibyte.*,\
+              lib/curlx/multibyte.*,\
               lib/rename.*,\
               lib/vtls/schannel*,\
               m4/curl-schannel.m4,\

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 1b1483e53f385c9600bbeff769759f46237ed364..f7a25c5f845ab3a512ce0a02dfaedca8277fd250 100644 (file)
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -25,6 +25,7 @@
 LIB_CURLX_CFILES = \
   curlx/base64.c   \
   curlx/dynbuf.c   \
+  curlx/multibyte.c \
   curlx/strparse.c \
   curlx/timediff.c \
   curlx/timeval.c  \
@@ -34,6 +35,7 @@ LIB_CURLX_HFILES = \
   curlx/base64.h   \
   curlx/curlx.h    \
   curlx/dynbuf.h   \
+  curlx/multibyte.h \
   curlx/strparse.h \
   curlx/timediff.h \
   curlx/timeval.h  \
@@ -151,7 +153,6 @@ LIB_CFILES =         \
   curl_gethostname.c \
   curl_gssapi.c      \
   curl_memrchr.c     \
-  curl_multibyte.c   \
   curl_ntlm_core.c   \
   curl_range.c       \
   curl_rtmp.c        \
@@ -291,7 +292,6 @@ LIB_HFILES =         \
   curl_md5.h         \
   curl_memory.h      \
   curl_memrchr.h     \
-  curl_multibyte.h   \
   curl_ntlm_core.h   \
   curl_printf.h      \
   curl_range.h       \

diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c
index 0de3fd6939c5d9e04ff23bc0c5203f0e09c57f43..db7457459229595423aef1ac8ce9ca3aa5319432 100644 (file)
--- a/lib/curl_sspi.c
+++ b/lib/curl_sspi.c
@@ -28,7 +28,7 @@
 
 #include <curl/curl.h>
 #include "curl_sspi.h"
-#include "curl_multibyte.h"
+#include "curlx/multibyte.h"
 #include "system_win32.h"
 #include "version_win32.h"
 #include "curlx/warnless.h"

diff --git a/lib/curlx/curlx.h b/lib/curlx/curlx.h
index 89d54135b4f61cab8d4f3af0d4c43f0cc6e2ff52..a7eca66e8f62157369f12c501a2daeb305732715 100644 (file)
--- a/lib/curlx/curlx.h
+++ b/lib/curlx/curlx.h
@@ -42,8 +42,8 @@
   curlx_uztosi()
 */
 
-#include "../curl_multibyte.h"
-/* "curl_multibyte.h" provides these functions and macros:
+#include "multibyte.h"
+/* "multibyte.h" provides these functions and macros:
 
   curlx_convert_UTF8_to_wchar()
   curlx_convert_wchar_to_UTF8()

diff --git a/lib/curl_multibyte.c b/lib/curlx/multibyte.c
similarity index 99%
rename from lib/curl_multibyte.c
rename to lib/curlx/multibyte.c
index e8e9ec1f81395d93be45a3358fff3b791973a728..30380275cc7e7c30e74e3e9727943c7e0b4716ce 100644 (file)
--- a/lib/curl_multibyte.c
+++ b/lib/curlx/multibyte.c
@@ -30,11 +30,11 @@
  * versions: `ptr = (malloc)(123)`, `(free)(ptr)`, etc.
  */
 
-#include "curl_setup.h"
+#include "../curl_setup.h"
 
 #ifdef _WIN32
 
-#include "curl_multibyte.h"
+#include "multibyte.h"
 
 /*
  * MultiByte conversions using Windows kernel32 library.

diff --git a/lib/curl_multibyte.h b/lib/curlx/multibyte.h
similarity index 99%
rename from lib/curl_multibyte.h
rename to lib/curlx/multibyte.h
index dcae3a22f15c907095ab4bb9464d08ab2ae589bd..3b7d24a090f47450dfd353df930e305925711ce4 100644 (file)
--- a/lib/curl_multibyte.h
+++ b/lib/curlx/multibyte.h
@@ -23,7 +23,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "../curl_setup.h"
 
 #ifdef _WIN32
 

diff --git a/lib/idn.c b/lib/idn.c
index 71cf5540a3889d5a4f3671cb3e3032b4a03e2eeb..798c9aaef1ab5a190d9f95430775de5a5312addd 100644 (file)
--- a/lib/idn.c
+++ b/lib/idn.c
@@ -30,7 +30,7 @@
 #include "urldata.h"
 #include "idn.h"
 #include "sendf.h"
-#include "curl_multibyte.h"
+#include "curlx/multibyte.h"
 #include "curlx/warnless.h"
 
 #ifdef USE_LIBIDN2

diff --git a/lib/ldap.c b/lib/ldap.c
index 6c2c209349a45f8834cb8748d638eb6c2cec7ebb..c1be2f4bda9303e0d86fc5256fcfcbcf49547b1a 100644 (file)
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -91,7 +91,7 @@
 #include "strcase.h"
 #include "curlx/strparse.h"
 #include "curl_ldap.h"
-#include "curl_multibyte.h"
+#include "curlx/multibyte.h"
 #include "curlx/base64.h"
 #include "connect.h"
 /* The last 3 #include files should be in this order */

diff --git a/lib/rename.c b/lib/rename.c
index 14419338acec732d7c8c5916111aad547123904b..d3a46e0e6a760d5d062afa0fc38df8420559acec 100644 (file)
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -29,7 +29,7 @@
 #if (!defined(CURL_DISABLE_HTTP) || !defined(CURL_DISABLE_COOKIES)) || \
   !defined(CURL_DISABLE_ALTSVC)
 
-#include "curl_multibyte.h"
+#include "curlx/multibyte.h"
 #include "curlx/timeval.h"
 
 /* The last 3 #include files should be in this order */

diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c
index f8f8520352016006c8b19bc4223576aa8d75dbbf..1f0846dda469dbbba4d09837005bf3a07c5181eb 100644 (file)
--- a/lib/socks_sspi.c
+++ b/lib/socks_sspi.c
@@ -35,7 +35,7 @@
 #include "curlx/timeval.h"
 #include "socks.h"
 #include "curl_sspi.h"
-#include "curl_multibyte.h"
+#include "curlx/multibyte.h"
 #include "curlx/warnless.h"
 #include "strdup.h"
 /* The last 3 #include files should be in this order */

diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c
index 4be8fc916dbf81105ac3ea48954e0281e6914818..d0182f6fe1d8d2cbe36f587dd0a137069c90f241 100644 (file)
--- a/lib/vauth/digest_sspi.c
+++ b/lib/vauth/digest_sspi.c
@@ -35,7 +35,7 @@
 #include "digest.h"
 #include "../urldata.h"
 #include "../curlx/warnless.h"
-#include "../curl_multibyte.h"
+#include "../curlx/multibyte.h"
 #include "../sendf.h"
 #include "../strdup.h"
 #include "../strcase.h"

diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c
index 41590ae2f9adde930fbb3603cbcfe8ca71e3afb0..a29358569d9caf117ebfc9a00bcf7d9eb903c309 100644 (file)
--- a/lib/vauth/krb5_sspi.c
+++ b/lib/vauth/krb5_sspi.c
@@ -33,7 +33,7 @@
 #include "vauth.h"
 #include "../urldata.h"
 #include "../curlx/warnless.h"
-#include "../curl_multibyte.h"
+#include "../curlx/multibyte.h"
 #include "../sendf.h"
 
 /* The last #include files should be: */

diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c
index e433f2f1ae4cbbdfc102912f6a299b72dc9a36f5..5cda790dda332e2b2927534693a055ebcdcdb5fc 100644 (file)
--- a/lib/vauth/ntlm.c
+++ b/lib/vauth/ntlm.c
@@ -39,7 +39,7 @@
 #include "../sendf.h"
 #include "../curl_ntlm_core.h"
 #include "../curl_gethostname.h"
-#include "../curl_multibyte.h"
+#include "../curlx/multibyte.h"
 #include "../curl_md5.h"
 #include "../curlx/warnless.h"
 #include "../rand.h"

diff --git a/lib/vauth/ntlm_sspi.c b/lib/vauth/ntlm_sspi.c
index ffc216f325969e452216794649d1082f3809f2f1..86b4bccfdf47368b6f1483967fa01ddb623a608b 100644 (file)
--- a/lib/vauth/ntlm_sspi.c
+++ b/lib/vauth/ntlm_sspi.c
@@ -32,7 +32,7 @@
 #include "../urldata.h"
 #include "../curl_ntlm_core.h"
 #include "../curlx/warnless.h"
-#include "../curl_multibyte.h"
+#include "../curlx/multibyte.h"
 #include "../sendf.h"
 #include "../strdup.h"
 

diff --git a/lib/vauth/spnego_gssapi.c b/lib/vauth/spnego_gssapi.c
index 715f6e778c003209e20639ed6900e40f664386f7..b17ee46d175b81fd053f7465d9593e0ee5c81fa7 100644 (file)
--- a/lib/vauth/spnego_gssapi.c
+++ b/lib/vauth/spnego_gssapi.c
@@ -35,7 +35,7 @@
 #include "../curlx/base64.h"
 #include "../curl_gssapi.h"
 #include "../curlx/warnless.h"
-#include "../curl_multibyte.h"
+#include "../curlx/multibyte.h"
 #include "../sendf.h"
 
 /* The last #include files should be: */

diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c
index 946be3873fd19edc0602bbb3e927f41d56647334..c19a1ff4236a9361ba413d6d6c69eae45db19f8b 100644 (file)
--- a/lib/vauth/spnego_sspi.c
+++ b/lib/vauth/spnego_sspi.c
@@ -34,7 +34,7 @@
 #include "../urldata.h"
 #include "../curlx/base64.h"
 #include "../curlx/warnless.h"
-#include "../curl_multibyte.h"
+#include "../curlx/multibyte.h"
 #include "../sendf.h"
 #include "../strerror.h"
 

diff --git a/lib/vauth/vauth.c b/lib/vauth/vauth.c
index 56854863eccd9fb316a02e060b79bf2dc1f07992..06de842084b55b9486fbda8b93f62ef896bf98ea 100644 (file)
--- a/lib/vauth/vauth.c
+++ b/lib/vauth/vauth.c
@@ -29,7 +29,7 @@
 #include "vauth.h"
 #include "../urldata.h"
 #include "../strcase.h"
-#include "../curl_multibyte.h"
+#include "../curlx/multibyte.h"
 #include "../curl_printf.h"
 
 /* The last #include files should be: */

diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
index d968516c0d64f4567a52d25b10ed496bd2fa9db8..4a1f04499953ee81cc406f6016b62157e7bb3b77 100644 (file)
--- a/lib/vtls/schannel.c
+++ b/lib/vtls/schannel.c
@@ -48,7 +48,7 @@
 #include "../strerror.h"
 #include "../select.h" /* for the socket readiness */
 #include "../inet_pton.h" /* for IP addr SNI check */
-#include "../curl_multibyte.h"
+#include "../curlx/multibyte.h"
 #include "../curlx/warnless.h"
 #include "x509asn1.h"
 #include "../curl_printf.h"

diff --git a/lib/vtls/schannel_verify.c b/lib/vtls/schannel_verify.c
index b44b9e8ee33d1fb1e4aaa9e8d38ae74d6eb21e2d..abbf31b8fb01a1e5c780746e501e40904f008955 100644 (file)
--- a/lib/vtls/schannel_verify.c
+++ b/lib/vtls/schannel_verify.c
@@ -44,7 +44,7 @@
 #include "vtls_int.h"
 #include "../sendf.h"
 #include "../strerror.h"
-#include "../curl_multibyte.h"
+#include "../curlx/multibyte.h"
 #include "../curl_printf.h"
 #include "hostcheck.h"
 #include "../version_win32.h"

diff --git a/projects/generate.bat b/projects/generate.bat
index c91dc78639b6f34443be99d38cb619b85832f1b7..ea22b3eaa34288583d41b3895c724dbd311687d5 100644 (file)
--- a/projects/generate.bat
+++ b/projects/generate.bat
@@ -155,7 +155,6 @@ rem
     ) else if "!var!" == "CURL_SRC_X_C_FILES" (
       call :element %1 lib "strcase.c" %3
       call :element %1 lib "nonblock.c" %3
-      call :element %1 lib "curl_multibyte.c" %3
       call :element %1 lib "version_win32.c" %3
     ) else if "!var!" == "CURL_SRC_X_H_FILES" (
       call :element %1 lib "config-win32.h" %3
@@ -163,7 +162,6 @@ rem
       call :element %1 lib "strcase.h" %3
       call :element %1 lib "nonblock.h" %3
       call :element %1 lib "curl_ctype.h" %3
-      call :element %1 lib "curl_multibyte.h" %3
       call :element %1 lib "version_win32.h" %3
     ) else if "!var!" == "CURL_LIB_C_FILES" (
       for /f "delims=" %%c in ('dir /b ..\lib\*.c') do call :element %1 lib "%%c" %3

diff --git a/src/Makefile.inc b/src/Makefile.inc
index 39e99c44f001283b461c18b2e77b94737d2cb690..928889affe252a83509fced10b8d40d00aa834e8 100644 (file)
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -33,7 +33,7 @@
 # the official API, but we reuse the code here to avoid duplication.
 CURLX_CFILES = \
   ../lib/curlx/base64.c \
-  ../lib/curl_multibyte.c \
+  ../lib/curlx/multibyte.c \
   ../lib/curlx/dynbuf.c \
   ../lib/nonblock.c \
   ../lib/curlx/strparse.c \
@@ -45,7 +45,7 @@ CURLX_CFILES = \
 
 CURLX_HFILES = \
   ../lib/curl_ctype.h \
-  ../lib/curl_multibyte.h \
+  ../lib/curlx/multibyte.h \
   ../lib/curl_setup.h \
   ../lib/curlx/dynbuf.h \
   ../lib/nonblock.h \

diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index edf5a84c25ea83fd4d95b8bae5ef5dd0320cb013..faf7eacdf6af9947b1eec7f3831423f05b896fa0 100644 (file)
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -25,7 +25,7 @@
 TESTUTIL = testutil.c testutil.h
 TSTTRACE = testtrace.c testtrace.h
 WARNLESS = ../../lib/curlx/warnless.c ../../lib/curlx/warnless.h
-MULTIBYTE = ../../lib/curl_multibyte.c ../../lib/curl_multibyte.h
+MULTIBYTE = ../../lib/curlx/multibyte.c ../../lib/curlx/multibyte.h
 THREADS = ../../lib/curl_threads.c ../../lib/curl_threads.h
 MEMPTR = memptr.c
 

diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc
index f678453877b06e664e51b3b8e29c07800f492310..e3ee3c0576deef57cdb490bc7a95f6a8781610c1 100644 (file)
--- a/tests/server/Makefile.inc
+++ b/tests/server/Makefile.inc
@@ -40,7 +40,7 @@ CURLX_SRCS = \
   ../../lib/strcase.c \
   ../../lib/strdup.c \
   ../../lib/curl_get_line.c \
-  ../../lib/curl_multibyte.c \
+  ../../lib/curlx/multibyte.c \
   ../../lib/version_win32.c
 
 CURLX_HDRS = \
@@ -55,7 +55,7 @@ CURLX_HDRS = \
   ../../lib/strcase.h \
   ../../lib/strdup.h \
   ../../lib/curl_get_line.h \
-  ../../lib/curl_multibyte.h \
+  ../../lib/curlx/multibyte.h \
   ../../lib/version_win32.h
 
 UTIL = \

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 62d6a20263f9d4d980fee97a9487bed71b6017d4..9de465e58fcdf9742be93228725cb190cd546ae4 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -698,7 +698,7 @@ CURL_FROM_LIBCURL=\
  $(CURL_DIROBJ)\timeval.obj \
  $(CURL_DIROBJ)\warnless.obj \
  $(CURL_DIROBJ)\curl_get_line.obj \
- $(CURL_DIROBJ)\curl_multibyte.obj \
+ $(CURL_DIROBJ)\multibyte.obj \
  $(CURL_DIROBJ)\version_win32.obj \
  $(CURL_DIROBJ)\dynbuf.obj \
  $(CURL_DIROBJ)\base64.obj
@@ -728,8 +728,8 @@ $(CURL_DIROBJ)\timeval.obj: ../lib/curlx/timeval.c
        $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curlx/timeval.c
 $(CURL_DIROBJ)\curl_get_line.obj: ../lib/curl_get_line.c
        $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_get_line.c
-$(CURL_DIROBJ)\curl_multibyte.obj: ../lib/curl_multibyte.c
-       $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_multibyte.c
+$(CURL_DIROBJ)\multibyte.obj: ../lib/curlx/multibyte.c
+       $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curlx/multibyte.c
 $(CURL_DIROBJ)\version_win32.obj: ../lib/version_win32.c
        $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/version_win32.c
 $(CURL_DIROBJ)\warnless.obj: ../lib/curlx/warnless.c