aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@gmail.com>2011-09-10 00:45:28 +0200
committerGeorge Kadianakis <desnacked@gmail.com>2011-09-10 00:45:28 +0200
commitc852760b80c4b7e06d775bafdb1f386d0e8ced63 (patch)
treea70efe9eec15c2280a9f31ccc27c6e2187f5a8de /src
parentdb4cde38109c677db14316ac77c240d7d61db386 (diff)
downloadtor-c852760b80c4b7e06d775bafdb1f386d0e8ced63.tar.gz
tor-c852760b80c4b7e06d775bafdb1f386d0e8ced63.zip
Replaced some leftover assert()s with tor_assert()s.
Diffstat (limited to 'src')
-rw-r--r--src/or/circuitbuild.c2
-rw-r--r--src/or/transports.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index fe57070ac1..382016ecc7 100644
--- a/src/or/circuitbuild.c
+++ b/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 "
diff --git a/src/or/transports.c b/src/or/transports.c
index 21a302298f..6255a567b6 100644
--- a/src/or/transports.c
+++ b/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);