picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bus: use assert_return() for more API calls

Browse source
This commit is contained in:
Lennart Poettering 2013-10-14 19:40:37 +02:00
parent 690018ab40
commit d68888227d
1 changed files with 118 additions and 233 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

351
src/libsystemd-bus/sd-bus.c
View file

@ -157,8 +157,7 @@ static void bus_free(sd_bus *b) {
int sd_bus_new(sd_bus **ret) { int sd_bus_new(sd_bus **ret) {
sd_bus *r; sd_bus *r;
if (!ret) assert_return(ret, -EINVAL);
return -EINVAL;
r = new0(sd_bus, 1); r = new0(sd_bus, 1);
if (!r) if (!r)
@ -187,14 +186,10 @@ int sd_bus_new(sd_bus **ret) {
int sd_bus_set_address(sd_bus *bus, const char *address) { int sd_bus_set_address(sd_bus *bus, const char *address) {
char *a; char *a;
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(bus->state == BUS_UNSET, -EPERM);
if (bus->state != BUS_UNSET) assert_return(address, -EINVAL);
return -EPERM; assert_return(!bus_pid_changed(bus), -ECHILD);
if (!address)
return -EINVAL;
if (bus_pid_changed(bus))
return -ECHILD;
a = strdup(address); a = strdup(address);
if (!a) if (!a)
@ -207,16 +202,11 @@ int sd_bus_set_address(sd_bus *bus, const char *address) {
} }
int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd) { int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd) {
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(bus->state == BUS_UNSET, -EPERM);
if (bus->state != BUS_UNSET) assert_return(input_fd >= 0, -EINVAL);
return -EPERM; assert_return(output_fd >= 0, -EINVAL);
if (input_fd < 0) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EINVAL;
if (output_fd < 0)
return -EINVAL;
if (bus_pid_changed(bus))
return -ECHILD;
bus->input_fd = input_fd; bus->input_fd = input_fd;
bus->output_fd = output_fd; bus->output_fd = output_fd;
@ -226,16 +216,11 @@ int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd) {
int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) { int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) {
char *p, **a; char *p, **a;
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(bus->state == BUS_UNSET, -EPERM);
if (bus->state != BUS_UNSET) assert_return(path, -EINVAL);
return -EPERM; assert_return(!strv_isempty(argv), -EINVAL);
if (!path) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EINVAL;
if (strv_isempty(argv))
return -EINVAL;
if (bus_pid_changed(bus))
return -ECHILD;
p = strdup(path); p = strdup(path);
if (!p) if (!p)
@ -257,122 +242,91 @@ int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) {
} }
int sd_bus_set_bus_client(sd_bus *bus, int b) { int sd_bus_set_bus_client(sd_bus *bus, int b) {
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(bus->state == BUS_UNSET, -EPERM);
if (bus->state != BUS_UNSET) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EPERM;
if (bus_pid_changed(bus))
return -ECHILD;
bus->bus_client = !!b; bus->bus_client = !!b;
return 0; return 0;
} }
int sd_bus_negotiate_fds(sd_bus *bus, int b) { int sd_bus_negotiate_fds(sd_bus *bus, int b) {
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(bus->state == BUS_UNSET, -EPERM);
if (bus->state != BUS_UNSET) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EPERM;
if (bus_pid_changed(bus))
return -ECHILD;
SET_FLAG(bus->hello_flags, KDBUS_HELLO_ACCEPT_FD, b); SET_FLAG(bus->hello_flags, KDBUS_HELLO_ACCEPT_FD, b);
return 0; return 0;
} }
int sd_bus_negotiate_attach_comm(sd_bus *bus, int b) { int sd_bus_negotiate_attach_comm(sd_bus *bus, int b) {
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(bus->state == BUS_UNSET, -EPERM);
if (bus->state != BUS_UNSET) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EPERM;
if (bus_pid_changed(bus))
return -ECHILD;
SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_COMM, b); SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_COMM, b);
return 0; return 0;
} }
int sd_bus_negotiate_attach_exe(sd_bus *bus, int b) { int sd_bus_negotiate_attach_exe(sd_bus *bus, int b) {
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(bus->state == BUS_UNSET, -EPERM);
if (bus->state != BUS_UNSET) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EPERM;
if (bus_pid_changed(bus))
return -ECHILD;
SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_EXE, b); SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_EXE, b);
return 0; return 0;
} }
int sd_bus_negotiate_attach_cmdline(sd_bus *bus, int b) { int sd_bus_negotiate_attach_cmdline(sd_bus *bus, int b) {
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(bus->state == BUS_UNSET, -EPERM);
if (bus->state != BUS_UNSET) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EPERM;
if (bus_pid_changed(bus))
return -ECHILD;
SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_CMDLINE, b); SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_CMDLINE, b);
return 0; return 0;
} }
int sd_bus_negotiate_attach_cgroup(sd_bus *bus, int b) { int sd_bus_negotiate_attach_cgroup(sd_bus *bus, int b) {
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(bus->state == BUS_UNSET, -EPERM);
if (bus->state != BUS_UNSET) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EPERM;
if (bus_pid_changed(bus))
return -ECHILD;
SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_CGROUP, b); SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_CGROUP, b);
return 0; return 0;
} }
int sd_bus_negotiate_attach_caps(sd_bus *bus, int b) { int sd_bus_negotiate_attach_caps(sd_bus *bus, int b) {
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(bus->state == BUS_UNSET, -EPERM);
if (bus->state != BUS_UNSET) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EPERM;
if (bus_pid_changed(bus))
return -ECHILD;
SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_CAPS, b); SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_CAPS, b);
return 0; return 0;
} }
int sd_bus_negotiate_attach_selinux_context(sd_bus *bus, int b) { int sd_bus_negotiate_attach_selinux_context(sd_bus *bus, int b) {
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(bus->state == BUS_UNSET, -EPERM);
if (bus->state != BUS_UNSET) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EPERM;
if (bus_pid_changed(bus))
return -ECHILD;
SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_SECLABEL, b); SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_SECLABEL, b);
return 0; return 0;
} }
int sd_bus_negotiate_attach_audit(sd_bus *bus, int b) { int sd_bus_negotiate_attach_audit(sd_bus *bus, int b) {
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(bus->state == BUS_UNSET, -EPERM);
if (bus->state != BUS_UNSET) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EPERM;
if (bus_pid_changed(bus))
return -ECHILD;
SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_AUDIT, b); SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_AUDIT, b);
return 0; return 0;
} }
int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id) { int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id) {
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(b || sd_id128_equal(server_id, SD_ID128_NULL), -EINVAL);
if (!b && !sd_id128_equal(server_id, SD_ID128_NULL)) assert_return(bus->state == BUS_UNSET, -EPERM);
return -EINVAL; assert_return(!bus_pid_changed(bus), -ECHILD);
if (bus->state != BUS_UNSET)
return -EPERM;
if (bus_pid_changed(bus))
return -ECHILD;
bus->is_server = !!b; bus->is_server = !!b;
bus->server_id = server_id; bus->server_id = server_id;
@ -380,12 +334,9 @@ int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id) {
} }
int sd_bus_set_anonymous(sd_bus *bus, int b) { int sd_bus_set_anonymous(sd_bus *bus, int b) {
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(bus->state == BUS_UNSET, -EPERM);
if (bus->state != BUS_UNSET) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EPERM;
if (bus_pid_changed(bus))
return -ECHILD;
bus->anonymous_auth = !!b; bus->anonymous_auth = !!b;
return 0; return 0;
@ -970,12 +921,9 @@ static int bus_start_fd(sd_bus *b) {
int sd_bus_start(sd_bus *bus) { int sd_bus_start(sd_bus *bus) {
int r; int r;
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(bus->state == BUS_UNSET, -EPERM);
if (bus->state != BUS_UNSET) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EPERM;
if (bus_pid_changed(bus))
return -ECHILD;
bus->state = BUS_OPENING; bus->state = BUS_OPENING;
@ -1000,8 +948,7 @@ int sd_bus_open_system(sd_bus **ret) {
sd_bus *b; sd_bus *b;
int r; int r;
if (!ret) assert_return(ret, -EINVAL);
return -EINVAL;
r = sd_bus_new(&b); r = sd_bus_new(&b);
if (r < 0) if (r < 0)
@ -1038,8 +985,7 @@ int sd_bus_open_user(sd_bus **ret) {
size_t l; size_t l;
int r; int r;
if (!ret) assert_return(ret, -EINVAL);
return -EINVAL;
r = sd_bus_new(&b); r = sd_bus_new(&b);
if (r < 0) if (r < 0)
@ -1122,10 +1068,9 @@ sd_bus *sd_bus_unref(sd_bus *bus) {
} }
int sd_bus_is_open(sd_bus *bus) { int sd_bus_is_open(sd_bus *bus) {
if (!bus)
return -EINVAL; assert_return(bus, -EINVAL);
if (bus_pid_changed(bus)) assert_return(!bus_pid_changed(bus), -ECHILD);
return -ECHILD;
return BUS_IS_OPEN(bus->state); return BUS_IS_OPEN(bus->state);
} }
@ -1133,12 +1078,9 @@ int sd_bus_is_open(sd_bus *bus) {
int sd_bus_can_send(sd_bus *bus, char type) { int sd_bus_can_send(sd_bus *bus, char type) {
int r; int r;
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(bus->state != BUS_UNSET, -ENOTCONN);
if (bus->state == BUS_UNSET) assert_return(!bus_pid_changed(bus), -ECHILD);
return -ENOTCONN;
if (bus_pid_changed(bus))
return -ECHILD;
if (type == SD_BUS_TYPE_UNIX_FD) { if (type == SD_BUS_TYPE_UNIX_FD) {
if (!(bus->hello_flags & KDBUS_HELLO_ACCEPT_FD)) if (!(bus->hello_flags & KDBUS_HELLO_ACCEPT_FD))
@ -1157,12 +1099,9 @@ int sd_bus_can_send(sd_bus *bus, char type) {
int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *server_id) { int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *server_id) {
int r; int r;
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(server_id, -EINVAL);
if (!server_id) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EINVAL;
if (bus_pid_changed(bus))
return -ECHILD;
r = bus_ensure_running(bus); r = bus_ensure_running(bus);
if (r < 0) if (r < 0)
@ -1267,14 +1206,10 @@ static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) {
int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) {
int r; int r;
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
if (!BUS_IS_OPEN(bus->state)) assert_return(m, -EINVAL);
return -ENOTCONN; assert_return(!bus_pid_changed(bus), -ECHILD);
if (!m)
return -EINVAL;
if (bus_pid_changed(bus))
return -ECHILD;
if (m->n_fds > 0) { if (m->n_fds > 0) {
r = sd_bus_can_send(bus, SD_BUS_TYPE_UNIX_FD); r = sd_bus_can_send(bus, SD_BUS_TYPE_UNIX_FD);
@ -1380,20 +1315,13 @@ int sd_bus_send_with_reply(
struct reply_callback *c; struct reply_callback *c;
int r; int r;
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
if (!BUS_IS_OPEN(bus->state)) assert_return(m, -EINVAL);
return -ENOTCONN; assert_return(m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL, -EINVAL);
if (!m) assert_return(!(m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED), -EINVAL);
return -EINVAL; assert_return(callback, -EINVAL);
if (!callback) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EINVAL;
if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
return -EINVAL;
if (m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
return -EINVAL;
if (bus_pid_changed(bus))
return -ECHILD;
r = hashmap_ensure_allocated(&bus->reply_callbacks, uint64_hash_func, uint64_compare_func); r = hashmap_ensure_allocated(&bus->reply_callbacks, uint64_hash_func, uint64_compare_func);
if (r < 0) if (r < 0)
@ -1445,12 +1373,9 @@ int sd_bus_send_with_reply(
int sd_bus_send_with_reply_cancel(sd_bus *bus, uint64_t serial) { int sd_bus_send_with_reply_cancel(sd_bus *bus, uint64_t serial) {
struct reply_callback *c; struct reply_callback *c;
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(serial != 0, -EINVAL);
if (serial == 0) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EINVAL;
if (bus_pid_changed(bus))
return -ECHILD;
c = hashmap_remove(bus->reply_callbacks, &serial); c = hashmap_remove(bus->reply_callbacks, &serial);
if (!c) if (!c)
@ -1500,20 +1425,13 @@ int sd_bus_send_with_reply_and_block(
uint64_t serial; uint64_t serial;
bool room = false; bool room = false;
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
if (!BUS_IS_OPEN(bus->state)) assert_return(m, -EINVAL);
return -ENOTCONN; assert_return(m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL, -EINVAL);
if (!m) assert_return(!(m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED), -EINVAL);
return -EINVAL; assert_return(!bus_error_is_dirty(error), -EINVAL);
if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EINVAL;
if (m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
return -EINVAL;
if (bus_error_is_dirty(error))
return -EINVAL;
if (bus_pid_changed(bus))
return -ECHILD;
r = bus_ensure_running(bus); r = bus_ensure_running(bus);
if (r < 0) if (r < 0)
@ -1618,14 +1536,11 @@ int sd_bus_send_with_reply_and_block(
} }
int sd_bus_get_fd(sd_bus *bus) { int sd_bus_get_fd(sd_bus *bus) {
if (!bus)
return -EINVAL; assert_return(bus, -EINVAL);
if (!BUS_IS_OPEN(bus->state)) assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
return -ENOTCONN; assert_return(bus->input_fd == bus->output_fd, -EPERM);
if (bus->input_fd != bus->output_fd) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EPERM;
if (bus_pid_changed(bus))
return -ECHILD;
return bus->input_fd; return bus->input_fd;
} }
@ -1633,12 +1548,9 @@ int sd_bus_get_fd(sd_bus *bus) {
int sd_bus_get_events(sd_bus *bus) { int sd_bus_get_events(sd_bus *bus) {
int flags = 0; int flags = 0;
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
if (!BUS_IS_OPEN(bus->state)) assert_return(!bus_pid_changed(bus), -ECHILD);
return -ENOTCONN;
if (bus_pid_changed(bus))
return -ECHILD;
if (bus->state == BUS_OPENING) if (bus->state == BUS_OPENING)
flags |= POLLOUT; flags |= POLLOUT;
@ -1662,14 +1574,10 @@ int sd_bus_get_events(sd_bus *bus) {
int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) { int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) {
struct reply_callback *c; struct reply_callback *c;
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(timeout_usec, -EINVAL);
if (!timeout_usec) assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
return -EINVAL; assert_return(!bus_pid_changed(bus), -ECHILD);
if (!BUS_IS_OPEN(bus->state))
return -ENOTCONN;
if (bus_pid_changed(bus))
return -ECHILD;
if (bus->state == BUS_AUTHENTICATING) { if (bus->state == BUS_AUTHENTICATING) {
*timeout_usec = bus->auth_timeout; *timeout_usec = bus->auth_timeout;
@ -1969,14 +1877,11 @@ int sd_bus_process(sd_bus *bus, sd_bus_message **ret) {
* time. Returns > 0 when we did something, which possibly * time. Returns > 0 when we did something, which possibly
* means *ret is filled in with an unprocessed message. */ * means *ret is filled in with an unprocessed message. */
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(!bus_pid_changed(bus), -ECHILD);
if (bus_pid_changed(bus))
return -ECHILD;
/* We don't allow recursively invoking sd_bus_process(). */ /* We don't allow recursively invoking sd_bus_process(). */
if (bus->processing) assert_return(!bus->processing, -EBUSY);
return -EBUSY;
switch (bus->state) { switch (bus->state) {
@ -2021,9 +1926,7 @@ static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) {
usec_t until, m; usec_t until, m;
assert(bus); assert(bus);
assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
if (!BUS_IS_OPEN(bus->state))
return -ENOTCONN;
e = sd_bus_get_events(bus); e = sd_bus_get_events(bus);
if (e < 0) if (e < 0)
@ -2066,12 +1969,9 @@ static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) {
int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) { int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) {
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
if (!BUS_IS_OPEN(bus->state)) assert_return(!bus_pid_changed(bus), -ECHILD);
return -ENOTCONN;
if (bus_pid_changed(bus))
return -ECHILD;
if (bus->rqueue_size > 0) if (bus->rqueue_size > 0)
return 0; return 0;
@ -2082,12 +1982,9 @@ int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) {
int sd_bus_flush(sd_bus *bus) { int sd_bus_flush(sd_bus *bus) {
int r; int r;
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
if (!BUS_IS_OPEN(bus->state)) assert_return(!bus_pid_changed(bus), -ECHILD);
return -ENOTCONN;
if (bus_pid_changed(bus))
return -ECHILD;
r = bus_ensure_running(bus); r = bus_ensure_running(bus);
if (r < 0) if (r < 0)
@ -2113,12 +2010,9 @@ int sd_bus_flush(sd_bus *bus) {
int sd_bus_add_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *userdata) { int sd_bus_add_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *userdata) {
struct filter_callback *f; struct filter_callback *f;
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(callback, -EINVAL);
if (!callback) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EINVAL;
if (bus_pid_changed(bus))
return -ECHILD;
f = new0(struct filter_callback, 1); f = new0(struct filter_callback, 1);
if (!f) if (!f)
@ -2134,12 +2028,9 @@ int sd_bus_add_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *user
int sd_bus_remove_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *userdata) { int sd_bus_remove_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *userdata) {
struct filter_callback *f; struct filter_callback *f;
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(callback, -EINVAL);
if (!callback) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EINVAL;
if (bus_pid_changed(bus))
return -ECHILD;
LIST_FOREACH(callbacks, f, bus->filter_callbacks) { LIST_FOREACH(callbacks, f, bus->filter_callbacks) {
if (f->callback == callback && f->userdata == userdata) { if (f->callback == callback && f->userdata == userdata) {
@ -2159,12 +2050,9 @@ int sd_bus_add_match(sd_bus *bus, const char *match, sd_bus_message_handler_t ca
uint64_t cookie = 0; uint64_t cookie = 0;
int r = 0; int r = 0;
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(match, -EINVAL);
if (!match) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EINVAL;
if (bus_pid_changed(bus))
return -ECHILD;
r = bus_match_parse(match, &components, &n_components); r = bus_match_parse(match, &components, &n_components);
if (r < 0) if (r < 0)
@ -2196,12 +2084,9 @@ int sd_bus_remove_match(sd_bus *bus, const char *match, sd_bus_message_handler_t
int r = 0, q = 0; int r = 0, q = 0;
uint64_t cookie = 0; uint64_t cookie = 0;
if (!bus) assert_return(bus, -EINVAL);
return -EINVAL; assert_return(match, -EINVAL);
if (!match) assert_return(!bus_pid_changed(bus), -ECHILD);
return -EINVAL;
if (bus_pid_changed(bus))
return -ECHILD;
r = bus_match_parse(match, &components, &n_components); r = bus_match_parse(match, &components, &n_components);
if (r < 0) if (r < 0)