[or-cvs] r16964: {tor} Remove now-needless _tor_dmalloc_free helper. (tor/trunk/src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-09-25 13:36:09 -0400 (Thu, 25 Sep 2008)
New Revision: 16964

Modified:
   tor/trunk/src/or/main.c
Log:
Remove now-needless _tor_dmalloc_free helper.

Modified: tor/trunk/src/or/main.c
===================================================================
--- tor/trunk/src/or/main.c	2008-09-25 15:20:38 UTC (rev 16963)
+++ tor/trunk/src/or/main.c	2008-09-25 17:36:09 UTC (rev 16964)
@@ -17,6 +17,7 @@
 #include "or.h"
 #ifdef USE_DMALLOC
 #include <dmalloc.h>
+#include <openssl/crypto.h>
 #endif
 #include "memarea.h"
 
@@ -2046,14 +2047,6 @@
   printf("16:%s\n",output);
 }
 
-#ifdef USE_DMALLOC
-#include <openssl/crypto.h>
-static void
-_tor_dmalloc_free(void *p)
-{
-  tor_free(p);
-}
-#endif
 
 /** Main entry point for the Tor process.  Called from main(). */
 /* This function is distinct from main() only so we can link main.c into
@@ -2066,8 +2059,7 @@
   init_logging();
 #ifdef USE_DMALLOC
   {
-    int r = CRYPTO_set_mem_ex_functions(_tor_malloc, _tor_realloc,
-                                        _tor_dmalloc_free);
+    int r = CRYPTO_set_mem_ex_functions(_tor_malloc, _tor_realloc, _tor_free);
     tor_assert(r);
   }
 #endif