diff options
| -rw-r--r-- | src/libsystemd/libsystemd.sym.m4 | 1 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-convenience.c | 2 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-error.c | 4 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-message.c | 2 | ||||
| -rw-r--r-- | src/systemd/sd-bus.h | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/src/libsystemd/libsystemd.sym.m4 b/src/libsystemd/libsystemd.sym.m4 index 41418b99f4..76a8c921c6 100644 --- a/src/libsystemd/libsystemd.sym.m4 +++ b/src/libsystemd/libsystemd.sym.m4 @@ -350,6 +350,7 @@ global: sd_bus_error_set_const; sd_bus_error_set_errno; sd_bus_error_set_errnof; + sd_bus_error_set_errnofv; sd_bus_error_get_errno; sd_bus_error_copy; sd_bus_error_is_set; diff --git a/src/libsystemd/sd-bus/bus-convenience.c b/src/libsystemd/sd-bus/bus-convenience.c index ae0f4fa217..a6317e9785 100644 --- a/src/libsystemd/sd-bus/bus-convenience.c +++ b/src/libsystemd/sd-bus/bus-convenience.c @@ -234,7 +234,7 @@ _public_ int sd_bus_reply_method_errnof( return 0; va_start(ap, format); - bus_error_set_errnofv(&berror, error, format, ap); + sd_bus_error_set_errnofv(&berror, error, format, ap); va_end(ap); return sd_bus_reply_method_error(call, &berror); diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c index 09800ec7d7..3bf0c5d3e4 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c @@ -468,7 +468,7 @@ _public_ int sd_bus_error_set_errno(sd_bus_error *e, int error) { return -error; } -int bus_error_set_errnofv(sd_bus_error *e, int error, const char *format, va_list ap) { +_public_ int sd_bus_error_set_errnofv(sd_bus_error *e, int error, const char *format, va_list ap) { PROTECT_ERRNO; int r; @@ -551,7 +551,7 @@ _public_ int sd_bus_error_set_errnof(sd_bus_error *e, int error, const char *for va_list ap; va_start(ap, format); - r = bus_error_set_errnofv(e, error, format, ap); + r = sd_bus_error_set_errnofv(e, error, format, ap); va_end(ap); return r; diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index 3f2d6e74c5..da14a28c9a 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -742,7 +742,7 @@ _public_ int sd_bus_message_new_method_errnof( va_list ap; va_start(ap, format); - bus_error_set_errnofv(&berror, error, format, ap); + sd_bus_error_set_errnofv(&berror, error, format, ap); va_end(ap); return sd_bus_message_new_method_error(call, m, &berror); diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h index 4f253a1567..2420d0c062 100644 --- a/src/systemd/sd-bus.h +++ b/src/systemd/sd-bus.h @@ -23,6 +23,7 @@ ***/ #include <inttypes.h> +#include <stdarg.h> #include <sys/types.h> #include <sys/uio.h> @@ -370,6 +371,7 @@ int sd_bus_error_setf(sd_bus_error *e, const char *name, const char *format, ... int sd_bus_error_set_const(sd_bus_error *e, const char *name, const char *message); int sd_bus_error_set_errno(sd_bus_error *e, int error); int sd_bus_error_set_errnof(sd_bus_error *e, int error, const char *format, ...) _sd_printf_(3, 4); +int sd_bus_error_set_errnofv(sd_bus_error *e, int error, const char *format, va_list ap); int sd_bus_error_get_errno(const sd_bus_error *e); int sd_bus_error_copy(sd_bus_error *dest, const sd_bus_error *e); int sd_bus_error_is_set(const sd_bus_error *e); |