Commit 7ed25ccf authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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

This reverts commit 8ec2cb55.

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
parent 01eede26

lib/curl_memory.h

+0 −16
Original line number Original line Diff line number Diff line
@@ -87,9 +87,6 @@ extern curl_free_callback Curl_cfree; 
extern curl_realloc_callback Curl_crealloc;

extern curl_realloc_callback Curl_crealloc;

extern curl_strdup_callback Curl_cstrdup;

extern curl_strdup_callback Curl_cstrdup;

extern curl_calloc_callback Curl_ccalloc;

extern curl_calloc_callback Curl_ccalloc;

#ifdef WIN32

extern curl_wcsdup_callback Curl_cwcsdup;

#endif





#ifndef CURLDEBUG

#ifndef CURLDEBUG
@@ -113,19 +110,6 @@ extern curl_wcsdup_callback Curl_cwcsdup; 
#undef free

#undef free

#define free(ptr) Curl_cfree(ptr)

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

#endif /* CURLDEBUG */





#else /* CURLX_NO_MEMORY_CALLBACKS */

#else /* CURLX_NO_MEMORY_CALLBACKS */

lib/curl_setup.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -270,7 +270,6 @@ 
#    endif

#    endif

#  endif

#  endif

#  include <tchar.h>

#  include <tchar.h>

   typedef wchar_t *(*curl_wcsdup_callback)(const wchar_t *str);

#endif

#endif





/*

/*

lib/easy.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -198,9 +198,6 @@ curl_free_callback Curl_cfree = (curl_free_callback)free; 
curl_realloc_callback Curl_crealloc = (curl_realloc_callback)realloc;

curl_realloc_callback Curl_crealloc = (curl_realloc_callback)realloc;

curl_strdup_callback Curl_cstrdup = (curl_strdup_callback)system_strdup;

curl_strdup_callback Curl_cstrdup = (curl_strdup_callback)system_strdup;

curl_calloc_callback Curl_ccalloc = (curl_calloc_callback)calloc;

curl_calloc_callback Curl_ccalloc = (curl_calloc_callback)calloc;

#ifdef WIN32

curl_wcsdup_callback Curl_cwcsdup = (curl_wcsdup_callback)wcsdup;

#endif

#else

#else

/*

/*

 * Symbian OS doesn't support initialization to code in writeable static data.

 * 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_crealloc = (curl_realloc_callback)realloc;

  Curl_cstrdup = (curl_strdup_callback)system_strdup;

  Curl_cstrdup = (curl_strdup_callback)system_strdup;

  Curl_ccalloc = (curl_calloc_callback)calloc;

  Curl_ccalloc = (curl_calloc_callback)calloc;

#ifdef WIN32

  Curl_cwcsdup = (curl_wcsdup_callback)wcsdup;

#endif





  if(flags & CURL_GLOBAL_SSL)

  if(flags & CURL_GLOBAL_SSL)

    if(!Curl_ssl_init()) {

    if(!Curl_ssl_init()) {

lib/memdebug.c

+1 −27
Original line number Original line Diff line number Diff line
@@ -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

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms

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

  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

/* We provide a realloc() that accepts a NULL as pointer, which then

   performs a malloc(). In order to work with ares. */

   performs a malloc(). In order to work with ares. */

void *curl_dorealloc(void *ptr, size_t wantedsize,

void *curl_dorealloc(void *ptr, size_t wantedsize,

lib/memdebug.h

+1 −19
Original line number Original line Diff line number Diff line
@@ -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

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms

 * 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);

                                 const char *source);

CURL_EXTERN void curl_dofree(void *ptr, 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);

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_memdebug(const char *logname);

CURL_EXTERN void curl_memlimit(long limit);

CURL_EXTERN void curl_memlimit(long limit);

CURL_EXTERN void curl_memlog(const char *format, ...);

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 realloc(ptr,size) curl_dorealloc(ptr, size, __LINE__, __FILE__)

#define free(ptr) curl_dofree(ptr, __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)\

#define socket(domain,type,protocol)\

 curl_socket(domain,type,protocol,__LINE__,__FILE__)

 curl_socket(domain,type,protocol,__LINE__,__FILE__)

#undef accept /* for those with accept as a macro */

#undef accept /* for those with accept as a macro */