picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

journal: simplify vsnprintf() ret value check 

Follow-up for dfa64b64a7.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-06-10 11:24:57 +02:00
parent 97033ba455
commit d5da196319
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/journal/journal-send.c
View File

@ -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 */