[or-cvs] r14224: Replace a syntax error and a log message that was never emit (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-03-27 16:05:44 -0400 (Thu, 27 Mar 2008)
New Revision: 14224

Modified:
   tor/trunk/
   tor/trunk/src/or/main.c
Log:
 r19109 at catbus:  nickm | 2008-03-27 16:05:18 -0400
 Replace a syntax error and a log message that was never emitted with a simple assert.  Asserts are fun and easy.



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

Modified: tor/trunk/src/or/main.c
===================================================================
--- tor/trunk/src/or/main.c	2008-03-27 19:47:46 UTC (rev 14223)
+++ tor/trunk/src/or/main.c	2008-03-27 20:05:44 UTC (rev 14224)
@@ -1978,8 +1978,7 @@
 #ifdef USE_DMALLOC
   int r = CRYPTO_set_mem_ex_functions(_tor_malloc, _tor_realloc,
                                       _tor_dmalloc_free);
-  if (!r) {
-    log_warn("Couldn't configure openssl to use dmalloc functions.");
+  tor_assert(r);
 #endif
 #ifdef NT_SERVICE
   {