From b9c19bc384fd41c173a8e453bd157544400af059 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 31 Mar 2021 11:45:15 +0200 Subject: [PATCH] sd-bus: add asserts showing that sd_bus_error_setf() returns negative (when name is specified). --- src/libsystemd/sd-bus/bus-error.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c index 163cbb1a71d..df292fe3d59 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c @@ -236,6 +236,7 @@ finish: } int bus_error_setfv(sd_bus_error *e, const char *name, const char *format, va_list ap) { + int r; if (!name) return 0; @@ -257,23 +258,28 @@ int bus_error_setfv(sd_bus_error *e, const char *name, const char *format, va_li e->_need_free = 1; } - return -bus_error_name_to_errno(name); + r = bus_error_name_to_errno(name); + assert(r > 0); + return -r; } _public_ int sd_bus_error_setf(sd_bus_error *e, const char *name, const char *format, ...) { + int r; if (format) { - int r; va_list ap; va_start(ap, format); r = bus_error_setfv(e, name, format, ap); + assert(!name || r < 0); va_end(ap); return r; } - return sd_bus_error_set(e, name, NULL); + r = sd_bus_error_set(e, name, NULL); + assert(!name || r < 0); + return r; } _public_ int sd_bus_error_copy(sd_bus_error *dest, const sd_bus_error *e) { -- 2.47.3