chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: consider both fuse.glusterfs and glusterfs network file systems
[elogind.git]
/
src
/
machine
/
machine-dbus.c
diff --git
a/src/machine/machine-dbus.c
b/src/machine/machine-dbus.c
index df96ccf9d480c7acf7a226622cf39fc500c01eaf..920c9956aeeb953948c12be2cc7f5a350369620f 100644
(file)
--- a/
src/machine/machine-dbus.c
+++ b/
src/machine/machine-dbus.c
@@
-24,6
+24,7
@@
#include <sys/capability.h>
#include "bus-util.h"
#include <sys/capability.h>
#include "bus-util.h"
+#include "bus-label.h"
#include "strv.h"
#include "machine.h"
#include "strv.h"
#include "machine.h"
@@
-182,7
+183,7
@@
int machine_object_find(sd_bus *bus, const char *path, const char *interface, vo
if (!p)
return 0;
if (!p)
return 0;
- e =
sd_
bus_label_unescape(p);
+ e = bus_label_unescape(p);
if (!e)
return -ENOMEM;
if (!e)
return -ENOMEM;
@@
-200,7
+201,7
@@
char *machine_bus_path(Machine *m) {
assert(m);
assert(m);
- e =
sd_
bus_label_escape(m->name);
+ e = bus_label_escape(m->name);
if (!e)
return NULL;
if (!e)
return NULL;
@@
-225,11
+226,9
@@
int machine_node_enumerator(sd_bus *bus, const char *path, void *userdata, char
if (!p)
return -ENOMEM;
if (!p)
return -ENOMEM;
- r = strv_push(&l, p);
- if (r < 0) {
- free(p);
+ r = strv_consume(&l, p);
+ if (r < 0)
return r;
return r;
- }
}
*nodes = l;
}
*nodes = l;