shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-11 09:18:07 +03:00
Code

bus: when we _unref() a NULL pointer, don't use assert_return()

Browse Source 
We support unreffing NULL pointers just fine and we shouldn't pay the
_unlikely_() price for it, not get a debug message if we do, hence let's
not use assert_return() here.
This commit is contained in:
Lennart Poettering 2013-12-10 20:38:04 +00:00
parent c8fa3f6030
commit 5b1bc83f81
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsystemd-bus/bus-creds.c
View File

@ -72,7 +72,9 @@ _public_ sd_bus_creds *sd_bus_creds_ref(sd_bus_creds *c) {
} }
_public_ sd_bus_creds *sd_bus_creds_unref(sd_bus_creds *c) { _public_ sd_bus_creds *sd_bus_creds_unref(sd_bus_creds *c) {
assert_return(c, NULL);
if (!c)
return NULL;
if (c->allocated) { if (c->allocated) {
assert(c->n_ref > 0); assert(c->n_ref > 0);

4
src/libsystemd-bus/bus-message.c
View File

@ -791,7 +791,9 @@ _public_ sd_bus_message* sd_bus_message_ref(sd_bus_message *m) {
} }
_public_ sd_bus_message* sd_bus_message_unref(sd_bus_message *m) { _public_ sd_bus_message* sd_bus_message_unref(sd_bus_message *m) {
assert_return(m, NULL);
if (!m)
return NULL;
assert(m->n_ref > 0); assert(m->n_ref > 0);
m->n_ref--; m->n_ref--;

4
src/libsystemd-bus/sd-bus.c
View File

@ -1214,7 +1214,9 @@ _public_ sd_bus *sd_bus_ref(sd_bus *bus) {
} }
_public_ sd_bus *sd_bus_unref(sd_bus *bus) { _public_ sd_bus *sd_bus_unref(sd_bus *bus) {
assert_return(bus, NULL);
if (!bus)
return NULL;
if (REFCNT_DEC(bus->n_ref) <= 0) if (REFCNT_DEC(bus->n_ref) <= 0)
bus_free(bus); bus_free(bus);

8
src/libsystemd-bus/sd-event.c
View File

@ -384,7 +384,9 @@ _public_ sd_event* sd_event_ref(sd_event *e) {
} }
_public_ sd_event* sd_event_unref(sd_event *e) { _public_ sd_event* sd_event_unref(sd_event *e) {
assert_return(e, NULL);
if (!e)
return NULL;
assert(e->n_ref >= 1); assert(e->n_ref >= 1);
e->n_ref--; e->n_ref--;
@ -973,7 +975,9 @@ _public_ sd_event_source* sd_event_source_ref(sd_event_source *s) {
} }
_public_ sd_event_source* sd_event_source_unref(sd_event_source *s) { _public_ sd_event_source* sd_event_source_unref(sd_event_source *s) {
assert_return(s, NULL);
if (!s)
return NULL;
assert(s->n_ref >= 1); assert(s->n_ref >= 1);
s->n_ref--; s->n_ref--;