chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v229: Remove remaining emacs settings [3/6] src/libelogind
[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 f8b7cfada004fbc1b6ff5ee1e59fa03cf4a5f6a3..ea26d502859ae8361227ce6ff06dc3d2f23b2eb5 100644
(file)
--- a/
src/libelogind/sd-bus/bus-track.c
+++ b/
src/libelogind/sd-bus/bus-track.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-112,7
+110,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
+162,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
+208,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);
@@
-320,8
+320,7
@@
void bus_track_dispatch(sd_bus_track *track) {
sd_bus_track_unref(track);
}
sd_bus_track_unref(track);
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
_public_ void *sd_bus_track_get_userdata(sd_bus_track *track) {
assert_return(track, NULL);
_public_ void *sd_bus_track_get_userdata(sd_bus_track *track) {
assert_return(track, NULL);