chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: introduce UID_INVALID (and friends) as macro for (uid_t) -1
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-util.c
diff --git
a/src/libsystemd/sd-bus/bus-util.c
b/src/libsystemd/sd-bus/bus-util.c
index 4b5c1a6d36b5463edaf0a363f38e1f9d09b57319..bdaa4494a1994a9c2122fb0df01936e877fedfab 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-util.c
+++ b/
src/libsystemd/sd-bus/bus-util.c
@@
-521,7
+521,7
@@
int bus_open_system_systemd(sd_bus **_bus) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_set_address(bus, KERNEL_SYSTEM_BUS_
PATH
);
+ r = sd_bus_set_address(bus, KERNEL_SYSTEM_BUS_
ADDRESS
);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-574,7
+574,7
@@
int bus_open_user_systemd(sd_bus **_bus) {
if (r < 0)
return r;
if (r < 0)
return r;
- if (asprintf(&bus->address, KERNEL_USER_BUS_FMT, getuid()) < 0)
+ if (asprintf(&bus->address, KERNEL_USER_BUS_
ADDRESS_
FMT, getuid()) < 0)
return -ENOMEM;
bus->bus_client = true;
return -ENOMEM;
bus->bus_client = true;
@@
-1263,13
+1263,11
@@
int bus_property_get_ulong(
#endif
int bus_log_parse_error(int r) {
#endif
int bus_log_parse_error(int r) {
- log_error_errno(-r, "Failed to parse bus message: %m");
- return r;
+ return log_error_errno(r, "Failed to parse bus message: %m");
}
int bus_log_create_error(int r) {
}
int bus_log_create_error(int r) {
- log_error_errno(-r, "Failed to create bus message: %m");
- return r;
+ return log_error_errno(r, "Failed to create bus message: %m");
}
int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
}
int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {