chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup: optionally mount a specific cgroup controllers together, and add cpu+cpuacct...
[elogind.git]
/
src
/
dbus-manager.c
diff --git
a/src/dbus-manager.c
b/src/dbus-manager.c
index 66cf9ee67a37e77c1dce99e1a4d2c90170e8a4ea..cfc2afc9f37e8890bc63991da7b54056e134976e 100644
(file)
--- a/
src/dbus-manager.c
+++ b/
src/dbus-manager.c
@@
-435,8
+435,6
@@
static DBusMessage *message_from_file_changes(
DBusMessage *reply;
unsigned i;
DBusMessage *reply;
unsigned i;
- assert(changes);
-
reply = dbus_message_new_method_return(m);
if (!reply)
return NULL;
reply = dbus_message_new_method_return(m);
if (!reply)
return NULL;
@@
-446,7
+444,7
@@
static DBusMessage *message_from_file_changes(
if (carries_install_info >= 0) {
dbus_bool_t b;
if (carries_install_info >= 0) {
dbus_bool_t b;
- b = carries_install_info;
+ b =
!!
carries_install_info;
if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &b))
goto oom;
}
if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &b))
goto oom;
}
@@
-1320,7
+1318,7
@@
static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
UnitFileChange *changes = NULL;
unsigned n_changes = 0;
dbus_bool_t runtime, force;
UnitFileChange *changes = NULL;
unsigned n_changes = 0;
dbus_bool_t runtime, force;
-
bool
carries_install_info = -1;
+
int
carries_install_info = -1;
if (!dbus_message_iter_init(message, &iter))
goto oom;
if (!dbus_message_iter_init(message, &iter))
goto oom;