chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: rename default bus address constants, they aren't "paths" but "addresses"
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
sd-bus.c
diff --git
a/src/libsystemd/sd-bus/sd-bus.c
b/src/libsystemd/sd-bus/sd-bus.c
index 9ce6bfab8faf9adb4e6a90b9607c0cce2a5d69bf..70dabccf5db7878479250dc8190b5043146ddad2 100644
(file)
--- a/
src/libsystemd/sd-bus/sd-bus.c
+++ b/
src/libsystemd/sd-bus/sd-bus.c
@@
-1119,7
+1119,7
@@
int bus_set_address_system(sd_bus *b) {
if (e)
return sd_bus_set_address(b, e);
if (e)
return sd_bus_set_address(b, e);
- return sd_bus_set_address(b, DEFAULT_SYSTEM_BUS_
PATH
);
+ return sd_bus_set_address(b, DEFAULT_SYSTEM_BUS_
ADDRESS
);
}
_public_ int sd_bus_open_system(sd_bus **ret) {
}
_public_ int sd_bus_open_system(sd_bus **ret) {
@@
-1175,13
+1175,13
@@
int bus_set_address_user(sd_bus *b) {
return -ENOMEM;
#ifdef ENABLE_KDBUS
return -ENOMEM;
#ifdef ENABLE_KDBUS
- (void) asprintf(&b->address, KERNEL_USER_BUS_
FMT ";" UNIX_USER_BU
S_FMT, getuid(), ee);
+ (void) asprintf(&b->address, KERNEL_USER_BUS_
ADDRESS_FMT ";" UNIX_USER_BUS_ADDRES
S_FMT, getuid(), ee);
#else
#else
- (void) asprintf(&b->address, UNIX_USER_BUS_FMT, ee);
+ (void) asprintf(&b->address, UNIX_USER_BUS_
ADDRESS_
FMT, ee);
#endif
} else {
#ifdef ENABLE_KDBUS
#endif
} else {
#ifdef ENABLE_KDBUS
- (void) asprintf(&b->address, KERNEL_USER_BUS_FMT, getuid());
+ (void) asprintf(&b->address, KERNEL_USER_BUS_
ADDRESS_
FMT, getuid());
#else
return -ECONNREFUSED;
#endif
#else
return -ECONNREFUSED;
#endif