mirror of
https://github.com/morgan9e/systemd
synced 2026-04-14 08:25:20 +09:00
sd-bus: add asserts showing that sd_bus_error_setf() returns negative
(when name is specified).
This commit is contained in:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user