diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-01-06 19:55:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-06 19:55:29 +0100 |
| commit | 8b1ac00fa904a145957743f6c663f6645aeb7d6c (patch) | |
| tree | 50441167b9121ec1a5f1fc11d1d382d1249808b8 /src/systemctl | |
| parent | systemctl: have is-enabled return success for aliases when calling into pid1 too (diff) | |
| parent | string-util: use GREEDY_ALLOC_ROUND_UP() in strextend() (diff) | |
| download | systemd-8b1ac00fa904a145957743f6c663f6645aeb7d6c.tar.xz systemd-8b1ac00fa904a145957743f6c663f6645aeb7d6c.zip | |
Merge pull request #18150 from poettering/strextend-tweak
tree-wide: beef up strextend() a bit
Diffstat (limited to 'src/systemctl')
| -rw-r--r-- | src/systemctl/systemctl-show.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/systemctl/systemctl-show.c b/src/systemctl/systemctl-show.c index d5efecbe65..db3a3bd40a 100644 --- a/src/systemctl/systemctl-show.c +++ b/src/systemctl/systemctl-show.c @@ -1476,7 +1476,7 @@ static int print_property(const char *name, const char *expected_value, sd_bus_m if (in_addr_prefix_to_string(family, (union in_addr_union *) ap, prefixlen, &str) < 0) continue; - if (!strextend_with_separator(&addresses, " ", str, NULL)) + if (!strextend_with_separator(&addresses, " ", str)) return log_oom(); } @@ -1513,7 +1513,7 @@ static int print_property(const char *name, const char *expected_value, sd_bus_m rbind == MS_REC ? ":rbind" : "") < 0) return log_oom(); - if (!strextend_with_separator(&paths, " ", str, NULL)) + if (!strextend_with_separator(&paths, " ", str)) return log_oom(); } if (r < 0) @@ -1545,7 +1545,7 @@ static int print_property(const char *name, const char *expected_value, sd_bus_m if (asprintf(&str, "%s%s%s", target, isempty(option) ? "" : ":", strempty(option)) < 0) return log_oom(); - if (!strextend_with_separator(&paths, " ", str, NULL)) + if (!strextend_with_separator(&paths, " ", str)) return log_oom(); } if (r < 0) @@ -1593,7 +1593,7 @@ static int print_property(const char *name, const char *expected_value, sd_bus_m if (!utf8_is_valid(str)) continue; - if (!strextend_with_separator(&fields, " ", str, NULL)) + if (!strextend_with_separator(&fields, " ", str)) return log_oom(); } if (r < 0) @@ -1670,7 +1670,7 @@ static int print_property(const char *name, const char *expected_value, sd_bus_m if (r < 0) return r; - if (!strextend_with_separator(&paths, " ", str, NULL)) + if (!strextend_with_separator(&paths, " ", str)) return log_oom(); r = sd_bus_message_exit_container(m); |