chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
loopback-setup: correctly set flags and scope for ipv6 address
[elogind.git]
/
src
/
libsystemd-bus
/
test-bus-server.c
diff --git
a/src/libsystemd-bus/test-bus-server.c
b/src/libsystemd-bus/test-bus-server.c
index a9db1f410193f4e59066a69b55426b447a67fc63..0e65ee782a45bce38ccde6c00a52f3d65091f79e 100644
(file)
--- a/
src/libsystemd-bus/test-bus-server.c
+++ b/
src/libsystemd-bus/test-bus-server.c
@@
-88,7
+88,7
@@
static void *server(void *p) {
assert_se((sd_bus_can_send(bus, 'h') >= 1) == (c->server_negotiate_unix_fds && c->client_negotiate_unix_fds));
assert_se((sd_bus_can_send(bus, 'h') >= 1) == (c->server_negotiate_unix_fds && c->client_negotiate_unix_fds));
- r = sd_bus_message_new_method_return(
bus,
m, &reply);
+ r = sd_bus_message_new_method_return(m, &reply);
if (r < 0) {
log_error("Failed to allocate return: %s", strerror(-r));
goto fail;
if (r < 0) {
log_error("Failed to allocate return: %s", strerror(-r));
goto fail;
@@
-98,8
+98,8
@@
static void *server(void *p) {
} else if (sd_bus_message_is_method_call(m, NULL, NULL)) {
r = sd_bus_message_new_method_error(
} else if (sd_bus_message_is_method_call(m, NULL, NULL)) {
r = sd_bus_message_new_method_error(
-
bus,
m,
- &SD_BUS_ERROR_MAKE(SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method."),
+ m,
+ &SD_BUS_ERROR_MAKE
_CONST
(SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method."),
&reply);
if (r < 0) {
log_error("Failed to allocate return: %s", strerror(-r));
&reply);
if (r < 0) {
log_error("Failed to allocate return: %s", strerror(-r));