From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 8 May 2025 07:57:15 +0000 (+0200)
Subject: lib: move multibyte.[ch] to curlx/
X-Git-Tag: curl-8_14_0~136
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d528898f76f592a4bfc9ff3a00f7702461273db;p=thirdparty%2Fcurl.git

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 8515afe805..c623820200 100644
--- 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 1b1483e53f..f7a25c5f84 100644
--- 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 0de3fd6939..db74574592 100644
--- 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 89d54135b4..a7eca66e8f 100644
--- 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 e8e9ec1f81..30380275cc 100644
--- 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 dcae3a22f1..3b7d24a090 100644
--- 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 71cf5540a3..798c9aaef1 100644
--- 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 6c2c209349..c1be2f4bda 100644
--- 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 14419338ac..d3a46e0e6a 100644
--- 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 f8f8520352..1f0846dda4 100644
--- 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 4be8fc916d..d0182f6fe1 100644
--- 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 41590ae2f9..a29358569d 100644
--- 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 e433f2f1ae..5cda790dda 100644
--- 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 ffc216f325..86b4bccfdf 100644
--- 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 715f6e778c..b17ee46d17 100644
--- 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 946be3873f..c19a1ff423 100644
--- 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 56854863ec..06de842084 100644
--- 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 d968516c0d..4a1f044999 100644
--- 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 b44b9e8ee3..abbf31b8fb 100644
--- 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 c91dc78639..ea22b3eaa3 100644
--- 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 39e99c44f0..928889affe 100644
--- 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 edf5a84c25..faf7eacdf6 100644
--- 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 f678453877..e3ee3c0576 100644
--- 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 62d6a20263..9de465e58f 100644
--- 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