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

sd-bus: also allow setting descriptions on bus slots

This commit is contained in:
Lennart Poettering 2014-11-04 16:57:38 +01:00
parent f1f00dbb7f
commit 9cbfc66c62
4 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsystemd/libsystemd.sym.m4
View File

@ -223,6 +223,8 @@ global:
sd_bus_slot_get_bus;
sd_bus_slot_get_userdata;
sd_bus_slot_set_userdata;
sd_bus_slot_get_description;
sd_bus_slot_set_description;
sd_bus_slot_get_current_message;
sd_bus_message_new_signal;
sd_bus_message_new_method_call;

1
src/libsystemd/sd-bus/bus-internal.h
View File

@ -142,6 +142,7 @@ struct sd_bus_slot {
void *userdata;
BusSlotType type:5;
bool floating:1;
char *description;
LIST_FIELDS(sd_bus_slot, slots);

16
src/libsystemd/sd-bus/bus-slot.c
View File

@ -208,6 +208,7 @@ _public_ sd_bus_slot* sd_bus_slot_unref(sd_bus_slot *slot) {
}
bus_slot_disconnect(slot);
free(slot->description);
free(slot);
return NULL;
@ -265,3 +266,18 @@ _public_ void* sd_bus_slot_get_current_userdata(sd_bus_slot *slot) {
return slot->bus->current_userdata;
}
_public_ int sd_bus_slot_set_description(sd_bus_slot *slot, const char *description) {
assert_return(slot, -EINVAL);
return free_and_strdup(&slot->description, description);
}
_public_ int sd_bus_slot_get_description(sd_bus_slot *slot, char **description) {
assert_return(slot, -EINVAL);
assert_return(description, -EINVAL);
assert_return(slot->description, -ENXIO);
*description = slot->description;
return 0;
}

3
src/systemd/sd-bus.h
View File

@ -175,6 +175,9 @@ sd_bus* sd_bus_slot_get_bus(sd_bus_slot *slot);
void *sd_bus_slot_get_userdata(sd_bus_slot *slot);
void *sd_bus_slot_set_userdata(sd_bus_slot *slot, void *userdata);
int sd_bus_slot_set_description(sd_bus_slot *slot, const char *description);
int sd_bus_slot_get_description(sd_bus_slot *slot, char **description);
sd_bus_message* sd_bus_slot_get_current_message(sd_bus_slot *slot);
sd_bus_message_handler_t sd_bus_slot_get_current_handler(sd_bus_slot *bus);
void *sd_bus_slot_get_current_userdata(sd_bus_slot *slot);