mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 06:48:05 +01:00
Code Issues Projects Releases Wiki Activity

r18753@catbus: nickm | 2008-03-11 14:56:39 -0400

Browse source 
Make some assert()s into tor_assert()s.  Make some tor_assert()s called from logging into assert()s, and document why.


svn:r13977
This commit is contained in:
Nick Mathewson 2008-03-11 18:56:41 +00:00
parent 4d32c2e81f
commit 11e464c331
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/aes.c
View file

@ -265,7 +265,7 @@ aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits)
void void
aes_free_cipher(aes_cnt_cipher_t *cipher) aes_free_cipher(aes_cnt_cipher_t *cipher)
{ {
assert(cipher); tor_assert(cipher);
#ifdef USE_OPENSSL_EVP #ifdef USE_OPENSSL_EVP
EVP_CIPHER_CTX_cleanup(&cipher->key); EVP_CIPHER_CTX_cleanup(&cipher->key);
#endif #endif

8
src/common/log.c
View file

@ -57,7 +57,9 @@ sev_to_string(int severity)
case LOG_NOTICE: return "notice"; case LOG_NOTICE: return "notice";
case LOG_WARN: return "warn"; case LOG_WARN: return "warn";
case LOG_ERR: return "err"; case LOG_ERR: return "err";
default: assert(0); return "UNKNOWN"; default: /* Call assert, not tor_assert, since tor_assert
* calls log on failure. */
assert(0); return "UNKNOWN";
} }
} }
@ -76,6 +78,7 @@ should_log_function_name(log_domain_mask_t domain, int severity)
/* We care about places where bugs occur. */ /* We care about places where bugs occur. */
return (domain == LD_BUG); return (domain == LD_BUG);
default: default:
/* Call assert, not tor_assert, since tor_assert calls log on failure. */
assert(0); return 0; assert(0); return 0;
} }
} }
@ -203,7 +206,7 @@ format_msg(char *buf, size_t buf_len,
int r; int r;
char *end_of_prefix; char *end_of_prefix;
tor_assert(buf_len >= 2); /* prevent integer underflow */ assert(buf_len >= 2); /* prevent integer underflow */
buf_len -= 2; /* subtract 2 characters so we have room for \n\0 */ buf_len -= 2; /* subtract 2 characters so we have room for \n\0 */
n = _log_prefix(buf, buf_len, severity); n = _log_prefix(buf, buf_len, severity);
@ -256,6 +259,7 @@ logv(int severity, log_domain_mask_t domain, const char *funcname,
logfile_t *lf; logfile_t *lf;
char *end_of_prefix=NULL; char *end_of_prefix=NULL;
/* Call assert, not tor_assert, since tor_assert calls log on failure. */
assert(format); assert(format);
LOCK_LOGS(); LOCK_LOGS();
lf = logfiles; lf = logfiles;

2
src/or/config.c
View file

@ -3718,7 +3718,7 @@ options_init_from_string(const char *cf,
config_line_t *cl; config_line_t *cl;
int retval; int retval;
int err = -1; int err = -1;
assert(msg); tor_assert(msg);
oldoptions = global_options; /* get_options unfortunately asserts if oldoptions = global_options; /* get_options unfortunately asserts if
this is the first time we run*/ this is the first time we run*/

2
src/or/connection.c
View file

@ -734,7 +734,7 @@ create_unix_sockaddr(const char *listenaddress, char **readable_address)
(void)readable_address; (void)readable_address;
log_fn(LOG_ERR, LD_BUG, log_fn(LOG_ERR, LD_BUG,
"Unix domain sockets not supported, yet we tried to create one."); "Unix domain sockets not supported, yet we tried to create one.");
assert(0); tor_assert(0);
}; };
#endif /* HAVE_SYS_UN_H */ #endif /* HAVE_SYS_UN_H */