continue;
}
- if (!object_path_is_valid(*k) && object_path_startswith(*k, prefix)) {
+ if (!object_path_is_valid(*k)){
free(*k);
r = -EINVAL;
continue;
}
+ if (!object_path_startswith(*k, prefix)) {
+ free(*k);
+ continue;
+ }
+
r = set_consume(s, *k);
}
LIST_FOREACH(siblings, i, n->child) {
char *t;
+ if (!object_path_startswith(i->path, prefix))
+ continue;
+
t = strdup(i->path);
if (!t)
return -ENOMEM;
return 1;
}
-int sd_bus_add_object(sd_bus *bus, const char *path, sd_bus_message_handler_t callback, void *userdata) {
+_public_ int sd_bus_add_object(sd_bus *bus,
+ const char *path,
+ sd_bus_message_handler_t callback,
+ void *userdata) {
+
return bus_add_object(bus, false, path, callback, userdata);
}
-int sd_bus_remove_object(sd_bus *bus, const char *path, sd_bus_message_handler_t callback, void *userdata) {
+_public_ int sd_bus_remove_object(sd_bus *bus,
+ const char *path,
+ sd_bus_message_handler_t callback,
+ void *userdata) {
+
return bus_remove_object(bus, false, path, callback, userdata);
}
-int sd_bus_add_fallback(sd_bus *bus, const char *prefix, sd_bus_message_handler_t callback, void *userdata) {
+_public_ int sd_bus_add_fallback(sd_bus *bus,
+ const char *prefix,
+ sd_bus_message_handler_t callback,
+ void *userdata) {
+
return bus_add_object(bus, true, prefix, callback, userdata);
}
-int sd_bus_remove_fallback(sd_bus *bus, const char *prefix, sd_bus_message_handler_t callback, void *userdata) {
+_public_ int sd_bus_remove_fallback(sd_bus *bus,
+ const char *prefix,
+ sd_bus_message_handler_t callback,
+ void *userdata) {
+
return bus_remove_object(bus, true, prefix, callback, userdata);
}
return 1;
}
-int sd_bus_add_object_vtable(
+_public_ int sd_bus_add_object_vtable(
sd_bus *bus,
const char *path,
const char *interface,
return add_object_vtable_internal(bus, path, interface, vtable, false, NULL, userdata);
}
-int sd_bus_remove_object_vtable(
+_public_ int sd_bus_remove_object_vtable(
sd_bus *bus,
const char *path,
const char *interface) {
return remove_object_vtable_internal(bus, path, interface, false);
}
-int sd_bus_add_fallback_vtable(
+_public_ int sd_bus_add_fallback_vtable(
sd_bus *bus,
const char *path,
const char *interface,
return add_object_vtable_internal(bus, path, interface, vtable, true, find, userdata);
}
-int sd_bus_remove_fallback_vtable(
+_public_ int sd_bus_remove_fallback_vtable(
sd_bus *bus,
const char *path,
const char *interface) {
return remove_object_vtable_internal(bus, path, interface, true);
}
-int sd_bus_add_node_enumerator(
+_public_ int sd_bus_add_node_enumerator(
sd_bus *bus,
const char *path,
sd_bus_node_enumerator_t callback,
return r;
}
-int sd_bus_remove_node_enumerator(
+_public_ int sd_bus_remove_node_enumerator(
sd_bus *bus,
const char *path,
sd_bus_node_enumerator_t callback,
return 1;
}
-int sd_bus_emit_properties_changed_strv(
+_public_ int sd_bus_emit_properties_changed_strv(
sd_bus *bus,
const char *path,
const char *interface,
return -ENOENT;
}
-int sd_bus_emit_properties_changed(
+_public_ int sd_bus_emit_properties_changed(
sd_bus *bus,
const char *path,
const char *interface,
return -ENOENT;
}
-int sd_bus_emit_interfaces_added_strv(sd_bus *bus, const char *path, char **interfaces) {
+_public_ int sd_bus_emit_interfaces_added_strv(sd_bus *bus, const char *path, char **interfaces) {
BUS_DONT_DESTROY(bus);
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
return sd_bus_send(bus, m, NULL);
}
-int sd_bus_emit_interfaces_added(sd_bus *bus, const char *path, const char *interface, ...) {
+_public_ int sd_bus_emit_interfaces_added(sd_bus *bus, const char *path, const char *interface, ...) {
char **interfaces;
assert_return(bus, -EINVAL);
return sd_bus_emit_interfaces_added_strv(bus, path, interfaces);
}
-int sd_bus_emit_interfaces_removed_strv(sd_bus *bus, const char *path, char **interfaces) {
+_public_ int sd_bus_emit_interfaces_removed_strv(sd_bus *bus, const char *path, char **interfaces) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL;
int r;
return sd_bus_send(bus, m, NULL);
}
-int sd_bus_emit_interfaces_removed(sd_bus *bus, const char *path, const char *interface, ...) {
+_public_ int sd_bus_emit_interfaces_removed(sd_bus *bus, const char *path, const char *interface, ...) {
char **interfaces;
assert_return(bus, -EINVAL);
return sd_bus_emit_interfaces_removed_strv(bus, path, interfaces);
}
-int sd_bus_add_object_manager(sd_bus *bus, const char *path) {
+_public_ int sd_bus_add_object_manager(sd_bus *bus, const char *path) {
struct node *n;
assert_return(bus, -EINVAL);
return 0;
}
-int sd_bus_remove_object_manager(sd_bus *bus, const char *path) {
+_public_ int sd_bus_remove_object_manager(sd_bus *bus, const char *path) {
struct node *n;
assert_return(bus, -EINVAL);