diff options
Diffstat (limited to 'src/systemctl/systemctl-util.c')
| -rw-r--r-- | src/systemctl/systemctl-util.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/systemctl/systemctl-util.c b/src/systemctl/systemctl-util.c index d1490c906d..99f1394bcf 100644 --- a/src/systemctl/systemctl-util.c +++ b/src/systemctl/systemctl-util.c @@ -158,7 +158,6 @@ int get_unit_list( _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL; _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL; - size_t size = c; int r; bool fallback = false; @@ -218,7 +217,7 @@ int get_unit_list( if (!output_show_unit(&u, fallback ? patterns : NULL)) continue; - if (!GREEDY_REALLOC(*unit_infos, size, c+1)) + if (!GREEDY_REALLOC(*unit_infos, c+1)) return log_oom(); (*unit_infos)[c++] = u; @@ -261,17 +260,16 @@ int expand_unit_names(sd_bus *bus, char **names, const char* suffix, char ***ret if (expanded) { _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL; _cleanup_free_ UnitInfo *unit_infos = NULL; - size_t allocated, n; + size_t n; r = get_unit_list(bus, NULL, globs, &unit_infos, 0, &reply); if (r < 0) return r; n = strv_length(mangled); - allocated = n + 1; for (int i = 0; i < r; i++) { - if (!GREEDY_REALLOC(mangled, allocated, n+2)) + if (!GREEDY_REALLOC(mangled, n+2)) return log_oom(); mangled[n] = strdup(unit_infos[i].id); |