nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid calling log functions in logv when SMARTLIST_DEBUG is defined

Browse Source
This commit is contained in:
teor (Tim Wilson-Brown) 2016-02-05 14:14:17 +11:00
parent db72b509d1
commit add8acf428
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/log.c
View File

@ -490,7 +490,8 @@ logv,(int severity, log_domain_mask_t domain, const char *funcname,
assert(log_mutex_initialized); assert(log_mutex_initialized);
LOCK_LOGS(); LOCK_LOGS();
if ((! (domain & LD_NOCB)) && smartlist_len(pending_cb_messages)) if ((! (domain & LD_NOCB)) && pending_cb_messages
&& smartlist_len(pending_cb_messages))
flush_pending_log_callbacks(); flush_pending_log_callbacks();
if (queue_startup_messages && if (queue_startup_messages &&
@ -945,7 +946,7 @@ flush_pending_log_callbacks(void)
smartlist_t *messages, *messages_tmp; smartlist_t *messages, *messages_tmp;
LOCK_LOGS(); LOCK_LOGS();
if (0 == smartlist_len(pending_cb_messages)) { if (!pending_cb_messages || 0 == smartlist_len(pending_cb_messages)) {
UNLOCK_LOGS(); UNLOCK_LOGS();
return; return;
} }