diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-05-24 13:39:25 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-05-25 11:09:21 +0200 |
| commit | 5453a4b1a85fbe2029798e0ab990702626510333 (patch) | |
| tree | f7e90184d305882a997661de98367a17937a8a44 /src/shared | |
| parent | sd-bus: make name validation functions public (diff) | |
| download | systemd-5453a4b1a85fbe2029798e0ab990702626510333.tar.xz systemd-5453a4b1a85fbe2029798e0ab990702626510333.zip | |
tree-wide: use public sd-bus functions in more places
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/bus-util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 379aecf730..a61f8e70da 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -1156,7 +1156,7 @@ int bus_path_encode_unique(sd_bus *b, const char *prefix, const char *sender_id, int r; assert_return(b || (sender_id && external_id), -EINVAL); - assert_return(object_path_is_valid(prefix), -EINVAL); + assert_return(sd_bus_object_path_is_valid(prefix), -EINVAL); assert_return(ret_path, -EINVAL); if (!sender_id) { @@ -1208,8 +1208,8 @@ int bus_path_decode_unique(const char *path, const char *prefix, char **ret_send const char *p, *q; char *sender, *external; - assert(object_path_is_valid(path)); - assert(object_path_is_valid(prefix)); + assert(sd_bus_object_path_is_valid(path)); + assert(sd_bus_object_path_is_valid(prefix)); assert(ret_sender); assert(ret_external); @@ -1670,7 +1670,7 @@ int bus_introspect_implementations( } struct introspect intro = {}; - bool is_interface = interface_name_is_valid(pattern); + bool is_interface = sd_bus_interface_name_is_valid(pattern); impl = find_implementation(pattern, bus_objects); if (!impl) |