diff options
author | Lennart Poettering <lennart@poettering.net> | 2014-12-19 20:43:18 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2014-12-19 20:43:18 +0100 |
commit | ebeccf9eecf5939a2ef772c3160e89efcad96194 (patch) | |
tree | a6cff5de068842effcb0964cd85c09abbdf3c0ad /src/machine/machine-dbus.c | |
parent | c2ce6a3d82b717c4c1e6245ad8c6ce1173f502d0 (diff) |
machined: add a full bus object for images
Diffstat (limited to 'src/machine/machine-dbus.c')
-rw-r--r-- | src/machine/machine-dbus.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index 163c73d451..f6fd9cf361 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; |