diff options
author | David Herrmann <dh.herrmann@googlemail.com> | 2015-09-28 10:57:07 +0200 |
---|---|---|
committer | David Herrmann <dh.herrmann@googlemail.com> | 2015-09-28 10:57:07 +0200 |
commit | 9dc5db34adbd6fa3d2ac08d9610d401ba69cde93 (patch) | |
tree | 762dbf312044e4d2908ecc21fbb03ad6ded89f96 /src | |
parent | 8e82b3a27152ab1d328d05199df91070f9cb7571 (diff) | |
parent | 19932084d0177f482e04ab3b08ab836ccf93cc40 (diff) |
Merge pull request #1396 from phomes/va-start
sd-bus: va_start should use the last named parameter
Diffstat (limited to 'src')
-rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 3310d3859d..a23f7257fa 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -3467,7 +3467,7 @@ _public_ int sd_bus_path_encode_many(char **out, const char *path_template, ...) path_length = strlen(path_template); - va_start(list, out); + va_start(list, path_template); for (sep = strchr(path_template, '%'); sep; sep = strchr(sep + 1, '%')) { const char *arg; char *label; @@ -3602,7 +3602,7 @@ _public_ int sd_bus_path_decode_many(const char *path, const char *path_template return 0; /* copy the labels over to the caller */ - va_start(list, path); + va_start(list, path_template); for (label_pos = labels; label_pos && *label_pos; ++label_pos) { char **arg; |