chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: rework message handlers to always take an error argument
[elogind.git]
/
src
/
login
/
logind-seat-dbus.c
diff --git
a/src/login/logind-seat-dbus.c
b/src/login/logind-seat-dbus.c
index 53141a892eb64fa9de8703658e6de16bc4603720..488d007c7eaf0c59185c0cff81b2683da42d4cfd 100644
(file)
--- a/
src/login/logind-seat-dbus.c
+++ b/
src/login/logind-seat-dbus.c
@@
-35,8
+35,8
@@
static int property_get_active_session(
const char *interface,
const char *property,
sd_bus_message *reply,
const char *interface,
const char *property,
sd_bus_message *reply,
-
sd_bus_error *error
,
-
void *userdata
) {
+
void *userdata
,
+
sd_bus_error *error
) {
_cleanup_free_ char *p = NULL;
Seat *s = userdata;
_cleanup_free_ char *p = NULL;
Seat *s = userdata;
@@
-58,8
+58,8
@@
static int property_get_can_multi_session(
const char *interface,
const char *property,
sd_bus_message *reply,
const char *interface,
const char *property,
sd_bus_message *reply,
-
sd_bus_error *error
,
-
void *userdata
) {
+
void *userdata
,
+
sd_bus_error *error
) {
Seat *s = userdata;
Seat *s = userdata;
@@
-76,8
+76,8
@@
static int property_get_can_tty(
const char *interface,
const char *property,
sd_bus_message *reply,
const char *interface,
const char *property,
sd_bus_message *reply,
-
sd_bus_error *error
,
-
void *userdata
) {
+
void *userdata
,
+
sd_bus_error *error
) {
Seat *s = userdata;
Seat *s = userdata;
@@
-94,8
+94,8
@@
static int property_get_can_graphical(
const char *interface,
const char *property,
sd_bus_message *reply,
const char *interface,
const char *property,
sd_bus_message *reply,
-
sd_bus_error *error
,
-
void *userdata
) {
+
void *userdata
,
+
sd_bus_error *error
) {
Seat *s = userdata;
Seat *s = userdata;
@@
-112,8
+112,8
@@
static int property_get_sessions(
const char *interface,
const char *property,
sd_bus_message *reply,
const char *interface,
const char *property,
sd_bus_message *reply,
-
sd_bus_error *error
,
-
void *userdata
) {
+
void *userdata
,
+
sd_bus_error *error
) {
Seat *s = userdata;
Session *session;
Seat *s = userdata;
Session *session;
@@
-153,8
+153,8
@@
static int property_get_idle_hint(
const char *interface,
const char *property,
sd_bus_message *reply,
const char *interface,
const char *property,
sd_bus_message *reply,
-
sd_bus_error *error
,
-
void *userdata
) {
+
void *userdata
,
+
sd_bus_error *error
) {
Seat *s = userdata;
Seat *s = userdata;
@@
-171,8
+171,8
@@
static int property_get_idle_since_hint(
const char *interface,
const char *property,
sd_bus_message *reply,
const char *interface,
const char *property,
sd_bus_message *reply,
-
sd_bus_error *error
,
-
void *userdata
) {
+
void *userdata
,
+
sd_bus_error *error
) {
Seat *s = userdata;
dual_timestamp t;
Seat *s = userdata;
dual_timestamp t;
@@
-192,7
+192,7
@@
static int property_get_idle_since_hint(
return sd_bus_message_append(reply, "t", u);
}
return sd_bus_message_append(reply, "t", u);
}
-static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata) {
+static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata
, sd_bus_error *error
) {
Seat *s = userdata;
int r;
Seat *s = userdata;
int r;
@@
-202,12
+202,12
@@
static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata
r = seat_stop_sessions(s);
if (r < 0)
r = seat_stop_sessions(s);
if (r < 0)
- return
sd_bus_reply_method_errno(bus, message, r, NULL)
;
+ return
r
;
- return sd_bus_reply_method_return(
bus,
message, NULL);
+ return sd_bus_reply_method_return(message, NULL);
}
}
-static int method_activate_session(sd_bus *bus, sd_bus_message *message, void *userdata) {
+static int method_activate_session(sd_bus *bus, sd_bus_message *message, void *userdata
, sd_bus_error *error
) {
Seat *s = userdata;
const char *name;
Session *session;
Seat *s = userdata;
const char *name;
Session *session;
@@
-219,20
+219,20
@@
static int method_activate_session(sd_bus *bus, sd_bus_message *message, void *u
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
- return
sd_bus_reply_method_errno(bus, message, r, NULL)
;
+ return
r
;
session = hashmap_get(s->manager->sessions, name);
if (!session)
session = hashmap_get(s->manager->sessions, name);
if (!session)
- return sd_bus_
reply_method_errorf(bus, message
, BUS_ERROR_NO_SUCH_SESSION, "No session '%s' known", name);
+ return sd_bus_
error_setf(error
, BUS_ERROR_NO_SUCH_SESSION, "No session '%s' known", name);
if (session->seat != s)
if (session->seat != s)
- return sd_bus_
reply_method_errorf(bus, message
, BUS_ERROR_SESSION_NOT_ON_SEAT, "Session %s not on seat %s", name, s->id);
+ return sd_bus_
error_setf(error
, BUS_ERROR_SESSION_NOT_ON_SEAT, "Session %s not on seat %s", name, s->id);
r = session_activate(session);
if (r < 0)
r = session_activate(session);
if (r < 0)
- return
sd_bus_reply_method_errno(bus, message, r, NULL)
;
+ return
r
;
- return sd_bus_reply_method_return(
bus,
message, NULL);
+ return sd_bus_reply_method_return(message, NULL);
}
const sd_bus_vtable seat_vtable[] = {
}
const sd_bus_vtable seat_vtable[] = {
@@
-294,7
+294,7
@@
int seat_object_find(sd_bus *bus, const char *path, const char *interface, void
if (!p)
return 0;
if (!p)
return 0;
- e =
bus_path
_unescape(p);
+ e =
sd_bus_label
_unescape(p);
if (!e)
return -ENOMEM;
if (!e)
return -ENOMEM;
@@
-312,7
+312,7
@@
char *seat_bus_path(Seat *s) {
assert(s);
assert(s);
- t =
bus_path
_escape(s->id);
+ t =
sd_bus_label
_escape(s->id);
if (!t)
return NULL;
if (!t)
return NULL;