romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-04 11:44:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

try dropping Curl_cwcsdup

Browse source
This commit is contained in:
Viktor Szakats 2025-07-07 23:46:21 +02:00
parent ba0b245a3f
commit c4db274491
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
8 changed files with 4 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/curl_memory.h
View file

@ -121,9 +121,6 @@ extern curl_free_callback Curl_cfree;
extern curl_realloc_callback Curl_crealloc;
extern curl_strdup_callback Curl_cstrdup;
extern curl_calloc_callback Curl_ccalloc;
#if defined(_WIN32) && defined(UNICODE)
extern curl_wcsdup_callback Curl_cwcsdup;
#endif
#ifndef CURLDEBUG
@ -150,7 +147,7 @@ extern curl_wcsdup_callback Curl_cwcsdup;
#ifdef _WIN32
#undef _tcsdup
#ifdef UNICODE
#define _tcsdup(ptr) Curl_cwcsdup(ptr)
#define _tcsdup(ptr) Curl_wcsdup(ptr)
#else
#define _tcsdup(ptr) Curl_cstrdup(ptr)
#endif

1
lib/curl_sspi.c
View file

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

6
lib/easy.c
View file

@ -129,9 +129,6 @@ curl_free_callback Curl_cfree = (curl_free_callback)free;
curl_realloc_callback Curl_crealloc = (curl_realloc_callback)realloc;
curl_strdup_callback Curl_cstrdup = (curl_strdup_callback)system_strdup;
curl_calloc_callback Curl_ccalloc = (curl_calloc_callback)calloc;
#if defined(_WIN32) && defined(UNICODE)
curl_wcsdup_callback Curl_cwcsdup = (curl_wcsdup_callback)Curl_wcsdup;
#endif
#if defined(_MSC_VER) && defined(_DLL)
# pragma warning(pop)
@ -157,9 +154,6 @@ static CURLcode global_init(long flags, bool memoryfuncs)
Curl_crealloc = (curl_realloc_callback)realloc;
Curl_cstrdup = (curl_strdup_callback)system_strdup;
Curl_ccalloc = (curl_calloc_callback)calloc;
#if defined(_WIN32) && defined(UNICODE)
Curl_cwcsdup = (curl_wcsdup_callback)Curl_wcsdup;
#endif
}
if(Curl_trc_init()) {

3
lib/setup-win32.h
View file

@ -82,9 +82,6 @@
# include <windows.h>
# include <winerror.h>
# include <tchar.h>
# ifdef UNICODE
typedef wchar_t *(*curl_wcsdup_callback)(const wchar_t *str);
# endif
#endif
/*

1
lib/vauth/vauth.c
View file

@ -27,6 +27,7 @@
#include <curl/curl.h>
#include "vauth.h"
#include "../strdup.h"
#include "../urldata.h"
#include "../curlx/multibyte.h"
#include "../curl_printf.h"

1
lib/vtls/schannel.c
View file

@ -44,6 +44,7 @@
#include "vtls_scache.h"
#include "../sendf.h"
#include "../connect.h" /* for the connect timeout */
#include "../strdup.h"
#include "../strerror.h"
#include "../select.h" /* for the socket readiness */
#include "../curlx/inet_pton.h" /* for IP addr SNI check */

3
tests/libtest/memptr.c
View file

@ -40,9 +40,6 @@ curl_free_callback Curl_cfree = (curl_free_callback)free;
curl_realloc_callback Curl_crealloc = (curl_realloc_callback)realloc;
curl_strdup_callback Curl_cstrdup = (curl_strdup_callback)strdup;
curl_calloc_callback Curl_ccalloc = (curl_calloc_callback)calloc;
#if defined(_WIN32) && defined(UNICODE)
curl_wcsdup_callback Curl_cwcsdup = (curl_wcsdup_callback)_wcsdup;
#endif
#if defined(_MSC_VER) && defined(_DLL)
# pragma warning(pop)

3
tests/server/memptr.c
View file

@ -41,9 +41,6 @@ curl_free_callback Curl_cfree = (curl_free_callback)free;
curl_realloc_callback Curl_crealloc = (curl_realloc_callback)realloc;
curl_strdup_callback Curl_cstrdup = (curl_strdup_callback)system_strdup;
curl_calloc_callback Curl_ccalloc = (curl_calloc_callback)calloc;
#if defined(_WIN32) && defined(UNICODE)
curl_wcsdup_callback Curl_cwcsdup = NULL; /* not used in test code */
#endif
#if defined(_MSC_VER) && defined(_DLL)
# pragma warning(pop)