summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-03-11 18:56:41 +0000
committerNick Mathewson <nickm@torproject.org>2008-03-11 18:56:41 +0000
commit11e464c3312cb2813ce326fd83ea88364edb0f4a (patch)
treea83fd52d435ab9e166893b8870d8d8f76595b87f /src/or
parent4d32c2e81f25668bc74fc879c2be62f018690b4e (diff)
downloadtor-11e464c3312cb2813ce326fd83ea88364edb0f4a.tar.gz
tor-11e464c3312cb2813ce326fd83ea88364edb0f4a.zip
r18753@catbus: nickm | 2008-03-11 14:56:39 -0400
Make some assert()s into tor_assert()s. Make some tor_assert()s called from logging into assert()s, and document why. svn:r13977
Diffstat (limited to 'src/or')
-rw-r--r--src/or/config.c2
-rw-r--r--src/or/connection.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c
index cdddd3c4fc..daa3dd9206 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3718,7 +3718,7 @@ options_init_from_string(const char *cf,
config_line_t *cl;
int retval;
int err = -1;
- assert(msg);
+ tor_assert(msg);
oldoptions = global_options; /* get_options unfortunately asserts if
this is the first time we run*/
diff --git a/src/or/connection.c b/src/or/connection.c
index 9e559530da..84cd26f2c0 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -734,7 +734,7 @@ create_unix_sockaddr(const char *listenaddress, char **readable_address)
(void)readable_address;
log_fn(LOG_ERR, LD_BUG,
"Unix domain sockets not supported, yet we tried to create one.");
- assert(0);
+ tor_assert(0);
};
#endif /* HAVE_SYS_UN_H */