aboutsummaryrefslogtreecommitdiff
path: root/lib/easy.c
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2013-03-25 03:15:52 +0100
committerYang Tse <yangsita@gmail.com>2013-03-25 03:32:47 +0100
commit8ec2cb5544b86306b702484ea785b6b9596562ab (patch)
tree55952aea963b504165c3246768c93b21d6375958 /lib/easy.c
parentc5eabd48e8dbc8393723bb79f0040475d850f389 (diff)
WIN32 MemoryTracking: track wcsdup() _wcsdup() and _tcsdup() usage
As of 25-mar-2013 wcsdup() _wcsdup() and _tcsdup() are only used in WIN32 specific code, so tracking of these has not been extended for other build targets. Without this fix, memory tracking system on WIN32 builds, when using these functions, would provide misleading results. In order to properly extend this support for all targets curl.h would have to define curl_wcsdup_callback prototype and consequently wchar_t should be visible before that in curl.h. IOW curl_wchar_t defined in curlbuild.h and this pulling whatever system header is required to get wchar_t definition. Additionally a new curl_global_init_mem() function that also receives user defined wcsdup() callback would be required.
Diffstat (limited to 'lib/easy.c')
-rw-r--r--lib/easy.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/easy.c b/lib/easy.c
index dc95a6d44..55144c7b9 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -197,6 +197,9 @@ 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;
+#ifdef WIN32
+curl_wcsdup_callback Curl_cwcsdup = (curl_wcsdup_callback)wcsdup;
+#endif
#else
/*
* Symbian OS doesn't support initialization to code in writeable static data.
@@ -228,6 +231,9 @@ CURLcode curl_global_init(long flags)
Curl_crealloc = (curl_realloc_callback)realloc;
Curl_cstrdup = (curl_strdup_callback)system_strdup;
Curl_ccalloc = (curl_calloc_callback)calloc;
+#ifdef WIN32
+ Curl_cwcsdup = (curl_wcsdup_callback)wcsdup;
+#endif
if(flags & CURL_GLOBAL_SSL)
if(!Curl_ssl_init()) {