diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-11-28 22:54:44 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-12-02 12:18:54 +0100 |
| commit | b07ec5a173f285c35661150764562fb78bb6fadd (patch) | |
| tree | 28fe94c8ff17b893ea5ddd7b0addb4e9b82ae471 /src/machine/machined-dbus.c | |
| parent | 87938c3bea13fe1a237303fd15c69a0249a96c18 (diff) | |
| download | systemd-b07ec5a173f285c35661150764562fb78bb6fadd.tar.gz | |
machine-image: introduce image_hash_ops and use it
Diffstat (limited to 'src/machine/machined-dbus.c')
| -rw-r--r-- | src/machine/machined-dbus.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c index 453ca30b64..ef1958d8b0 100644 --- a/src/machine/machined-dbus.c +++ b/src/machine/machined-dbus.c @@ -463,7 +463,7 @@ static int method_get_machine_os_release(sd_bus_message *message, void *userdata 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_(image_hashmap_freep) Hashmap *images = NULL; + _cleanup_hashmap_free_ Hashmap *images = NULL; Manager *m = userdata; Image *image; Iterator i; @@ -472,7 +472,7 @@ static int method_list_images(sd_bus_message *message, void *userdata, sd_bus_er assert(message); assert(m); - images = hashmap_new(&string_hash_ops); + images = hashmap_new(&image_hash_ops); if (!images) return -ENOMEM; @@ -740,7 +740,7 @@ static int method_clean_pool(sd_bus_message *message, void *userdata, sd_bus_err if (r < 0) return sd_bus_error_set_errnof(error, r, "Failed to fork(): %m"); if (r == 0) { - _cleanup_(image_hashmap_freep) Hashmap *images = NULL; + _cleanup_hashmap_free_ Hashmap *images = NULL; bool success = true; Image *image; Iterator i; @@ -748,7 +748,7 @@ static int method_clean_pool(sd_bus_message *message, void *userdata, sd_bus_err errno_pipe_fd[0] = safe_close(errno_pipe_fd[0]); - images = hashmap_new(&string_hash_ops); + images = hashmap_new(&image_hash_ops); if (!images) { r = -ENOMEM; goto child_fail; |