curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-09 21:52:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

lib: move multibyte.[ch] to curlx/

Browse Source 
This file provides functions in the curlx set.

Closes #17285
This commit is contained in:
Daniel Stenberg 2025-05-08 09:57:15 +02:00
parent f7057760eb
commit 2d528898f7
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
24 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/labeler.yml vendored
View File

@ -520,7 +520,7 @@ Windows:
.github/workflows/windows.yml,\ .github/workflows/windows.yml,\
CMake/win32-cache.cmake,\ CMake/win32-cache.cmake,\
lib/*win32*,\ lib/*win32*,\
lib/curl_multibyte.*,\ lib/curlx/multibyte.*,\
lib/rename.*,\ lib/rename.*,\
lib/vtls/schannel*,\ lib/vtls/schannel*,\
m4/curl-schannel.m4,\ m4/curl-schannel.m4,\

4
lib/Makefile.inc
View File

@ -25,6 +25,7 @@
LIB_CURLX_CFILES = \ LIB_CURLX_CFILES = \
curlx/base64.c \ curlx/base64.c \
curlx/dynbuf.c \ curlx/dynbuf.c \
curlx/multibyte.c \
curlx/strparse.c \ curlx/strparse.c \
curlx/timediff.c \ curlx/timediff.c \
curlx/timeval.c \ curlx/timeval.c \
@ -34,6 +35,7 @@ LIB_CURLX_HFILES = \
curlx/base64.h \ curlx/base64.h \
curlx/curlx.h \ curlx/curlx.h \
curlx/dynbuf.h \ curlx/dynbuf.h \
curlx/multibyte.h \
curlx/strparse.h \ curlx/strparse.h \
curlx/timediff.h \ curlx/timediff.h \
curlx/timeval.h \ curlx/timeval.h \
@ -151,7 +153,6 @@ LIB_CFILES = \
curl_gethostname.c \ curl_gethostname.c \
curl_gssapi.c \ curl_gssapi.c \
curl_memrchr.c \ curl_memrchr.c \
curl_multibyte.c \
curl_ntlm_core.c \ curl_ntlm_core.c \
curl_range.c \ curl_range.c \
curl_rtmp.c \ curl_rtmp.c \
@ -291,7 +292,6 @@ LIB_HFILES = \
curl_md5.h \ curl_md5.h \
curl_memory.h \ curl_memory.h \
curl_memrchr.h \ curl_memrchr.h \
curl_multibyte.h \
curl_ntlm_core.h \ curl_ntlm_core.h \
curl_printf.h \ curl_printf.h \
curl_range.h \ curl_range.h \

2
lib/curl_sspi.c
View File

@ -28,7 +28,7 @@
#include <curl/curl.h> #include <curl/curl.h>
#include "curl_sspi.h" #include "curl_sspi.h"
#include "curl_multibyte.h" #include "curlx/multibyte.h"
#include "system_win32.h" #include "system_win32.h"
#include "version_win32.h" #include "version_win32.h"
#include "curlx/warnless.h" #include "curlx/warnless.h"

4
lib/curlx/curlx.h
View File

@ -42,8 +42,8 @@
curlx_uztosi() curlx_uztosi()
*/ */
#include "../curl_multibyte.h" #include "multibyte.h"
/* "curl_multibyte.h" provides these functions and macros: /* "multibyte.h" provides these functions and macros:
curlx_convert_UTF8_to_wchar() curlx_convert_UTF8_to_wchar()
curlx_convert_wchar_to_UTF8() curlx_convert_wchar_to_UTF8()

4
lib/curl_multibyte.c → lib/curlx/multibyte.c
View File

@ -30,11 +30,11 @@
* versions: `ptr = (malloc)(123)`, `(free)(ptr)`, etc. * versions: `ptr = (malloc)(123)`, `(free)(ptr)`, etc.
*/ */
#include "curl_setup.h" #include "../curl_setup.h"
#ifdef _WIN32 #ifdef _WIN32
#include "curl_multibyte.h" #include "multibyte.h"
/* /*
* MultiByte conversions using Windows kernel32 library. * MultiByte conversions using Windows kernel32 library.

2
lib/curl_multibyte.h → lib/curlx/multibyte.h
View File

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

2
lib/idn.c
View File

@ -30,7 +30,7 @@
#include "urldata.h" #include "urldata.h"
#include "idn.h" #include "idn.h"
#include "sendf.h" #include "sendf.h"
#include "curl_multibyte.h" #include "curlx/multibyte.h"
#include "curlx/warnless.h" #include "curlx/warnless.h"
#ifdef USE_LIBIDN2 #ifdef USE_LIBIDN2

2
lib/ldap.c
View File

@ -91,7 +91,7 @@
#include "strcase.h" #include "strcase.h"
#include "curlx/strparse.h" #include "curlx/strparse.h"
#include "curl_ldap.h" #include "curl_ldap.h"
#include "curl_multibyte.h" #include "curlx/multibyte.h"
#include "curlx/base64.h" #include "curlx/base64.h"
#include "connect.h" #include "connect.h"
/* The last 3 #include files should be in this order */ /* The last 3 #include files should be in this order */

