chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dbus: complete exec command coverage
[elogind.git]
/
src
/
dbus-unit.c
diff --git
a/src/dbus-unit.c
b/src/dbus-unit.c
index 8e35377dc56370103424ac96cf05e10cbd52af06..17ca7bdd8965bc51dd5da46fc5e60496c9457195 100644
(file)
--- a/
src/dbus-unit.c
+++ b/
src/dbus-unit.c
@@
-255,7
+255,7
@@
int bus_unit_append_cgroups(Manager *m, DBusMessageIter *i, const char *property
DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_unit_append_kill_mode, kill_mode, KillMode);
DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_unit_append_kill_mode, kill_mode, KillMode);
-static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusMessage *message) {
+static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBus
Connection *connection, DBus
Message *message) {
DBusMessage *reply = NULL;
Manager *m = u->meta.manager;
DBusError error;
DBusMessage *reply = NULL;
Manager *m = u->meta.manager;
DBusError error;
@@
-273,7
+273,7
@@
static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusMessage *message
else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Unit", "Restart"))
job_type = JOB_RESTART;
else if (UNIT_VTABLE(u)->bus_message_handler)
else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Unit", "Restart"))
job_type = JOB_RESTART;
else if (UNIT_VTABLE(u)->bus_message_handler)
- return UNIT_VTABLE(u)->bus_message_handler(u, message);
+ return UNIT_VTABLE(u)->bus_message_handler(u,
connection,
message);
else
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
else
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
@@
-284,20
+284,20
@@
static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusMessage *message
int r;
if (job_type == JOB_START && u->meta.only_by_dependency)
int r;
if (job_type == JOB_START && u->meta.only_by_dependency)
- return bus_send_error_reply(m, message, NULL, -EPERM);
+ return bus_send_error_reply(m,
connection,
message, NULL, -EPERM);
if (!dbus_message_get_args(
message,
&error,
DBUS_TYPE_STRING, &smode,
DBUS_TYPE_INVALID))
if (!dbus_message_get_args(
message,
&error,
DBUS_TYPE_STRING, &smode,
DBUS_TYPE_INVALID))
- return bus_send_error_reply(m, message, &error, -EINVAL);
+ return bus_send_error_reply(m,
connection,
message, &error, -EINVAL);
if ((mode = job_mode_from_string(smode)) == _JOB_MODE_INVALID)
if ((mode = job_mode_from_string(smode)) == _JOB_MODE_INVALID)
- return bus_send_error_reply(m, message, NULL, -EINVAL);
+ return bus_send_error_reply(m,
connection,
message, NULL, -EINVAL);
if ((r = manager_add_job(m, job_type, u, mode, true, &j)) < 0)
if ((r = manager_add_job(m, job_type, u, mode, true, &j)) < 0)
- return bus_send_error_reply(m, message, NULL, r);
+ return bus_send_error_reply(m,
connection,
message, NULL, r);
if (!(reply = dbus_message_new_method_return(message)))
goto oom;
if (!(reply = dbus_message_new_method_return(message)))
goto oom;
@@
-315,7
+315,7
@@
static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusMessage *message
free(path);
if (reply) {
free(path);
if (reply) {
- if (!dbus_connection_send(
m->api_bus
, reply, NULL))
+ if (!dbus_connection_send(
connection
, reply, NULL))
goto oom;
dbus_message_unref(reply);
goto oom;
dbus_message_unref(reply);
@@
-334,7
+334,7
@@
oom:
return DBUS_HANDLER_RESULT_NEED_MEMORY;
}
return DBUS_HANDLER_RESULT_NEED_MEMORY;
}
-static DBusHandlerResult bus_unit_message_handler(DBusConnection
*connection, DBusMessage *message, void *data) {
+static DBusHandlerResult bus_unit_message_handler(DBusConnection *connection, DBusMessage *message, void *data) {
Manager *m = data;
Unit *u;
int r;
Manager *m = data;
Unit *u;
int r;
@@
-356,10
+356,10
@@
static DBusHandlerResult bus_unit_message_handler(DBusConnection *connection, D
if (r == -ENOENT)
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
if (r == -ENOENT)
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
- return bus_send_error_reply(m, message, NULL, r);
+ return bus_send_error_reply(m,
connection,
message, NULL, r);
}
}
- return bus_unit_message_dispatch(u, message);
+ return bus_unit_message_dispatch(u,
connection,
message);
}
const DBusObjectPathVTable bus_unit_vtable = {
}
const DBusObjectPathVTable bus_unit_vtable = {
@@
-402,7
+402,7
@@
void bus_unit_send_change_signal(Unit *u) {
goto oom;
}
goto oom;
}
- if (
!dbus_connection_send(u->meta.manager->api_bus, m, NULL)
)
+ if (
bus_broadcast(u->meta.manager, m) < 0
)
goto oom;
free(p);
goto oom;
free(p);
@@
-445,7
+445,7
@@
void bus_unit_send_removed_signal(Unit *u) {
DBUS_TYPE_INVALID))
goto oom;
DBUS_TYPE_INVALID))
goto oom;
- if (
!dbus_connection_send(u->meta.manager->api_bus, m, NULL)
)
+ if (
bus_broadcast(u->meta.manager, m) < 0
)
goto oom;
free(p);
goto oom;
free(p);