[ofono-online-v2 2/6] Log more of the ofono errors.

[Pekka . Pessi]

From: Pekka Pessi <pekka.pe...@nokia.com>

---
 plugins/ofono.c |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/plugins/ofono.c b/plugins/ofono.c
index 8254b56..b15e1f5 100644
--- a/plugins/ofono.c
+++ b/plugins/ofono.c
@@ -92,8 +92,8 @@ static void set_property_reply(DBusPendingCall *call, void 
*user_data)
        reply = dbus_pending_call_steal_reply(call);
 
        if (dbus_set_error_from_message(&error, reply)) {
-               connman_error("SetProperty(\"%s\"): %s", name,
-                               error.message);
+               connman_error("%s(\"%s\"): %s: %s", "SetProperty", name,
+                               error.name, error.message);
                dbus_error_free(&error);
        }
 
@@ -314,7 +314,7 @@ static void set_network_name(struct connman_network 
*network)
 
        if (dbus_connection_send_with_reply(connection, message,
                                                &call, TIMEOUT) == FALSE) {
-               connman_error("Failed to get operator");
+               connman_error("Failed to get operator name");
                goto done;
        }
 
@@ -550,7 +550,8 @@ static void set_active_reply(DBusPendingCall *call, void 
*user_data)
 
                pending_network = NULL;
 
-               connman_error("%s", error.message);
+               connman_error("%s(\"%s\"): %s: %s", "SetProperty", "Active",
+                               error.name, error.message);
 
                dbus_error_free(&error);
        } else
@@ -714,7 +715,8 @@ static void create_context_reply(DBusPendingCall *call, 
void *user_data)
        reply = dbus_pending_call_steal_reply(call);
 
        if (dbus_set_error_from_message(&error, reply)) {
-               connman_error("%s", error.message);
+               connman_error("%s(): %s: %s", CREATE_CONTEXT,
+                               error.name, error.message);
                dbus_error_free(&error);
        }
 
@@ -1075,6 +1077,7 @@ static gboolean modem_has_gprs(DBusMessageIter *array)
 static void modem_properties_reply(DBusPendingCall *call, void *user_data)
 {
        DBusMessage *reply;
+       DBusError error;
        DBusMessageIter array, dict;
        const char *path = user_data;
 
@@ -1082,6 +1085,16 @@ static void modem_properties_reply(DBusPendingCall 
*call, void *user_data)
 
        reply = dbus_pending_call_steal_reply(call);
 
+       dbus_error_init(&error);
+
+       if (dbus_set_error_from_message(&error, reply)) {
+               connman_error("%s.%s(%s): %s: %s",
+                               "Modem", GET_PROPERTIES, path,
+                               error.name, error.message);
+               dbus_error_free(&error);
+               goto done;
+       }
+
        if (dbus_message_iter_init(reply, &array) == FALSE)
                goto done;
 
@@ -1210,12 +1223,23 @@ static void update_modems(DBusMessageIter *array)
 static void manager_properties_reply(DBusPendingCall *call, void *user_data)
 {
        DBusMessage *reply;
+       DBusError error;
        DBusMessageIter array, dict;
 
        DBG("");
 
        reply = dbus_pending_call_steal_reply(call);
 
+       dbus_error_init(&error);
+
+       if (dbus_set_error_from_message(&error, reply)) {
+               connman_error("%s.%s(): %s: %s",
+                               "ModemManager", GET_PROPERTIES,
+                               error.name, error.message);
+               dbus_error_free(&error);
+               goto done;
+       }
+
        if (dbus_message_iter_init(reply, &array) == FALSE)
                goto done;
 
-- 
1.7.0.4

_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman