Fix clang-detected errors related to log_domain_mask_t

diff --git a/src/lib/log/log.c b/src/lib/log/log.c
index 756eb2a9732d79e21a8009bc4dbec3165cfbee4d..d95bf1ff6ea42bc9d27cb2b4fc3c9fba5f761e4f 100644 (file)
--- 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 d2f0c11218b71d2d3b3724a07d94935bf6f7d862..7009910b0fcb2489bacac6909facce0ca901fd26 100644 (file)
--- 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;