From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 10 Jun 2020 09:24:57 +0000 (+0200)
Subject: journal: simplify vsnprintf() ret value check
X-Git-Tag: v246-rc1~133^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5da196319c803cb5e0f6117bac03e01eab5559f;p=thirdparty%2Fsystemd.git

journal: simplify vsnprintf() ret value check

Follow-up for dfa64b64a7.
---

diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
index 57d09e78c38..d51d03acd9d 100644
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -96,11 +96,9 @@ _public_ int sd_journal_printv(int priority, const char *format, va_list ap) {
 
         /* Allocate large buffer to accommodate big message */
         if (len >= LINE_MAX) {
-                _unused_ int rlen;
                 buffer = alloca(len + 9);
                 memcpy(buffer, "MESSAGE=", 8);
-                rlen = vsnprintf(buffer + 8, len + 1, format, ap);
-                assert(len == rlen);
+                assert_se(vsnprintf(buffer + 8, len + 1, format, ap) == len);
         }
 
         /* Strip trailing whitespace, keep prefix whitespace. */
@@ -474,11 +472,9 @@ _public_ int sd_journal_printv_with_location(int priority, const char *file, con
 
         /* Allocate large buffer to accommodate big message */
         if (len >= LINE_MAX) {
-                _unused_ int rlen;
                 buffer = alloca(len + 9);
                 memcpy(buffer, "MESSAGE=", 8);
-                rlen = vsnprintf(buffer + 8, len + 1, format, ap);
-                assert(len == rlen);
+                assert_se(vsnprintf(buffer + 8, len + 1, format, ap) == len);
         }
 
         /* Strip trailing whitespace, keep prefixing whitespace */