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 v228: Condense elogind source masks (4/5)
[elogind.git]
/
src
/
libelogind
/
sd-bus
/
bus-slot.c
diff --git
a/src/libelogind/sd-bus/bus-slot.c
b/src/libelogind/sd-bus/bus-slot.c
index 8060e9882cccd9429945eb1f62ce606abe7d2cb6..970f179579af79e9edc9ece969645541e7487ce1 100644
(file)
--- a/
src/libelogind/sd-bus/bus-slot.c
+++ b/
src/libelogind/sd-bus/bus-slot.c
@@
-20,9
+20,12
@@
***/
#include "sd-bus.h"
***/
#include "sd-bus.h"
+
+#include "alloc-util.h"
#include "bus-control.h"
#include "bus-objects.h"
#include "bus-slot.h"
#include "bus-control.h"
#include "bus-objects.h"
#include "bus-slot.h"
+#include "string-util.h"
sd_bus_slot *bus_slot_allocate(
sd_bus *bus,
sd_bus_slot *bus_slot_allocate(
sd_bus *bus,
@@
-89,7
+92,7
@@
void bus_slot_disconnect(sd_bus_slot *slot) {
case BUS_MATCH_CALLBACK:
case BUS_MATCH_CALLBACK:
- if (slot->
bus->bus_client
)
+ if (slot->
match_added
)
bus_remove_match_internal(slot->bus, slot->match_callback.match_string, slot->match_callback.cookie);
slot->bus->match_callbacks_modified = true;
bus_remove_match_internal(slot->bus, slot->match_callback.match_string, slot->match_callback.cookie);
slot->bus->match_callbacks_modified = true;
@@
-214,6
+217,7
@@
_public_ sd_bus_slot* sd_bus_slot_unref(sd_bus_slot *slot) {
return NULL;
}
return NULL;
}
+#if 0 /// UNNEEDED by elogind
_public_ sd_bus* sd_bus_slot_get_bus(sd_bus_slot *slot) {
assert_return(slot, NULL);
_public_ sd_bus* sd_bus_slot_get_bus(sd_bus_slot *slot) {
assert_return(slot, NULL);
@@
-273,7
+277,7
@@
_public_ int sd_bus_slot_set_description(sd_bus_slot *slot, const char *descript
return free_and_strdup(&slot->description, description);
}
return free_and_strdup(&slot->description, description);
}
-_public_ int sd_bus_slot_get_description(sd_bus_slot *slot, char **description) {
+_public_ int sd_bus_slot_get_description(sd_bus_slot *slot, c
onst c
har **description) {
assert_return(slot, -EINVAL);
assert_return(description, -EINVAL);
assert_return(slot->description, -ENXIO);
assert_return(slot, -EINVAL);
assert_return(description, -EINVAL);
assert_return(slot->description, -ENXIO);
@@
-281,3
+285,4
@@
_public_ int sd_bus_slot_get_description(sd_bus_slot *slot, char **description)
*description = slot->description;
return 0;
}
*description = slot->description;
return 0;
}
+#endif // 0