svn commit: r1166284 - in /trafficserver/traffic/trunk: lib/ts/ink_resource.cc lib/ts/ink_resource.h mgmt/api/INKMgmtAPI.cc

[zwoop]

Author: zwoop
Date: Wed Sep  7 18:10:42 2011
New Revision: 1166284

URL: http://svn.apache.org/viewvc?rev=1166284&view=rev
Log:
TS-567 Remove _xmalloc as well

Modified:
    trafficserver/traffic/trunk/lib/ts/ink_resource.cc
    trafficserver/traffic/trunk/lib/ts/ink_resource.h
    trafficserver/traffic/trunk/mgmt/api/INKMgmtAPI.cc

Modified: trafficserver/traffic/trunk/lib/ts/ink_resource.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_resource.cc?rev=1166284&r1=1166283&r2=1166284&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_resource.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_resource.cc Wed Sep  7 18:10:42 2011
@@ -50,13 +50,6 @@ _xfree_null(void *mem)
 
 
 void *
-_xmalloc(unsigned int size, const char *path)
-{
-  NOWARN_UNUSED(path);
-  return ats_malloc(size);
-}
-
-void *
 _xrealloc(void *ptr, unsigned int size, const char *path)
 {
   NOWARN_UNUSED(path);

Modified: trafficserver/traffic/trunk/lib/ts/ink_resource.h
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_resource.h?rev=1166284&r1=1166283&r2=1166284&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_resource.h (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_resource.h Wed Sep  7 18:10:42 2011
@@ -73,7 +73,6 @@ xfree_null(void *mem)
 #define xstrdup(p)        _xstrdup ((p), -1, NULL)
 #define xstrndup(p,n)     _xstrdup ((p), n, NULL)
 
-void *_xmalloc(unsigned int size, const char *path);
 void *_xrealloc(void *ptr, unsigned int size, const char *path);
 char *_xstrdup(const char *str, int length, const char *path);
 void _xfree(void *ptr);

Modified: trafficserver/traffic/trunk/mgmt/api/INKMgmtAPI.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/api/INKMgmtAPI.cc?rev=1166284&r1=1166283&r2=1166284&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/api/INKMgmtAPI.cc (original)
+++ trafficserver/traffic/trunk/mgmt/api/INKMgmtAPI.cc Wed Sep  7 18:10:42 2011
@@ -52,41 +52,25 @@ void init_pdss_format(TSPdSsFormat * inf
 void *
 _TSmalloc(unsigned int size, const char *path)
 {
-#ifdef PURIFY
   return ats_malloc(size);
-#else
-  return _xmalloc(size, path);
-#endif
 }
 
 void *
 _TSrealloc(void *ptr, unsigned int size, const char *path)
 {
-#ifdef PURIFY
   return xrealloc(ptr, size);
-#else
-  return _xrealloc(ptr, size, path);
-#endif
 }
 
 char *
 _TSstrdup(const char *str, int length, const char *path)
 {
-#ifdef PURIFY
   return xstrndup(str, length);
-#else
-  return _xstrdup(str, length, path);
-#endif
 }
 
 void
 _TSfree(void *ptr)
 {
-#ifdef PURIFY
   xfree(ptr);
-#else
-  _xfree(ptr);
-#endif
 }