2
lib/rename.c
View File

@ -29,7 +29,7 @@
#if (!defined(CURL_DISABLE_HTTP) || !defined(CURL_DISABLE_COOKIES)) || \ #if (!defined(CURL_DISABLE_HTTP) || !defined(CURL_DISABLE_COOKIES)) || \
!defined(CURL_DISABLE_ALTSVC) !defined(CURL_DISABLE_ALTSVC)
#include "curl_multibyte.h" #include "curlx/multibyte.h"
#include "curlx/timeval.h" #include "curlx/timeval.h"
/* The last 3 #include files should be in this order */ /* The last 3 #include files should be in this order */

2
lib/socks_sspi.c
View File

@ -35,7 +35,7 @@
#include "curlx/timeval.h" #include "curlx/timeval.h"
#include "socks.h" #include "socks.h"
#include "curl_sspi.h" #include "curl_sspi.h"
#include "curl_multibyte.h" #include "curlx/multibyte.h"
#include "curlx/warnless.h" #include "curlx/warnless.h"
#include "strdup.h" #include "strdup.h"
/* The last 3 #include files should be in this order */ /* The last 3 #include files should be in this order */

2
lib/vauth/digest_sspi.c
View File

@ -35,7 +35,7 @@
#include "digest.h" #include "digest.h"
#include "../urldata.h" #include "../urldata.h"
#include "../curlx/warnless.h" #include "../curlx/warnless.h"
#include "../curl_multibyte.h" #include "../curlx/multibyte.h"
#include "../sendf.h" #include "../sendf.h"
#include "../strdup.h" #include "../strdup.h"
#include "../strcase.h" #include "../strcase.h"

2
lib/vauth/krb5_sspi.c
View File

@ -33,7 +33,7 @@
#include "vauth.h" #include "vauth.h"
#include "../urldata.h" #include "../urldata.h"
#include "../curlx/warnless.h" #include "../curlx/warnless.h"
#include "../curl_multibyte.h" #include "../curlx/multibyte.h"
#include "../sendf.h" #include "../sendf.h"
/* The last #include files should be: */ /* The last #include files should be: */

2
lib/vauth/ntlm.c
View File

@ -39,7 +39,7 @@
#include "../sendf.h" #include "../sendf.h"
#include "../curl_ntlm_core.h" #include "../curl_ntlm_core.h"
#include "../curl_gethostname.h" #include "../curl_gethostname.h"
#include "../curl_multibyte.h" #include "../curlx/multibyte.h"
#include "../curl_md5.h" #include "../curl_md5.h"
#include "../curlx/warnless.h" #include "../curlx/warnless.h"
#include "../rand.h" #include "../rand.h"

2
lib/vauth/ntlm_sspi.c
View File

@ -32,7 +32,7 @@
#include "../urldata.h" #include "../urldata.h"
#include "../curl_ntlm_core.h" #include "../curl_ntlm_core.h"
#include "../curlx/warnless.h" #include "../curlx/warnless.h"
#include "../curl_multibyte.h" #include "../curlx/multibyte.h"
#include "../sendf.h" #include "../sendf.h"
#include "../strdup.h" #include "../strdup.h"

