diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-03-28 20:37:27 +0900 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-03-28 13:37:27 +0200 |
| commit | a7e4861c7471bfe563078d11acbcecbf2d755462 (patch) | |
| tree | 4f66f511af7e783ef753cd4b8acc8b382d99697e /src/systemctl | |
| parent | 6f7729c1767998110c4460c85c94435c5782a613 (diff) | |
| download | systemd-a7e4861c7471bfe563078d11acbcecbf2d755462.tar.gz | |
bus-util: add flags for bus_map_all_properties() (#8546)
This adds flags BUS_MAP_STRDUP and BUS_MAP_BOOLEAN_AS_BOOL.
If BUS_MAP_STRDUP is set, then each "s" message is duplicated.
If BUS_MAP_BOOLEAN_AS_BOOL is set, then each "b" message is
written to a bool pointer.
Follow-up for #8488.
See https://github.com/systemd/systemd/pull/8488#discussion_r175816270.
Diffstat (limited to 'src/systemctl')
| -rw-r--r-- | src/systemctl/systemctl.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index d23bddc99a..42fbb35541 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -1686,6 +1686,7 @@ static int list_dependencies_get_dependencies(sd_bus *bus, const char *name, cha "org.freedesktop.systemd1", path, map[arg_dependency], + 0, &error, NULL, &info); @@ -1892,7 +1893,15 @@ static int get_machine_properties(sd_bus *bus, struct machine_info *mi) { bus = container; } - r = bus_map_all_properties(bus, "org.freedesktop.systemd1", "/org/freedesktop/systemd1", machine_info_property_map, NULL, NULL, mi); + r = bus_map_all_properties( + bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + machine_info_property_map, + BUS_MAP_STRDUP, + NULL, + NULL, + mi); if (r < 0) return r; @@ -5018,6 +5027,7 @@ static int show_one( "org.freedesktop.systemd1", path, show_mode == SYSTEMCTL_SHOW_STATUS ? status_map : property_map, + BUS_MAP_BOOLEAN_AS_BOOL, &error, &reply, &info); @@ -5151,7 +5161,15 @@ static int show_system_status(sd_bus *bus) { if (!hn) return log_oom(); - r = bus_map_all_properties(bus, "org.freedesktop.systemd1", "/org/freedesktop/systemd1", machine_info_property_map, &error, NULL, &mi); + r = bus_map_all_properties( + bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + machine_info_property_map, + BUS_MAP_STRDUP, + &error, + NULL, + &mi); if (r < 0) return log_error_errno(r, "Failed to read server status: %s", bus_error_message(&error, r)); @@ -6090,7 +6108,7 @@ static int unit_exists(LookupPaths *lp, const char *unit) { if (r < 0) return r; - r = bus_map_all_properties(bus, "org.freedesktop.systemd1", path, property_map, &error, &m, &info); + r = bus_map_all_properties(bus, "org.freedesktop.systemd1", path, property_map, 0, &error, &m, &info); if (r < 0) return log_error_errno(r, "Failed to get properties: %s", bus_error_message(&error, r)); |