From df803fc4b987e851473fd8d2d494e4fb2ab02923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Tue, 17 May 2016 12:58:34 +0200 Subject: [PATCH] logger: remove redundant format_len from message_format_s --- src/modules/logger/logger.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/modules/logger/logger.cpp b/src/modules/logger/logger.cpp index c4936b2093..9ce04ae089 100644 --- a/src/modules/logger/logger.cpp +++ b/src/modules/logger/logger.cpp @@ -303,7 +303,6 @@ struct message_format_s { uint8_t msg_type = static_cast(MessageType::FORMAT); uint8_t msg_id; - uint16_t format_len; char format[2096]; }; @@ -894,8 +893,8 @@ void Logger::write_formats() for (LoggerSubscription &sub : _subscriptions) { msg.msg_id = msg_id; - msg.format_len = snprintf(msg.format, sizeof(msg.format), "%s", sub.metadata->o_fields); - size_t msg_size = sizeof(msg) - sizeof(msg.format) + msg.format_len; + int format_len = snprintf(msg.format, sizeof(msg.format), "%s", sub.metadata->o_fields); + size_t msg_size = sizeof(msg) - sizeof(msg.format) + format_len; msg.msg_size = msg_size - 3; write_wait(&msg, msg_size);