diff options
| author | Luca Boccassi <luca.boccassi@microsoft.com> | 2021-10-27 11:17:02 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-11-10 15:01:30 +0100 |
| commit | 1f332abc9f82c653d40e5f3e42b761dca88d31ed (patch) | |
| tree | 15a6256c3121e908d6c988fae9b927301c5d9a53 | |
| parent | c4967b69610a75375cdcaafc9a9816ffddaeec38 (diff) | |
| download | systemd-1f332abc9f82c653d40e5f3e42b761dca88d31ed.tar.gz | |
systemctl: small fixes for MountImages pretty printing
(cherry picked from commit 8ec6108c0bdb5ab2e05bc20ab41ad6653805fd00)
| -rw-r--r-- | src/systemctl/systemctl-show.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/systemctl/systemctl-show.c b/src/systemctl/systemctl-show.c index 3bc9fd4920..290a501c52 100644 --- a/src/systemctl/systemctl-show.c +++ b/src/systemctl/systemctl-show.c @@ -1649,11 +1649,13 @@ static int print_property(const char *name, const char *expected_value, sd_bus_m r = sd_bus_message_enter_container(m, 'r', "ssba(ss)"); if (r < 0) - return r; + return bus_log_parse_error(r); + if (r == 0) + break; r = sd_bus_message_read(m, "ssb", &source, &destination, &ignore_enoent); - if (r <= 0) - break; + if (r < 0) + return bus_log_parse_error(r); str = strjoin(ignore_enoent ? "-" : "", source, @@ -1664,27 +1666,25 @@ static int print_property(const char *name, const char *expected_value, sd_bus_m r = sd_bus_message_enter_container(m, 'a', "(ss)"); if (r < 0) - return r; + return bus_log_parse_error(r); while ((r = sd_bus_message_read(m, "(ss)", &partition, &mount_options)) > 0) - if (!strextend_with_separator(&str, ":", partition, ":", mount_options)) + if (!strextend_with_separator(&str, ":", partition, mount_options)) return log_oom(); if (r < 0) - return r; + return bus_log_parse_error(r); if (!strextend_with_separator(&paths, " ", str)) return log_oom(); r = sd_bus_message_exit_container(m); if (r < 0) - return r; + return bus_log_parse_error(r); r = sd_bus_message_exit_container(m); if (r < 0) - return r; + return bus_log_parse_error(r); } - if (r < 0) - return bus_log_parse_error(r); r = sd_bus_message_exit_container(m); if (r < 0) |