chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
event: make gcc shut up
[elogind.git]
/
src
/
libsystemd-bus
/
test-bus-chat.c
diff --git
a/src/libsystemd-bus/test-bus-chat.c
b/src/libsystemd-bus/test-bus-chat.c
index 8c344f6edbf72c65f381785405362edf1b43d1c4..021379f0b0dadb54fa8842e3c36160a4ce867910 100644
(file)
--- a/
src/libsystemd-bus/test-bus-chat.c
+++ b/
src/libsystemd-bus/test-bus-chat.c
@@
-36,12
+36,12
@@
#include "bus-internal.h"
#include "bus-util.h"
#include "bus-internal.h"
#include "bus-util.h"
-static int match_callback(sd_bus *bus, sd_bus_message *m, void *userdata) {
+static int match_callback(sd_bus *bus, sd_bus_message *m, void *userdata
, sd_bus_error *ret_error
) {
log_info("Match triggered! interface=%s member=%s", strna(sd_bus_message_get_interface(m)), strna(sd_bus_message_get_member(m)));
return 0;
}
log_info("Match triggered! interface=%s member=%s", strna(sd_bus_message_get_interface(m)), strna(sd_bus_message_get_member(m)));
return 0;
}
-static int object_callback(sd_bus *bus, sd_bus_message *m, void *userdata) {
+static int object_callback(sd_bus *bus, sd_bus_message *m, void *userdata
, sd_bus_error *ret_error
) {
int r;
assert(bus);
int r;
assert(bus);
@@
-158,8
+158,8
@@
static int server(sd_bus *bus) {
if (!m)
continue;
if (!m)
continue;
- sd_bus_
message_get_pid(m
, &pid);
- sd_bus_
message_get_selinux_context(m
, &label);
+ 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",
strna(sd_bus_message_get_member(m)),
(unsigned long) pid,
log_info("Got message! member=%s pid=%lu label=%s",
strna(sd_bus_message_get_member(m)),
(unsigned long) pid,
@@
-246,7
+246,7
@@
static int server(sd_bus *bus) {
r = sd_bus_reply_method_error(
m,
r = sd_bus_reply_method_error(
m,
- &SD_BUS_ERROR_MAKE(SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method."));
+ &SD_BUS_ERROR_MAKE
_CONST
(SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method."));
if (r < 0) {
log_error("Failed to send reply: %s", strerror(-r));
goto fail;
if (r < 0) {
log_error("Failed to send reply: %s", strerror(-r));
goto fail;
@@
-361,7
+361,7
@@
finish:
return INT_TO_PTR(r);
}
return INT_TO_PTR(r);
}
-static int quit_callback(sd_bus *b, sd_bus_message *m, void *userdata) {
+static int quit_callback(sd_bus *b, sd_bus_message *m, void *userdata
, sd_bus_error *ret_error
) {
bool *x = userdata;
log_error("Quit callback: %s", strerror(sd_bus_message_get_errno(m)));
bool *x = userdata;
log_error("Quit callback: %s", strerror(sd_bus_message_get_errno(m)));