summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-05-29 14:41:49 +0000
committerNick Mathewson <nickm@torproject.org>2008-05-29 14:41:49 +0000
commit11b1ee320e6382007dfdeb3e76cfc54f57390a57 (patch)
treeeb2dc5bbec11a2e20ce8406f8773c9cf0616030d
parent74a7bca444bb279cea7408f6f1ba198484832c22 (diff)
downloadtor-11b1ee320e6382007dfdeb3e76cfc54f57390a57.tar.gz
tor-11b1ee320e6382007dfdeb3e76cfc54f57390a57.zip
Backport: Fix warning when compiling with dmalloc.
svn:r14831
-rw-r--r--src/or/main.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 3eee60669b..198bcf9129 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1966,9 +1966,11 @@ tor_main(int argc, char *argv[])
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
{