summaryrefslogtreecommitdiff
path: root/src/machine/machine-dbus.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-03-11 19:03:50 +0100
committerLennart Poettering <lennart@poettering.net>2014-03-11 19:03:50 +0100
commita6278b88305b237b02eabff0d870b57fe851822d (patch)
treed826e248d401a18f07c45cfc0832907e861a2877 /src/machine/machine-dbus.c
parent2be56ff1e49c8954a0899da701233acf053e95a4 (diff)
bus: replace sd_bus_label_{escape,unescape}() by new sd_bus_path_{encode,decode}()
The new calls work similarly, but enforce a that a common, fixed bus path prefix is used. This follows discussions with Simon McVittie on IRC that it should be a good idea to make sure that people don't use the escaping applied here too wildly as anything other than the last label of a bus path.
Diffstat (limited to 'src/machine/machine-dbus.c')
-rw-r--r--src/machine/machine-dbus.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index c9e3bb7c75..920c9956ae 100644
--- 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 "bus-label.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;
- e = sd_bus_label_unescape(p);
+ e = bus_label_unescape(p);
if (!e)
return -ENOMEM;
@@ -200,7 +201,7 @@ char *machine_bus_path(Machine *m) {
assert(m);
- e = sd_bus_label_escape(m->name);
+ e = bus_label_escape(m->name);
if (!e)
return NULL;