Revert "WIN32 MemoryTracking: track wcsdup() _wcsdup() and _tcsdup() usage"

This reverts commit 8ec2cb5544b86306b702484ea785b6b9596562ab.

We don't have any code anywhere in libcurl (or the curl tool) that use
wcsdup so there's no such memory use to track. It seems to cause mild
problems with the Borland compiler though that we may avoid by reverting
this change again.

Bug: http://curl.haxx.se/mail/lib-2013-05/0070.html

diff --git a/lib/curl_memory.h b/lib/curl_memory.h
index 4bba008c9a4cc37982b260dbecff3cf0a06f2044..c1e92513fa543645db591ee97ae5e3a33e4a4c07 100644 (file)
--- a/lib/curl_memory.h
+++ b/lib/curl_memory.h
@@ -87,9 +87,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;
-#ifdef WIN32
-extern curl_wcsdup_callback Curl_cwcsdup;
-#endif
 
 #ifndef CURLDEBUG
 
@@ -113,19 +110,6 @@ extern curl_wcsdup_callback Curl_cwcsdup;
 #undef free
 #define free(ptr) Curl_cfree(ptr)
 
-#ifdef WIN32
-#  undef wcsdup
-#  define wcsdup(ptr) Curl_cwcsdup(ptr)
-#  undef _wcsdup
-#  define _wcsdup(ptr) Curl_cwcsdup(ptr)
-#  undef _tcsdup
-#  ifdef UNICODE
-#    define _tcsdup(ptr) Curl_cwcsdup(ptr)
-#  else
-#    define _tcsdup(ptr) Curl_cstrdup(ptr)
-#  endif
-#endif
-
 #endif /* CURLDEBUG */
 
 #else /* CURLX_NO_MEMORY_CALLBACKS */

diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 0508ab56caaacb2ca2e432a98378ad9a05c1d9c5..e4d8721a0bc20287aff08a4ed90208b6f419fe3e 100644 (file)
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -270,7 +270,6 @@
 #    endif
 #  endif
 #  include <tchar.h>
-   typedef wchar_t *(*curl_wcsdup_callback)(const wchar_t *str);
 #endif
 
 /*

diff --git a/lib/easy.c b/lib/easy.c
index eb45bd717f2ada4dbff6b73ed6bf63e453c8d108..5d441f718992f31184f4276116d2851601c1677b 100644 (file)
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -198,9 +198,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;
-#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.
@@ -232,9 +229,6 @@ 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()) {

diff --git a/lib/memdebug.c b/lib/memdebug.c
index b3ddfb430e24324be9530254916216f6d99e34dd..4d5f44d2f0d5dd5d75011b78727db01f12873798 100644 (file)
--- a/lib/memdebug.c
+++ b/lib/memdebug.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -239,32 +239,6 @@ char *curl_dostrdup(const char *str, int line, const char *source)
   return mem;
 }
 
-#ifdef WIN32
-wchar_t *curl_dowcsdup(const wchar_t *str, int line, const char *source)
-{
-  wchar_t *mem;
-  size_t wsiz, bsiz;
-
-  assert(str != NULL);
-
-  if(countcheck("wcsdup", line, source))
-    return NULL;
-
-  wsiz = wcslen(str) + 1;
-  bsiz = wsiz * sizeof(wchar_t);
-
-  mem = curl_domalloc(bsiz, 0, NULL); /* NULL prevents logging */
-  if(mem)
-    memcpy(mem, str, bsiz);
-
-  if(source)
-    curl_memlog("MEM %s:%d wcsdup(%p) (%zu) = %p\n",
-                source, line, str, bsiz, mem);
-
-  return mem;
-}
-#endif
-
 /* We provide a realloc() that accepts a NULL as pointer, which then
    performs a malloc(). In order to work with ares. */
 void *curl_dorealloc(void *ptr, size_t wantedsize,

diff --git a/lib/memdebug.h b/lib/memdebug.h
index 955e8b72b9f8e7c35fa03cbf04c6355c6adc3790..fbeb61de5d38a5e15ce465a10f80fdd52f5a9922 100644 (file)
--- a/lib/memdebug.h
+++ b/lib/memdebug.h
@@ -8,7 +8,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -46,11 +46,6 @@ CURL_EXTERN void *curl_dorealloc(void *ptr, size_t size, int line,
                                  const char *source);
 CURL_EXTERN void curl_dofree(void *ptr, int line, const char *source);
 CURL_EXTERN char *curl_dostrdup(const char *str, int line, const char *source);
-#ifdef WIN32
-CURL_EXTERN wchar_t *curl_dowcsdup(const wchar_t *str, int line,
-                                   const char *source);
-#endif
-
 CURL_EXTERN void curl_memdebug(const char *logname);
 CURL_EXTERN void curl_memlimit(long limit);
 CURL_EXTERN void curl_memlog(const char *format, ...);
@@ -89,19 +84,6 @@ CURL_EXTERN int curl_fclose(FILE *file, int line, const char *source);
 #define realloc(ptr,size) curl_dorealloc(ptr, size, __LINE__, __FILE__)
 #define free(ptr) curl_dofree(ptr, __LINE__, __FILE__)
 
-#ifdef WIN32
-#  undef wcsdup
-#  define wcsdup(ptr) curl_dowcsdup(ptr, __LINE__, __FILE__)
-#  undef _wcsdup
-#  define _wcsdup(ptr) curl_dowcsdup(ptr, __LINE__, __FILE__)
-#  undef _tcsdup
-#  ifdef UNICODE
-#    define _tcsdup(ptr) curl_dowcsdup(ptr, __LINE__, __FILE__)
-#  else
-#    define _tcsdup(ptr) curl_dostrdup(ptr, __LINE__, __FILE__)
-#  endif
-#endif
-
 #define socket(domain,type,protocol)\
  curl_socket(domain,type,protocol,__LINE__,__FILE__)
 #undef accept /* for those with accept as a macro */

diff --git a/tests/memanalyze.pl b/tests/memanalyze.pl
index 54117f8ea1ba742f6c2722e2edebae594471875a..5246349697561ffab201db15035cd839e494f8c0 100755 (executable)
--- a/tests/memanalyze.pl
+++ b/tests/memanalyze.pl
@@ -31,7 +31,6 @@ my $mallocs=0;
 my $callocs=0;
 my $reallocs=0;
 my $strdups=0;
-my $wcsdups=0;
 my $showlimit;
 
 while(1) {
@@ -221,25 +220,6 @@ while(<FILE>) {
             newtotal($totalmem);
             $strdups++;
         }
-        elsif($function =~ /wcsdup\(0x([0-9a-f]*)\) \((\d*)\) = 0x([0-9a-f]*)/) {
-            # wcsdup(a5b50) (8) = df7c0
-
-            $dup = $1;
-            $size = $2;
-            $addr = $3;
-            $getmem{$addr}="$source:$linenum";
-            $sizeataddr{$addr}=$size;
-
-            $totalmem += $size;
-
-            if($trace) {
-                printf("WCSDUP: $size bytes at %s, makes totally: %d bytes\n",
-                       $getmem{$addr}, $totalmem);
-            }
-
-            newtotal($totalmem);
-            $wcsdups++;
-        }
         else {
             print "Not recognized input line: $function\n";
         }
@@ -398,9 +378,8 @@ if($verbose) {
     "Reallocs: $reallocs\n",
     "Callocs: $callocs\n",
     "Strdups:  $strdups\n",
-    "Wcsdups:  $wcsdups\n",
     "Frees: $frees\n",
-    "Allocations: ".($mallocs + $callocs + $reallocs + $strdups + $wcsdups)."\n";
+    "Allocations: ".($mallocs + $callocs + $reallocs + $strdups)."\n";
 
     print "Maximum allocated: $maxmem\n";
 }

diff --git a/tests/server/getpart.c b/tests/server/getpart.c
index 188eb5dca43ec3a30fb028d6fe286e712687b2a3..f37f88cba69a550e29d437512c9d568b2af59954 100644 (file)
--- a/tests/server/getpart.c
+++ b/tests/server/getpart.c
@@ -58,9 +58,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;
-#ifdef WIN32
-curl_wcsdup_callback Curl_cwcsdup = (curl_wcsdup_callback)wcsdup;
-#endif
 
 #if defined(_MSC_VER) && defined(_DLL)
 #  pragma warning(default:4232) /* MSVC extension, dllimport identity */