goto fail;
}
- r = sd_bus_get_server_id(bus, &id);
+ r = sd_bus_get_owner_id(bus, &id);
if (r < 0) {
log_error("Failed to get server ID: %s", strerror(-r));
goto fail;
goto fail;
}
- r = sd_bus_add_fallback(bus, "/foo/bar", object_callback, NULL);
+ r = sd_bus_add_fallback(bus, NULL, "/foo/bar", object_callback, NULL);
if (r < 0) {
log_error("Failed to add object: %s", strerror(-r));
goto fail;
}
- r = sd_bus_add_match(bus, "type='signal',interface='foo.bar',member='Notify'", match_callback, NULL);
+ r = sd_bus_add_match(bus, NULL, "type='signal',interface='foo.bar',member='Notify'", match_callback, NULL);
if (r < 0) {
log_error("Failed to add match: %s", strerror(-r));
goto fail;
}
- r = sd_bus_add_match(bus, "type='signal',interface='org.freedesktop.DBus',member='NameOwnerChanged'", match_callback, NULL);
+ r = sd_bus_add_match(bus, NULL, "type='signal',interface='org.freedesktop.DBus',member='NameOwnerChanged'", match_callback, NULL);
if (r < 0) {
log_error("Failed to add match: %s", strerror(-r));
goto fail;
sd_bus_creds_get_pid(sd_bus_message_get_creds(m), &pid);
sd_bus_creds_get_selinux_context(sd_bus_message_get_creds(m), &label);
- log_info("Got message! member=%s pid=%lu label=%s",
+ log_info("Got message! member=%s pid="PID_FMT" label=%s",
strna(sd_bus_message_get_member(m)),
- (unsigned long) pid,
+ pid,
strna(label));
/* bus_message_dump(m); */
/* sd_bus_message_rewind(m, true); */
if (write(fd, &x, 1) < 0) {
log_error("Failed to write to fd: %m");
- close_nointr_nofail(fd);
+ safe_close(fd);
goto fail;
}
r = sd_bus_message_new_method_call(
bus,
+ &q,
"org.freedesktop.systemd.test",
"/",
"org.freedesktop.systemd.test",
- "ExitClient1",
- &q);
+ "ExitClient1");
if (r < 0)
log_error("Failed to allocate method call: %s", strerror(-r));
else
sd_bus_error_free(&error);
- close_pipe(pp);
+ safe_close_pair(pp);
return INT_TO_PTR(r);
}
r = sd_bus_message_new_method_call(
bus,
+ &m,
"org.freedesktop.systemd.test",
"/foo/bar/waldo/piep",
"org.object.test",
- "Foobar",
- &m);
+ "Foobar");
if (r < 0) {
log_error("Failed to allocate method call: %s", strerror(-r));
goto finish;
r = sd_bus_message_new_signal(
bus,
+ &m,
"/foobar",
"foo.bar",
- "Notify",
- &m);
+ "Notify");
if (r < 0) {
log_error("Failed to allocate signal: %s", strerror(-r));
goto finish;
r = sd_bus_message_new_method_call(
bus,
+ &m,
"org.freedesktop.systemd.test",
"/",
"org.freedesktop.DBus.Peer",
- "GetMachineId",
- &m);
+ "GetMachineId");
if (r < 0) {
log_error("Failed to allocate method call: %s", strerror(-r));
goto finish;
r = sd_bus_message_new_method_call(
bus,
+ &m,
"org.freedesktop.systemd.test",
"/",
"org.freedesktop.systemd.test",
- "Slow",
- &m);
+ "Slow");
if (r < 0) {
log_error("Failed to allocate method call: %s", strerror(-r));
goto finish;
r = sd_bus_message_new_method_call(
bus,
+ &m,
"org.freedesktop.systemd.test",
"/",
"org.freedesktop.systemd.test",
- "Slow",
- &m);
+ "Slow");
if (r < 0) {
log_error("Failed to allocate method call: %s", strerror(-r));
goto finish;
}
- r = sd_bus_call_async(bus, m, quit_callback, &quit, 200 * USEC_PER_MSEC, NULL);
+ r = sd_bus_call_async(bus, NULL, m, quit_callback, &quit, 200 * USEC_PER_MSEC);
if (r < 0) {
log_info("Failed to issue method call: %s", bus_error_message(&error, -r));
goto finish;
r = sd_bus_message_new_method_call(
bus,
+ &q,
"org.freedesktop.systemd.test",
"/",
"org.freedesktop.systemd.test",
- "ExitClient2",
- &q);
+ "ExitClient2");
if (r < 0) {
log_error("Failed to allocate method call: %s", strerror(-r));
goto finish;