X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmachine%2Fmachine-dbus.c;h=f6fd9cf3611c5b9904bb14c9d5a4539f1c90f6a8;hp=163c73d451619e3859e7c30d756e1d4ce2785543;hb=ebeccf9eecf5939a2ef772c3160e89efcad96194;hpb=c2ce6a3d82b717c4c1e6245ad8c6ce1173f502d0 diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index 163c73d45..f6fd9cf36 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -32,7 +32,6 @@ #include "fileio.h" #include "in-addr-util.h" #include "local-addresses.h" -#include "image.h" #include "machine.h" static int property_get_id( @@ -476,11 +475,9 @@ char *machine_bus_path(Machine *m) { } int machine_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) { - _cleanup_(image_hashmap_freep) Hashmap *images = NULL; _cleanup_strv_free_ char **l = NULL; Machine *machine = NULL; Manager *m = userdata; - Image *image; Iterator i; int r; @@ -500,26 +497,6 @@ int machine_node_enumerator(sd_bus *bus, const char *path, void *userdata, char return r; } - images = hashmap_new(&string_hash_ops); - if (!images) - return -ENOMEM; - - r = image_discover(images); - if (r < 0) - return r; - - HASHMAP_FOREACH(image, images, i) { - char *p; - - p = image_bus_path(image->name); - if (!p) - return -ENOMEM; - - r = strv_consume(&l, p); - if (r < 0) - return r; - } - *nodes = l; l = NULL;