2
lib/vauth/spnego_gssapi.c
View File

@ -35,7 +35,7 @@
#include "../curlx/base64.h" #include "../curlx/base64.h"
#include "../curl_gssapi.h" #include "../curl_gssapi.h"
#include "../curlx/warnless.h" #include "../curlx/warnless.h"
#include "../curl_multibyte.h" #include "../curlx/multibyte.h"
#include "../sendf.h" #include "../sendf.h"
/* The last #include files should be: */ /* The last #include files should be: */

2
lib/vauth/spnego_sspi.c
View File

@ -34,7 +34,7 @@
#include "../urldata.h" #include "../urldata.h"
#include "../curlx/base64.h" #include "../curlx/base64.h"
#include "../curlx/warnless.h" #include "../curlx/warnless.h"
#include "../curl_multibyte.h" #include "../curlx/multibyte.h"
#include "../sendf.h" #include "../sendf.h"
#include "../strerror.h" #include "../strerror.h"

2
lib/vauth/vauth.c
View File

@ -29,7 +29,7 @@
#include "vauth.h" #include "vauth.h"
#include "../urldata.h" #include "../urldata.h"
#include "../strcase.h" #include "../strcase.h"
#include "../curl_multibyte.h" #include "../curlx/multibyte.h"
#include "../curl_printf.h" #include "../curl_printf.h"
/* The last #include files should be: */ /* The last #include files should be: */

2
lib/vtls/schannel.c
View File

@ -48,7 +48,7 @@
#include "../strerror.h" #include "../strerror.h"
#include "../select.h" /* for the socket readiness */ #include "../select.h" /* for the socket readiness */
#include "../inet_pton.h" /* for IP addr SNI check */ #include "../inet_pton.h" /* for IP addr SNI check */
#include "../curl_multibyte.h" #include "../curlx/multibyte.h"
#include "../curlx/warnless.h" #include "../curlx/warnless.h"
#include "x509asn1.h" #include "x509asn1.h"
#include "../curl_printf.h" #include "../curl_printf.h"

2
lib/vtls/schannel_verify.c
View File

@ -44,7 +44,7 @@
#include "vtls_int.h" #include "vtls_int.h"
#include "../sendf.h" #include "../sendf.h"
#include "../strerror.h" #include "../strerror.h"
#include "../curl_multibyte.h" #include "../curlx/multibyte.h"
#include "../curl_printf.h" #include "../curl_printf.h"
#include "hostcheck.h" #include "hostcheck.h"
#include "../version_win32.h" #include "../version_win32.h"

2
projects/generate.bat
View File

