lib: move multibyte.[ch] to curlx/

This file provides functions in the curlx set.

Closes #17285

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       \

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"

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()

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.

lib/curlx/multibyte.h

@@ -23,7 +23,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "../curl_setup.h"
 
 #ifdef _WIN32
 

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

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 */

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 */

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 */

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"

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: */

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"

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"
 

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: */

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"
 

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: */

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"

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"