diff options
| author | David Tardon <dtardon@redhat.com> | 2022-08-09 14:35:15 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2022-09-13 08:13:27 +0200 |
| commit | 995340074e554b4bf4a0fdb0cb7436692c5a4ffd (patch) | |
| tree | ca3ee001db3e608ee80478f42fea9c3b409f1b7b /src/portable/portabled-bus.c | |
| parent | 6d64cb0625691e2b9eda8babe07ac8281f9467ee (diff) | |
| download | systemd-995340074e554b4bf4a0fdb0cb7436692c5a4ffd.tar.gz | |
tree-wide: use ASSERT_PTR more
Diffstat (limited to 'src/portable/portabled-bus.c')
| -rw-r--r-- | src/portable/portabled-bus.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/portable/portabled-bus.c b/src/portable/portabled-bus.c index 8f8a8fbdcf..be321b8f03 100644 --- a/src/portable/portabled-bus.c +++ b/src/portable/portabled-bus.c @@ -108,13 +108,12 @@ static int property_get_profiles( static int method_get_image(sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_free_ char *p = NULL; - Manager *m = userdata; + Manager *m = ASSERT_PTR(userdata); const char *name; Image *image; int r; assert(message); - assert(m); r = sd_bus_message_read(message, "s", &name); if (r < 0) @@ -134,12 +133,11 @@ static int method_get_image(sd_bus_message *message, void *userdata, sd_bus_erro static int method_list_images(sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL; _cleanup_hashmap_free_ Hashmap *images = NULL; - Manager *m = userdata; + Manager *m = ASSERT_PTR(userdata); Image *image; int r; assert(message); - assert(m); images = hashmap_new(&image_hash_ops); if (!images) @@ -276,13 +274,12 @@ static int method_detach_image(sd_bus_message *message, void *userdata, sd_bus_e _cleanup_strv_free_ char **extension_images = NULL; PortableChange *changes = NULL; PortableFlags flags = 0; - Manager *m = userdata; + Manager *m = ASSERT_PTR(userdata); size_t n_changes = 0; const char *name_or_path; int r; assert(message); - assert(m); /* Note that we do not redirect detaching to the image object here, because we want to allow that users can * detach already deleted images too, in case the user already deleted an image before properly detaching |