chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: drop bus parameter from message callback prototype
[elogind.git]
/
src
/
libelogind
/
sd-bus
/
sd-bus.c
diff --git
a/src/libelogind/sd-bus/sd-bus.c
b/src/libelogind/sd-bus/sd-bus.c
index 2cb1aafa2b147914650bf6135413227682764100..a5ee6508949e97f7134a2259ed32f121826c9fbd 100644
(file)
--- a/
src/libelogind/sd-bus/sd-bus.c
+++ b/
src/libelogind/sd-bus/sd-bus.c
@@
-367,13
+367,15
@@
_public_ int sd_bus_get_allow_interactive_authorization(sd_bus *bus) {
return bus->allow_interactive_authorization;
}
return bus->allow_interactive_authorization;
}
-static int hello_callback(sd_bus
*bus, sd_bus
_message *reply, void *userdata, sd_bus_error *error) {
+static int hello_callback(sd_bus_message *reply, void *userdata, sd_bus_error *error) {
const char *s;
const char *s;
+ sd_bus *bus;
int r;
int r;
+ assert(reply);
+ bus = reply->bus;
assert(bus);
assert(bus->state == BUS_HELLO || bus->state == BUS_CLOSING);
assert(bus);
assert(bus->state == BUS_HELLO || bus->state == BUS_CLOSING);
- assert(reply);
r = sd_bus_message_get_errno(reply);
if (r > 0)
r = sd_bus_message_get_errno(reply);
if (r > 0)
@@
-1124,10
+1126,7
@@
_public_ int sd_bus_open(sd_bus **ret) {
e = secure_getenv("DBUS_STARTER_ADDRESS");
if (!e) {
e = secure_getenv("DBUS_STARTER_ADDRESS");
if (!e) {
- if (cg_pid_get_owner_uid(0, NULL) >= 0)
- return sd_bus_open_user(ret);
- else
- return sd_bus_open_system(ret);
+ return sd_bus_open_system(ret);
}
r = sd_bus_new(&b);
}
r = sd_bus_new(&b);
@@
-2193,7
+2192,7
@@
static int process_timeout(sd_bus *bus) {
bus->current_slot = sd_bus_slot_ref(slot);
bus->current_handler = c->callback;
bus->current_userdata = slot->userdata;
bus->current_slot = sd_bus_slot_ref(slot);
bus->current_handler = c->callback;
bus->current_userdata = slot->userdata;
- r = c->callback(
bus,
m, slot->userdata, &error_buffer);
+ r = c->callback(m, slot->userdata, &error_buffer);
bus->current_userdata = NULL;
bus->current_handler = NULL;
bus->current_slot = NULL;
bus->current_userdata = NULL;
bus->current_handler = NULL;
bus->current_slot = NULL;
@@
-2296,7
+2295,7
@@
static int process_reply(sd_bus *bus, sd_bus_message *m) {
bus->current_slot = sd_bus_slot_ref(slot);
bus->current_handler = c->callback;
bus->current_userdata = slot->userdata;
bus->current_slot = sd_bus_slot_ref(slot);
bus->current_handler = c->callback;
bus->current_userdata = slot->userdata;
- r = c->callback(
bus,
m, slot->userdata, &error_buffer);
+ r = c->callback(m, slot->userdata, &error_buffer);
bus->current_userdata = NULL;
bus->current_handler = NULL;
bus->current_slot = NULL;
bus->current_userdata = NULL;
bus->current_handler = NULL;
bus->current_slot = NULL;
@@
-2343,7
+2342,7
@@
static int process_filter(sd_bus *bus, sd_bus_message *m) {
bus->current_slot = sd_bus_slot_ref(slot);
bus->current_handler = l->callback;
bus->current_userdata = slot->userdata;
bus->current_slot = sd_bus_slot_ref(slot);
bus->current_handler = l->callback;
bus->current_userdata = slot->userdata;
- r = l->callback(
bus,
m, slot->userdata, &error_buffer);
+ r = l->callback(m, slot->userdata, &error_buffer);
bus->current_userdata = NULL;
bus->current_handler = NULL;
bus->current_slot = sd_bus_slot_unref(slot);
bus->current_userdata = NULL;
bus->current_handler = NULL;
bus->current_slot = sd_bus_slot_unref(slot);
@@
-2624,7
+2623,7
@@
static int process_closing(sd_bus *bus, sd_bus_message **ret) {
bus->current_slot = sd_bus_slot_ref(slot);
bus->current_handler = c->callback;
bus->current_userdata = slot->userdata;
bus->current_slot = sd_bus_slot_ref(slot);
bus->current_handler = c->callback;
bus->current_userdata = slot->userdata;
- r = c->callback(
bus,
m, slot->userdata, &error_buffer);
+ r = c->callback(m, slot->userdata, &error_buffer);
bus->current_userdata = NULL;
bus->current_handler = NULL;
bus->current_slot = NULL;
bus->current_userdata = NULL;
bus->current_handler = NULL;
bus->current_slot = NULL;
@@
-3327,10
+3326,7
@@
_public_ int sd_bus_default(sd_bus **ret) {
/* Finally, if nothing is set use the cached connection for
* the right scope */
/* Finally, if nothing is set use the cached connection for
* the right scope */
- if (cg_pid_get_owner_uid(0, NULL) >= 0)
- return sd_bus_default_user(ret);
- else
- return sd_bus_default_system(ret);
+ return sd_bus_default_system(ret);
}
_public_ int sd_bus_get_tid(sd_bus *b, pid_t *tid) {
}
_public_ int sd_bus_get_tid(sd_bus *b, pid_t *tid) {