summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-07-24 09:08:48 -0400
committerNick Mathewson <nickm@torproject.org>2019-07-24 09:08:48 -0400
commit167d873bdec3354a74417473043b2e82b6723177 (patch)
treed54d5e3ab9ad249b74af1e2e805ccf7119b2145f
parent5fb070a14da4802f11e84ed83143668502a227c4 (diff)
downloadtor-167d873bdec3354a74417473043b2e82b6723177.tar.gz
tor-167d873bdec3354a74417473043b2e82b6723177.zip
Fix clang-detected errors related to log_domain_mask_t
-rw-r--r--src/lib/log/log.c4
-rw-r--r--src/test/test_options.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/log/log.c b/src/lib/log/log.c
index 756eb2a973..d95bf1ff6e 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 d2f0c11218..7009910b0f 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;