From e1638395fcb0e68c27a664eea796b8448561c4d2 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Tue, 26 Apr 2022 20:36:36 +0200 Subject: [PATCH] detect/multi-tentancy: minor format string fixes cppcheck: src/detect-engine.c:3643:5: warning: %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint] snprintf(prefix, sizeof(prefix), "multi-detect.%d", tenant_id); ^ src/detect-engine.c:3707:5: warning: %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint] snprintf(prefix, sizeof(prefix), "multi-detect.%d.reload.%d", tenant_id, reload_cnt); ^ src/detect-engine.c:4086:17: warning: %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint] snprintf(prefix, sizeof(prefix), "multi-detect.%d", tenant_id); ^ Bug: #5291. (cherry picked from commit 4fcb8740e7b98eee1b5e65bd66045c9440cef8b6) --- src/detect-engine.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/detect-engine.c b/src/detect-engine.c index d14f0d1cc0..a75afed0f6 100644 --- a/src/detect-engine.c +++ b/src/detect-engine.c @@ -3361,7 +3361,7 @@ static int DetectEngineMultiTenantLoadTenant(uint32_t tenant_id, const char *fil DetectEngineCtx *de_ctx = NULL; char prefix[64]; - snprintf(prefix, sizeof(prefix), "multi-detect.%d", tenant_id); + snprintf(prefix, sizeof(prefix), "multi-detect.%u", tenant_id); #ifdef OS_WIN32 struct _stat st; @@ -3425,7 +3425,7 @@ static int DetectEngineMultiTenantReloadTenant(uint32_t tenant_id, const char *f } char prefix[64]; - snprintf(prefix, sizeof(prefix), "multi-detect.%d.reload.%d", tenant_id, reload_cnt); + snprintf(prefix, sizeof(prefix), "multi-detect.%u.reload.%d", tenant_id, reload_cnt); reload_cnt++; SCLogDebug("prefix %s", prefix); @@ -3804,7 +3804,7 @@ int DetectEngineMultiTenantSetup(void) /* setup the yaml in this loop so that it's not done by the loader * threads. ConfYamlLoadFileWithPrefix is not thread safe. */ char prefix[64]; - snprintf(prefix, sizeof(prefix), "multi-detect.%d", tenant_id); + snprintf(prefix, sizeof(prefix), "multi-detect.%u", tenant_id); if (ConfYamlLoadFileWithPrefix(yaml_node->val, prefix) != 0) { SCLogError(SC_ERR_CONF_YAML_ERROR, "failed to load yaml %s", yaml_node->val); goto bad_tenant; -- 2.47.2