From f92cc479d82fbf85591d8918bbf469c4b329c31c Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sun, 3 Oct 2021 08:02:57 -0700
Subject: Silence some static analysis warnings
---
core/logging.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'core/logging.cpp')
diff --git a/core/logging.cpp b/core/logging.cpp
index dd7f53c7..b06fb35a 100644
--- a/core/logging.cpp
+++ b/core/logging.cpp
@@ -25,12 +25,12 @@ void al_print(LogLevel level, FILE *logfile, const char *fmt, ...)
std::va_list args, args2;
va_start(args, fmt);
va_copy(args2, args);
- int msglen{std::vsnprintf(str, sizeof(stcmsg), fmt, args)};
- if UNLIKELY(msglen >= 0 && static_cast<size_t>(msglen) >= sizeof(stcmsg))
+ const int msglen{std::vsnprintf(str, sizeof(stcmsg), fmt, args)};
+ if(unlikely(msglen >= 0 && static_cast<size_t>(msglen) >= sizeof(stcmsg)))
{
dynmsg.resize(static_cast<size_t>(msglen) + 1u);
str = dynmsg.data();
- msglen = std::vsnprintf(str, dynmsg.size(), fmt, args2);
+ std::vsnprintf(str, dynmsg.size(), fmt, args2);
}
va_end(args2);
va_end(args);
@@ -59,12 +59,12 @@ void al_print(LogLevel level, FILE *logfile, const char *fmt, ...)
std::va_list args, args2;
va_start(args, fmt);
va_copy(args2, args);
- int msglen{std::vsnprintf(str, sizeof(stcmsg), fmt, args)};
- if UNLIKELY(msglen >= 0 && static_cast<size_t>(msglen) >= sizeof(stcmsg))
+ const int msglen{std::vsnprintf(str, sizeof(stcmsg), fmt, args)};
+ if(unlikely(msglen >= 0 && static_cast<size_t>(msglen) >= sizeof(stcmsg)))
{
dynmsg.resize(static_cast<size_t>(msglen) + 1u);
str = dynmsg.data();
- msglen = std::vsnprintf(str, dynmsg.size(), fmt, args2);
+ std::vsnprintf(str, dynmsg.size(), fmt, args2);
}
va_end(args2);
va_end(args);
--
cgit v1.2.3