return 1;
}
-int bus_connect_system_systemd(sd_bus **_bus) {
+int bus_connect_system_systemd(sd_bus **ret_bus) {
_cleanup_(sd_bus_close_unrefp) sd_bus *bus = NULL;
int r;
- assert(_bus);
+ assert(ret_bus);
if (geteuid() != 0)
- return sd_bus_default_system(_bus);
+ return sd_bus_default_system(ret_bus);
/* If we are root then let's talk directly to the system
* instance, instead of going via the bus */
r = sd_bus_start(bus);
if (r < 0)
- return sd_bus_default_system(_bus);
+ return sd_bus_default_system(ret_bus);
r = bus_check_peercred(bus);
if (r < 0)
return r;
- *_bus = TAKE_PTR(bus);
-
+ *ret_bus = TAKE_PTR(bus);
return 0;
}
-int bus_connect_user_systemd(sd_bus **_bus) {
+int bus_connect_user_systemd(sd_bus **ret_bus) {
_cleanup_(sd_bus_close_unrefp) sd_bus *bus = NULL;
_cleanup_free_ char *ee = NULL;
const char *e;
int r;
- assert(_bus);
+ assert(ret_bus);
e = secure_getenv("XDG_RUNTIME_DIR");
if (!e)
- return sd_bus_default_user(_bus);
+ return sd_bus_default_user(ret_bus);
ee = bus_address_escape(e);
if (!ee)
r = sd_bus_start(bus);
if (r < 0)
- return sd_bus_default_user(_bus);
+ return sd_bus_default_user(ret_bus);
r = bus_check_peercred(bus);
if (r < 0)
return r;
- *_bus = TAKE_PTR(bus);
-
+ *ret_bus = TAKE_PTR(bus);
return 0;
}