chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tree-wide: expose "p"-suffix unref calls in public APIs to make gcc cleanup easy
[elogind.git]
/
src
/
libelogind
/
sd-bus
/
bus-track.c
diff --git
a/src/libelogind/sd-bus/bus-track.c
b/src/libelogind/sd-bus/bus-track.c
index 5f6e0f8cc36fc70f4848924ca6c7019ee9be1ecb..5cd3af3b35391312ad6e4356542ceeb99287f6b4 100644
(file)
--- a/
src/libelogind/sd-bus/bus-track.c
+++ b/
src/libelogind/sd-bus/bus-track.c
@@
-112,7
+112,9
@@
_public_ int sd_bus_track_new(
}
_public_ sd_bus_track* sd_bus_track_ref(sd_bus_track *track) {
}
_public_ sd_bus_track* sd_bus_track_ref(sd_bus_track *track) {
- assert_return(track, NULL);
+
+ if (!track)
+ return NULL;
assert(track->n_ref > 0);
assert(track->n_ref > 0);
@@
-162,7
+164,7
@@
static int on_name_owner_changed(sd_bus_message *message, void *userdata, sd_bus
}
_public_ int sd_bus_track_add_name(sd_bus_track *track, const char *name) {
}
_public_ int sd_bus_track_add_name(sd_bus_track *track, const char *name) {
- _cleanup_
bus_slot_unref_
sd_bus_slot *slot = NULL;
+ _cleanup_
(sd_bus_slot_unrefp)
sd_bus_slot *slot = NULL;
_cleanup_free_ char *n = NULL;
const char *match;
int r;
_cleanup_free_ char *n = NULL;
const char *match;
int r;
@@
-208,7
+210,7
@@
_public_ int sd_bus_track_add_name(sd_bus_track *track, const char *name) {
}
_public_ int sd_bus_track_remove_name(sd_bus_track *track, const char *name) {
}
_public_ int sd_bus_track_remove_name(sd_bus_track *track, const char *name) {
- _cleanup_
bus_slot_unref_
sd_bus_slot *slot = NULL;
+ _cleanup_
(sd_bus_slot_unrefp)
sd_bus_slot *slot = NULL;
_cleanup_free_ char *n = NULL;
assert_return(name, -EINVAL);
_cleanup_free_ char *n = NULL;
assert_return(name, -EINVAL);