[or-cvs] r14216: Only log a notice that dmalloc has been set up if it fails. (in tor/trunk: . src/or)

nickm at seul.org nickm at seul.org
Thu Mar 27 16:46:39 UTC 2008


Author: nickm
Date: 2008-03-27 12:46:39 -0400 (Thu, 27 Mar 2008)
New Revision: 14216

Modified:
   tor/trunk/
   tor/trunk/src/or/main.c
Log:
 r19093 at catbus:  nickm | 2008-03-27 12:43:58 -0400
 Only log a notice that dmalloc has been set up if it fails.  Actually, since we have not added a temp log yet, I am not sure this ever does anything.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r19093] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/main.c
===================================================================
--- tor/trunk/src/or/main.c	2008-03-27 16:46:36 UTC (rev 14215)
+++ tor/trunk/src/or/main.c	2008-03-27 16:46:39 UTC (rev 14216)
@@ -1969,7 +1969,8 @@
 #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);
+  if (!r) {
+    log_warn("Couldn't configure openssl to use dmalloc functions.");
 #endif
 #ifdef NT_SERVICE
   {



More information about the tor-commits mailing list