projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
963ddb9
)
journal: also use new VA_FORMAT_ADVANCE() macro in sd_journal_send()
author
Lennart Poettering
<lennart@poettering.net>
Mon, 24 Sep 2012 21:42:03 +0000
(23:42 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 24 Sep 2012 21:42:03 +0000
(23:42 +0200)
src/journal/journal-send.c
patch
|
blob
|
history
diff --git
a/src/journal/journal-send.c
b/src/journal/journal-send.c
index
b192f1f
..
d503f3f
100644
(file)
--- a/
src/journal/journal-send.c
+++ b/
src/journal/journal-send.c
@@
-25,6
+25,7
@@
#include <stddef.h>
#include <unistd.h>
#include <fcntl.h>
+#include <printf.h>
#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) {
struct iovec *c;
char *buffer;
+ va_list aq;
if (i >= n) {
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;
}
- if (vasprintf(&buffer, format, ap) < 0) {
+ va_copy(aq, ap);
+ if (vasprintf(&buffer, format, aq) < 0) {
+ va_end(aq);
r = -ENOMEM;
goto fail;
}
+ va_end(aq);
+
+ VA_FORMAT_ADVANCE(format, ap);
IOVEC_SET_STRING(iov[i++], buffer);