summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-11-28 16:05:43 +0100
committerLennart Poettering <lennart@poettering.net>2014-11-28 16:17:33 +0100
commite3afaf6b8e540d4c0dc5a7f0d5178ce29c1ac2a5 (patch)
tree1da3751b04d154d7474acc51895f7c54608a521a /src/shared
parent3acc1dafd14420872f7f13319260eeb5d62c2533 (diff)
sd-bus: rename default bus address constants, they aren't "paths" but "addresses"
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/def.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/shared/def.h b/src/shared/def.h
index 98e3e10fb6..96c45a6b72 100644
--- a/src/shared/def.h
+++ b/src/shared/def.h
@@ -61,17 +61,17 @@
"/usr/lib/kbd/keymaps/\0"
#endif
-#define UNIX_SYSTEM_BUS_PATH "unix:path=/var/run/dbus/system_bus_socket"
-#define KERNEL_SYSTEM_BUS_PATH "kernel:path=/sys/fs/kdbus/0-system/bus"
+#define UNIX_SYSTEM_BUS_ADDRESS "unix:path=/var/run/dbus/system_bus_socket"
+#define KERNEL_SYSTEM_BUS_ADDRESS "kernel:path=/sys/fs/kdbus/0-system/bus"
#ifdef ENABLE_KDBUS
-# define DEFAULT_SYSTEM_BUS_PATH KERNEL_SYSTEM_BUS_PATH ";" UNIX_SYSTEM_BUS_PATH
+# define DEFAULT_SYSTEM_BUS_ADDRESS KERNEL_SYSTEM_BUS_ADDRESS ";" UNIX_SYSTEM_BUS_ADDRESS
#else
-# define DEFAULT_SYSTEM_BUS_PATH UNIX_SYSTEM_BUS_PATH
+# define DEFAULT_SYSTEM_BUS_ADDRESS UNIX_SYSTEM_BUS_ADDRESS
#endif
-#define UNIX_USER_BUS_FMT "unix:path=%s/bus"
-#define KERNEL_USER_BUS_FMT "kernel:path=/sys/fs/kdbus/"UID_FMT"-user/bus"
+#define UNIX_USER_BUS_ADDRESS_FMT "unix:path=%s/bus"
+#define KERNEL_USER_BUS_ADDRESS_FMT "kernel:path=/sys/fs/kdbus/"UID_FMT"-user/bus"
#define PLYMOUTH_SOCKET { \
.un.sun_family = AF_UNIX, \