@ -155,7 +155,6 @@ rem
) else if "!var!" == "CURL_SRC_X_C_FILES" ( ) else if "!var!" == "CURL_SRC_X_C_FILES" (
call :element %1 lib "strcase.c" %3 call :element %1 lib "strcase.c" %3
call :element %1 lib "nonblock.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 call :element %1 lib "version_win32.c" %3
) else if "!var!" == "CURL_SRC_X_H_FILES" ( ) else if "!var!" == "CURL_SRC_X_H_FILES" (
call :element %1 lib "config-win32.h" %3 call :element %1 lib "config-win32.h" %3
@ -163,7 +162,6 @@ rem
call :element %1 lib "strcase.h" %3 call :element %1 lib "strcase.h" %3
call :element %1 lib "nonblock.h" %3 call :element %1 lib "nonblock.h" %3
call :element %1 lib "curl_ctype.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 call :element %1 lib "version_win32.h" %3
) else if "!var!" == "CURL_LIB_C_FILES" ( ) else if "!var!" == "CURL_LIB_C_FILES" (
for /f "delims=" %%c in ('dir /b ..\lib\*.c') do call :element %1 lib "%%c" %3 for /f "delims=" %%c in ('dir /b ..\lib\*.c') do call :element %1 lib "%%c" %3

4
src/Makefile.inc
View File

@ -33,7 +33,7 @@
# the official API, but we reuse the code here to avoid duplication. # the official API, but we reuse the code here to avoid duplication.
CURLX_CFILES = \ CURLX_CFILES = \
../lib/curlx/base64.c \ ../lib/curlx/base64.c \
../lib/curl_multibyte.c \ ../lib/curlx/multibyte.c \
../lib/curlx/dynbuf.c \ ../lib/curlx/dynbuf.c \
../lib/nonblock.c \ ../lib/nonblock.c \
../lib/curlx/strparse.c \ ../lib/curlx/strparse.c \
@ -45,7 +45,7 @@ CURLX_CFILES = \
CURLX_HFILES = \ CURLX_HFILES = \
../lib/curl_ctype.h \ ../lib/curl_ctype.h \
../lib/curl_multibyte.h \ ../lib/curlx/multibyte.h \
../lib/curl_setup.h \ ../lib/curl_setup.h \
../lib/curlx/dynbuf.h \ ../lib/curlx/dynbuf.h \
../lib/nonblock.h \ ../lib/nonblock.h \

2
tests/libtest/Makefile.inc
View File

@ -25,7 +25,7 @@
TESTUTIL = testutil.c testutil.h TESTUTIL = testutil.c testutil.h
TSTTRACE = testtrace.c testtrace.h TSTTRACE = testtrace.c testtrace.h
WARNLESS = ../../lib/curlx/warnless.c ../../lib/curlx/warnless.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 THREADS = ../../lib/curl_threads.c ../../lib/curl_threads.h
MEMPTR = memptr.c MEMPTR = memptr.c

4
tests/server/Makefile.inc
View File

@ -40,7 +40,7 @@ CURLX_SRCS = \
../../lib/strcase.c \ ../../lib/strcase.c \
../../lib/strdup.c \ ../../lib/strdup.c \
../../lib/curl_get_line.c \ ../../lib/curl_get_line.c \
../../lib/curl_multibyte.c \ ../../lib/curlx/multibyte.c \
../../lib/version_win32.c ../../lib/version_win32.c
CURLX_HDRS = \ CURLX_HDRS = \
@ -55,7 +55,7 @@ CURLX_HDRS = \
../../lib/strcase.h \ ../../lib/strcase.h \
../../lib/strdup.h \ ../../lib/strdup.h \
../../lib/curl_get_line.h \ ../../lib/curl_get_line.h \
../../lib/curl_multibyte.h \ ../../lib/curlx/multibyte.h \
../../lib/version_win32.h ../../lib/version_win32.h
UTIL = \ UTIL = \

6
winbuild/MakefileBuild.vc
View File

@ -698,7 +698,7 @@ CURL_FROM_LIBCURL=\
$(CURL_DIROBJ)\timeval.obj \ $(CURL_DIROBJ)\timeval.obj \
$(CURL_DIROBJ)\warnless.obj \ $(CURL_DIROBJ)\warnless.obj \
$(CURL_DIROBJ)\curl_get_line.obj \ $(CURL_DIROBJ)\curl_get_line.obj \
$(CURL_DIROBJ)\curl_multibyte.obj \ $(CURL_DIROBJ)\multibyte.obj \
$(CURL_DIROBJ)\version_win32.obj \ $(CURL_DIROBJ)\version_win32.obj \
$(CURL_DIROBJ)\dynbuf.obj \ $(CURL_DIROBJ)\dynbuf.obj \
$(CURL_DIROBJ)\base64.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_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curlx/timeval.c
$(CURL_DIROBJ)\curl_get_line.obj: ../lib/curl_get_line.c $(CURL_DIROBJ)\curl_get_line.obj: ../lib/curl_get_line.c
$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../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_DIROBJ)\multibyte.obj: ../lib/curlx/multibyte.c
$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_multibyte.c $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curlx/multibyte.c
$(CURL_DIROBJ)\version_win32.obj: ../lib/version_win32.c $(CURL_DIROBJ)\version_win32.obj: ../lib/version_win32.c
$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/version_win32.c $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/version_win32.c
$(CURL_DIROBJ)\warnless.obj: ../lib/curlx/warnless.c $(CURL_DIROBJ)\warnless.obj: ../lib/curlx/warnless.c