[or-cvs] r14831: Backport: Fix warning when compiling with dmalloc. (tor/branches/tor-0_2_0-patches/src/or)

nickm at seul.org nickm at seul.org
Thu May 29 14:41:50 UTC 2008


Author: nickm
Date: 2008-05-29 10:41:49 -0400 (Thu, 29 May 2008)
New Revision: 14831

Modified:
   tor/branches/tor-0_2_0-patches/src/or/main.c
Log:
Backport: Fix warning when compiling with dmalloc.

Modified: tor/branches/tor-0_2_0-patches/src/or/main.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/main.c	2008-05-29 14:39:56 UTC (rev 14830)
+++ tor/branches/tor-0_2_0-patches/src/or/main.c	2008-05-29 14:41:49 UTC (rev 14831)
@@ -1966,9 +1966,11 @@
   tor_threads_init();
   init_logging();
 #ifdef USE_DMALLOC
-  int r = CRYPTO_set_mem_ex_functions(_tor_malloc, _tor_realloc,
-                                      _tor_dmalloc_free);
-  log_notice(LD_CONFIG, "Set up dmalloc; returned %d", r);
+  {
+    int r = CRYPTO_set_mem_ex_functions(_tor_malloc, _tor_realloc,
+                                        _tor_dmalloc_free);
+    log_notice(LD_CONFIG, "Set up dmalloc; returned %d", r);
+  }
 #endif
 #ifdef NT_SERVICE
   {



More information about the tor-commits mailing list