From ea31f332600dae6a54d0172634f650e5d59ff7bd Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 12 Sep 2024 14:06:22 +0200 Subject: [PATCH] (!1691) os: log: drop unused variables Drop some unneeded variabes, whose values can be computed at compile-time. Signed-off-by: Enrico Weigelt, metux IT consult --- os/log.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/os/log.c b/os/log.c index 8fca48ed6..8807ff9df 100644 --- a/os/log.c +++ b/os/log.c @@ -678,8 +678,6 @@ LogVMessageVerb(MessageType type, int verb, const char *format, va_list args) { const char *type_str; char buf[1024]; - const size_t size = sizeof(buf); - Bool newline; size_t len = 0; if (inSignalContext) { @@ -693,17 +691,16 @@ LogVMessageVerb(MessageType type, int verb, const char *format, va_list args) /* if type_str is not "", prepend it and ' ', to message */ if (type_str[0] != '\0') - len += Xscnprintf(&buf[len], size - len, "%s ", type_str); + len += Xscnprintf(&buf[len], sizeof(buf) - len, "%s ", type_str); - if (size - len > 1) - len += Xvscnprintf(&buf[len], size - len, format, args); + if (sizeof(buf) - len > 1) + len += Xvscnprintf(&buf[len], sizeof(buf) - len, format, args); /* Force '\n' at end of truncated line */ - if (size - len == 1) + if (sizeof(buf) - len == 1) buf[len - 1] = '\n'; - newline = (buf[len - 1] == '\n'); - LogSWrite(verb, buf, len, newline); + LogSWrite(verb, buf, len, (buf[len - 1] == '\n')); } /* Log message with verbosity level specified. */ @@ -744,7 +741,6 @@ LogVMessageVerbSigSafe(MessageType type, int verb, const char *format, va_list a const char *type_str; char buf[1024]; int len; - Bool newline; type_str = LogMessageTypeVerbString(type, verb); if (!type_str) @@ -762,8 +758,7 @@ LogVMessageVerbSigSafe(MessageType type, int verb, const char *format, va_list a if (sizeof(buf) - len == 1) buf[len - 1] = '\n'; - newline = (len > 0 && buf[len - 1] == '\n'); - LogSWrite(verb, buf, len, newline); + LogSWrite(verb, buf, len, (len > 0 && buf[len - 1] == '\n')); } void @@ -772,8 +767,6 @@ LogVHdrMessageVerb(MessageType type, int verb, const char *msg_format, { const char *type_str; char buf[1024]; - const size_t size = sizeof(buf); - Bool newline; size_t len = 0; int (*vprintf_func)(char *, int, const char* _X_RESTRICT_KYWD f, va_list args) _X_ATTRIBUTE_PRINTF(3, 0); @@ -794,20 +787,19 @@ LogVHdrMessageVerb(MessageType type, int verb, const char *msg_format, /* if type_str is not "", prepend it and ' ', to message */ if (type_str[0] != '\0') - len += printf_func(&buf[len], size - len, "%s ", type_str); + len += printf_func(&buf[len], sizeof(buf) - len, "%s ", type_str); - if (hdr_format && size - len > 1) - len += vprintf_func(&buf[len], size - len, hdr_format, hdr_args); + if (hdr_format && sizeof(buf) - len > 1) + len += vprintf_func(&buf[len], sizeof(buf) - len, hdr_format, hdr_args); - if (msg_format && size - len > 1) - len += vprintf_func(&buf[len], size - len, msg_format, msg_args); + if (msg_format && sizeof(buf) - len > 1) + len += vprintf_func(&buf[len], sizeof(buf) - len, msg_format, msg_args); /* Force '\n' at end of truncated line */ - if (size - len == 1) + if (sizeof(buf) - len == 1) buf[len - 1] = '\n'; - newline = (buf[len - 1] == '\n'); - LogSWrite(verb, buf, len, newline); + LogSWrite(verb, buf, len, (buf[len - 1] == '\n')); } void