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

journal: also use new VA_FORMAT_ADVANCE() macro in sd_journal_send()

Browse source
This commit is contained in:
Lennart Poettering 2012-09-24 23:42:03 +02:00
parent 963ddb917d
commit 72f1d5a288
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/journal/journal-send.c
View file

@ -25,6 +25,7 @@
#include <stddef.h> #include <stddef.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <printf.h>
#define SD_JOURNAL_SUPPRESS_LOCATION #define SD_JOURNAL_SUPPRESS_LOCATION
@ -121,6 +122,7 @@ static int fill_iovec_sprintf(const char *format, va_list ap, int extra, struct
while (format) { while (format) {
struct iovec *c; struct iovec *c;
char *buffer; char *buffer;
va_list aq;
if (i >= n) { if (i >= n) {
n = MAX(i*2, 4); n = MAX(i*2, 4);
@ -133,10 +135,15 @@ static int fill_iovec_sprintf(const char *format, va_list ap, int extra, struct
iov = c; iov = c;
} }
if (vasprintf(&buffer, format, ap) < 0) { va_copy(aq, ap);
if (vasprintf(&buffer, format, aq) < 0) {
va_end(aq);
r = -ENOMEM; r = -ENOMEM;
goto fail; goto fail;
} }
va_end(aq);
VA_FORMAT_ADVANCE(format, ap);
IOVEC_SET_STRING(iov[i++], buffer); IOVEC_SET_STRING(iov[i++], buffer);