Spelling fixes.

[elogind.git] / src / shared / dbus-common.c

diff --git a/src/shared/dbus-common.c b/src/shared/dbus-common.c
index e161273cd8a08a9ec75d4875fd424e486929dacd..3f5ce97680424b0e89155b7534a56cb282faae7f 100644 (file)
--- a/src/shared/dbus-common.c
+++ b/src/shared/dbus-common.c
@@ -245,7 +245,8 @@ int bus_connect_system_polkit(DBusConnection **_bus, DBusError *error) {
 }
 
 const char *bus_error_message(const DBusError *error) {
-        assert(error);
+        if (!error)
+                return NULL;
 
         /* Sometimes the D-Bus server is a little bit too verbose with
          * its error messages, so let's override them here */
@@ -255,6 +256,14 @@ const char *bus_error_message(const DBusError *error) {
         return error->message;
 }
 
+const char *bus_error_message_or_strerror(const DBusError *error, int err) {
+
+        if (error && dbus_error_is_set(error))
+                return bus_error_message(error);
+
+        return strerror(err);
+}
+
 DBusHandlerResult bus_default_message_handler(
                 DBusConnection *c,
                 DBusMessage *message,
@@ -1147,7 +1156,7 @@ DBusHandlerResult bus_exit_idle_filter(DBusConnection *bus, DBusMessage *m, void
         assert(m);
         assert(remain_until);
 
-        /* Everytime we get a new message we reset out timeout */
+        /* Every time we get a new message we reset out timeout */
         *remain_until = now(CLOCK_MONOTONIC) + DEFAULT_EXIT_USEC;
 
         if (dbus_message_is_signal(m, DBUS_INTERFACE_LOCAL, "Disconnected"))