From ea8d1be3184f12bd77dc416b0451c38e739a4904 Mon Sep 17 00:00:00 2001 From: Michal Bloch Date: Fri, 20 Apr 2018 16:45:42 +0200 Subject: [PATCH] pipe: remove padding for odd-length messages Since 154c5eaaf1ecf6224de0bcafc872c4952ffdae9b, the padding is no longer needed as the daemon handles odd lengths correctly. Change-Id: I722efc2e5e73f26f1896510da857a42bbfebed9c Signed-off-by: Michal Bloch --- src/shared/logprint.c | 4 ---- src/shared/queued_entry.c | 1 - 2 files changed, 5 deletions(-) diff --git a/src/shared/logprint.c b/src/shared/logprint.c index 0946e13..d6b194c 100644 --- a/src/shared/logprint.c +++ b/src/shared/logprint.c @@ -752,10 +752,6 @@ char *log_format_log_line( size_t bufferSize; const char *pm; int message_len = entry->len - sizeof(struct logger_entry) - entry->tag_len - 2 /* tag and msg delimiters */; - // odd-length messages get an extra byte of padding, get rid of that - if (*(msg + message_len - 1) == '\0') - --message_len; - if (prefixSuffixIsHeaderFooter) { /* we're just wrapping message with a header/footer */ diff --git a/src/shared/queued_entry.c b/src/shared/queued_entry.c index 613eb99..7f1bf31 100644 --- a/src/shared/queued_entry.c +++ b/src/shared/queued_entry.c @@ -67,7 +67,6 @@ void create_pipe_message(void *buf, int prio, char const *tag, char const *msg) ple->msg[0] = prio; memcpy(ple->msg + 1, tag, tag_l); memcpy(ple->msg + 1 + tag_l, msg, msg_l); - ple->len += ple->len % 2; } /** -- 2.7.4