Просмотр исходного кода

Replaced some leftover assert()s with tor_assert()s.

George Kadianakis 14 лет назад
Родитель
Сommit
c852760b80
2 измененных файлов с 3 добавлено и 4 удалено
  1. 1 1
      src/or/circuitbuild.c
  2. 2 3
      src/or/transports.c

+ 1 - 1
src/or/circuitbuild.c

@@ -4640,7 +4640,7 @@ transport_create(const tor_addr_t *addr, uint16_t port,
 int
 transport_add(transport_t *t)
 {
-  assert(t);
+  tor_assert(t);
 
   if (transport_get_by_name(t->name)) { /* check for duplicate names */
     log_notice(LD_CONFIG, "More than one transports have '%s' as "

+ 2 - 3
src/or/transports.c

@@ -174,8 +174,7 @@ pt_configure_remaining_proxies(void)
   log_warn(LD_CONFIG, "We start configuring remaining managed proxies!");
   SMARTLIST_FOREACH_BEGIN(unconfigured_proxy_list,  managed_proxy_t *, mp) {
     /* configured proxies shouldn't be in unconfigured_proxy_list. */
-    if (proxy_configuration_finished(mp))
-      assert(0);
+    tor_assert(!proxy_configuration_finished(mp));
 
     configure_proxy(mp);
 
@@ -307,7 +306,7 @@ handle_finished_proxy(managed_proxy_t *mp)
   default:
     log_warn(LD_CONFIG, "Unfinished managed proxy in "
              "handle_finished_proxy().");
-    assert(0);
+    tor_assert(0);
   }
 
   tor_assert(smartlist_len(unconfigured_proxy_list) >= 0);