summaryrefslogtreecommitdiff
path: root/src/portable
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2023-03-28 13:39:04 +0200
committerDavid Tardon <dtardon@redhat.com>2023-04-11 16:32:47 +0200
commita5290effe8cc8fef9793d3371a430f11d6dc39e1 (patch)
treea27da8e57f3e8348775eee0ad8f63bc9fa162116 /src/portable
parent2b4b01b00ac9d0a5940316fa24cb7cd12fc3e757 (diff)
downloadsystemd-a5290effe8cc8fef9793d3371a430f11d6dc39e1.tar.gz
portabled-image-bus: use CLEANUP_ARRAY
Diffstat (limited to 'src/portable')
-rw-r--r--src/portable/portabled-image-bus.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c
index 1aec2783f1..45dd4ec5ee 100644
--- a/src/portable/portabled-image-bus.c
+++ b/src/portable/portabled-image-bus.c
@@ -416,6 +416,8 @@ static int bus_image_method_detach(
assert(message);
+ CLEANUP_ARRAY(changes, n_changes, portable_changes_free);
+
if (sd_bus_message_is_method_call(message, NULL, "DetachWithExtensions")) {
r = sd_bus_message_read_strv(message, &extension_images);
if (r < 0)
@@ -468,13 +470,9 @@ static int bus_image_method_detach(
&n_changes,
error);
if (r < 0)
- goto finish;
-
- r = reply_portable_changes(message, changes, n_changes);
+ return r;
-finish:
- portable_changes_free(changes, n_changes);
- return r;
+ return reply_portable_changes(message, changes, n_changes);
}
int bus_image_common_remove(