along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <assert.h>
#include <stdlib.h>
#include <pthread.h>
#include <unistd.h>
static int object_callback(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
int r;
- assert(bus);
+ assert_se(bus);
if (sd_bus_message_is_method_error(m, NULL))
return 0;
log_info("Invoked Foobar() on %s", sd_bus_message_get_path(m));
r = sd_bus_reply_method_return(m, NULL);
- if (r < 0) {
- log_error_errno(r, "Failed to send reply: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to send reply: %m");
return 1;
}
int r;
const char *unique;
- assert(_bus);
+ assert_se(_bus);
r = sd_bus_open_user(&bus);
if (r < 0) {
goto fail;
}
- r = sd_bus_get_owner_id(bus, &id);
+ r = sd_bus_get_bus_id(bus, &id);
if (r < 0) {
log_error_errno(r, "Failed to get server ID: %m");
goto fail;
log_info("Received fd=%d", fd);
if (write(fd, &x, 1) < 0) {
- log_error("Failed to write to fd: %m");
+ log_error_errno(errno, "Failed to write to fd: %m");
safe_close(fd);
goto fail;
}
goto finish;
}
- assert(streq(hello, "hello"));
+ assert_se(streq(hello, "hello"));
if (pipe2(pp, O_CLOEXEC|O_NONBLOCK) < 0) {
- log_error("Failed to allocate pipe: %m");
+ log_error_errno(errno, "Failed to allocate pipe: %m");
r = -errno;
goto finish;
}