X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fdbus-manager.c;h=7b68156abfcfda312fa87779fd7df57bd49d404e;hb=d68af58657ce0e99594dff199fbb9b319cf6af96;hp=66cf9ee67a37e77c1dce99e1a4d2c90170e8a4ea;hpb=729e3769c32242bbba26ea96900be005d52ce438;p=elogind.git

diff --git a/src/dbus-manager.c b/src/dbus-manager.c
index 66cf9ee67..7b68156ab 100644
--- a/src/dbus-manager.c
+++ b/src/dbus-manager.c
@@ -145,7 +145,7 @@
         "   <arg name=\"files\" type=\"as\" direction=\"in\"/>\n"       \
         "   <arg name=\"runtime\" type=\"b\" direction=\"in\"/>\n"      \
         "   <arg name=\"force\" type=\"b\" direction=\"in\"/>\n"        \
-        "   <arg name=\"carries_install_info\" type=\"b\" directrion=\"out\"/>\n" \
+        "   <arg name=\"carries_install_info\" type=\"b\" direction=\"out\"/>\n" \
         "   <arg name=\"changes\" type=\"a(sss)\" direction=\"out\"/>\n" \
         "  </method>\n"                                                 \
         "  <method name=\"DisableUnitFiles\">\n"                        \
@@ -157,7 +157,7 @@
         "   <arg name=\"files\" type=\"as\" direction=\"in\"/>\n"       \
         "   <arg name=\"runtime\" type=\"b\" direction=\"in\"/>\n"      \
         "   <arg name=\"force\" type=\"b\" direction=\"in\"/>\n"        \
-        "   <arg name=\"carries_install_info\" type=\"b\" directrion=\"out\"/>\n" \
+        "   <arg name=\"carries_install_info\" type=\"b\" direction=\"out\"/>\n" \
         "   <arg name=\"changes\" type=\"a(sss)\" direction=\"out\"/>\n" \
         "  </method>\n"                                                 \
         "  <method name=\"LinkUnitFiles\">\n"                           \
@@ -170,7 +170,7 @@
         "   <arg name=\"files\" type=\"as\" direction=\"in\"/>\n"       \
         "   <arg name=\"runtime\" type=\"b\" direction=\"in\"/>\n"      \
         "   <arg name=\"force\" type=\"b\" direction=\"in\"/>\n"        \
-        "   <arg name=\"carries_install_info\" type=\"b\" directrion=\"out\"/>\n" \
+        "   <arg name=\"carries_install_info\" type=\"b\" direction=\"out\"/>\n" \
         "   <arg name=\"changes\" type=\"a(sss)\" direction=\"out\"/>\n" \
         "  </method>\n"                                                 \
         "  <method name=\"MaskUnitFiles\">\n"                           \
@@ -300,7 +300,7 @@ static int bus_manager_append_tainted(DBusMessageIter *i, const char *property,
                 free(p);
 
         if (access("/proc/cgroups", F_OK) < 0)
-                e = stpcpy(e, "cgroups-missing ");
+                stpcpy(e, "cgroups-missing ");
 
         t = strstrip(buf);
 
@@ -435,8 +435,6 @@ static DBusMessage *message_from_file_changes(
         DBusMessage *reply;
         unsigned i;
 
-        assert(changes);
-
         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;
 
-                b = carries_install_info;
+                b = !!carries_install_info;
                 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;
-                bool carries_install_info = -1;
+                int carries_install_info = -1;
 
                 if (!dbus_message_iter_init(message, &iter))
                         goto oom;