mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-27 01:55:32 +03:00
Merge pull request #532 from dvdhrm/bus-managed-root
sd-bus: include queried path in GetManagedObjects
This commit is contained in:
commit
0aa7a4c225
@ -1164,6 +1164,10 @@ static int process_get_managed_objects(
|
||||
if (bus->nodes_modified)
|
||||
return 0;
|
||||
|
||||
r = set_put_strdup(s, m->path);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = sd_bus_message_new_method_return(m, &reply);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
@ -115,14 +115,13 @@ static int set_handler(sd_bus *bus, const char *path, const char *interface, con
|
||||
|
||||
static int value_handler(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error) {
|
||||
_cleanup_free_ char *s = NULL;
|
||||
const char *x;
|
||||
int r;
|
||||
|
||||
assert_se(asprintf(&s, "object %p, path %s", userdata, path) >= 0);
|
||||
r = sd_bus_message_append(reply, "s", s);
|
||||
assert_se(r >= 0);
|
||||
|
||||
assert_se(x = startswith(path, "/value/"));
|
||||
assert_se(startswith(path, "/value/") != NULL || strcmp(path, "/value") == 0);
|
||||
|
||||
assert_se(PTR_TO_UINT(userdata) == 30);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user