} Context;
static usec_t get_startup_time(Context *c) {
- usec_t t = 0;
- _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ usec_t t = 0;
int r;
assert(c);
- r = sd_bus_call_method(
+ r = sd_bus_get_property_trivial(
c->bus,
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
- "org.freedesktop.DBus.Properties",
- "Get",
- &error,
- &reply,
- "ss",
"org.freedesktop.systemd1.Manager",
- "UserspaceTimestamp");
+ "UserspaceTimestamp",
+ &error,
+ 't', &t);
if (r < 0) {
log_error("Failed to get timestamp: %s", bus_error_message(&error, -r));
- return t;
- }
-
- r = sd_bus_message_read(reply, "v", "t", &t);
- if (r < 0) {
- log_error("Failed to parse reply: %s", strerror(-r));
+ return 0;
}
return t;
assert(c);
for (i = 0; i < ELEMENTSOF(table); i++) {
- _cleanup_bus_message_unref_ sd_bus_message *reply1 = NULL, *reply2 = NULL;
- const char *path = NULL, *state;
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+ _cleanup_free_ char *state = NULL;
+ const char *path = NULL;
r = sd_bus_call_method(
c->bus,
"org.freedesktop.systemd1.Manager",
"LoadUnit",
&error,
- &reply1,
+ &reply,
"s", table[i].special);
if (r < 0) {
- log_error("Failed to get runlevel: %s", bus_error_message(&error, -r));
- if (r == -ENOMEM)
- return r;
- else
- continue;
+ log_warning("Failed to get runlevel: %s", bus_error_message(&error, -r));
+ continue;
}
- r = sd_bus_message_read(reply1, "o", &path);
- if (r < 0) {
- log_error("Failed to parse reply: %s", strerror(-r));
- return -EIO;
- }
+ r = sd_bus_message_read(reply, "o", &path);
+ if (r < 0)
+ return bus_log_parse_error(r);
- r = sd_bus_call_method(
+ r = sd_bus_get_property_string(
c->bus,
"org.freedesktop.systemd1",
path,
- "org.freedesktop.DBus.Properties",
- "Get",
+ "org.freedesktop.systemd1.Unit",
+ "ActiveState",
&error,
- &reply2,
- "ss", "org.freedesktop.systemd1.Unit", "ActiveState");
+ &state);
if (r < 0) {
- log_error("Failed to get state: %s", bus_error_message(&error, -r));
+ log_warning("Failed to get state: %s", bus_error_message(&error, -r));
return r;
}
- r = sd_bus_message_read(reply2, "v", "s", &state);
- if (r < 0) {
- log_error("Failed to parse reply: %s", strerror(-r));
- return -EIO;
- }
-
if (streq(state, "active") || streq(state, "reloading"))
return table[i].runlevel;
}
errno != EAFNOSUPPORT && errno != EPROTONOSUPPORT)
log_error("Failed to connect to audit log: %m");
#endif
- r = bus_connect_system(&c.bus);
+ r = bus_open_system_systemd(&c.bus);
if (r < 0) {
log_error("Failed to get D-Bus connection: %s", strerror(-r));
r = -EIO;