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
/
test-bus-chat.c
diff --git
a/src/libsystemd/sd-bus/test-bus-chat.c
b/src/libsystemd/sd-bus/test-bus-chat.c
index dfc54560afb0909cbbf82ced22314dd858938ec0..06edd621e4cfbbd973decb560cb17f53c944d5f8 100644
(file)
--- a/
src/libsystemd/sd-bus/test-bus-chat.c
+++ b/
src/libsystemd/sd-bus/test-bus-chat.c
@@
-53,10
+53,8
@@
static int object_callback(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu
log_info("Invoked Foobar() on %s", sd_bus_message_get_path(m));
r = sd_bus_reply_method_return(m, NULL);
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;
}
return 1;
}
@@
-78,7
+76,7
@@
static int server_init(sd_bus **_bus) {
goto fail;
}
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;
if (r < 0) {
log_error_errno(r, "Failed to get server ID: %m");
goto fail;
@@
-231,7
+229,7
@@
static int server(sd_bus *bus) {
log_info("Received fd=%d", fd);
if (write(fd, &x, 1) < 0) {
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;
}
safe_close(fd);
goto fail;
}
@@
-304,7
+302,7
@@
static void* client1(void*p) {
assert(streq(hello, "hello"));
if (pipe2(pp, O_CLOEXEC|O_NONBLOCK) < 0) {
assert(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;
}
r = -errno;
goto finish;
}