commit 167d873bdec3354a74417473043b2e82b6723177 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 24 09:08:48 2019 -0400

Fix clang-detected errors related to log_domain_mask_t --- src/lib/log/log.c | 4 ++-- src/test/test_options.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/log/log.c b/src/lib/log/log.c index 756eb2a97..d95bf1ff6 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -1022,7 +1022,7 @@ flush_pending_log_callbacks(void) do { SMARTLIST_FOREACH_BEGIN(messages, pending_log_message_t *, msg) { const int severity = msg->severity; - const int domain = msg->domain; + const log_domain_mask_t domain = msg->domain; for (lf = logfiles; lf; lf = lf->next) { if (! lf->callback || lf->seems_dead || ! (lf->severities->masks[SEVERITY_MASK_IDX(severity)] & domain)) { @@ -1377,7 +1377,7 @@ parse_log_severity_config(const char **cfg_ptr, if (!strcmp(domain, "*")) { domains = ~0u; } else { - int d; + log_domain_mask_t d; int negate=0; if (*domain == '~') { negate = 1; diff --git a/src/test/test_options.c b/src/test/test_options.c index d2f0c1121..7009910b0 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -31,7 +31,7 @@

typedef struct { int severity; - uint32_t domain; + log_domain_mask_t domain; char *msg; } logmsg_t;