telephony: fix a few incorrect mrp_debug usages.

Change-Id: I6d70621864c20fa1c7f1ff5e9a15d5f7e140173e

diff --git a/src/plugins/telephony/ofono.c b/src/plugins/telephony/ofono.c
index 9522e70..547e693 100644 (file)
--- a/src/plugins/telephony/ofono.c
+++ b/src/plugins/telephony/ofono.c
@@ -864,7 +864,7 @@ static int call_changed_cb(mrp_dbus_t *dbus,
     FAIL_IF_NULL(ofono->notify, FALSE, "notify is NULL");
 
     mrp_debug("calling notify TEL_CALL_CHANGED on call %s, modem %s",
-              (tel_call_t*)call->call_id, modem->modem_id);
+              call->call_id, modem->modem_id);
 
 #if _NOTIFY_MDB
     ofono->notify(TEL_CALL_CHANGED, (tel_call_t*)call, modem->modem_id);
@@ -910,7 +910,7 @@ static int call_endreason_cb(mrp_dbus_t *dbus,
 
     FAIL_IF_NULL(ofono->notify, FALSE, "notify is NULL");
     mrp_debug("calling notify TEL_CALL_CHANGED on call %s, modem %s",
-              (tel_call_t*)call->call_id, modem->modem_id);
+              call->call_id, modem->modem_id);
 #if _NOTIFY_MDB
     ofono->notify(TEL_CALL_CHANGED, (tel_call_t*)call, modem->modem_id);
 #else
@@ -969,7 +969,7 @@ static void call_query_cb(mrp_dbus_t *dbus,
     mrp_list_foreach(&modem->calls, p, n) {
         call = mrp_list_entry(p, ofono_call_t, hook);
         mrp_debug("calling notify TEL_CALL_LISTED on call %s, modem %s",
-                  (tel_call_t*)call->call_id, modem->modem_id);
+                  call->call_id, modem->modem_id);
 #if _NOTIFY_MDB
             ofono->notify(TEL_CALL_LISTED, (tel_call_t*)call, modem->modem_id);
 #else
@@ -1008,7 +1008,7 @@ static int call_removed_cb(mrp_dbus_t *dbus,
     FAIL_IF_NULL(ofono->notify, FALSE, "notify is NULL");
 
     mrp_debug("calling notify TEL_CALL_REMOVED on call %s, modem %s",
-               (tel_call_t*)call->call_id, modem->modem_id);
+               call->call_id, modem->modem_id);
 #if _NOTIFY_MDB
     ofono->notify(TEL_CALL_REMOVED, (tel_call_t*)call, modem->modem_id);
 #else
@@ -1040,7 +1040,7 @@ static int call_added_cb(mrp_dbus_t *dbus, mrp_dbus_msg_t *msg, void *user_data)
         if((call = parse_call_msg(msg, modem)) != NULL)
             if(ofono->notify) {
                 mrp_debug("calling notify TEL_CALL_ADDED on call %s, modem %s",
-                          (tel_call_t*)call->call_id, modem->modem_id);
+                          call->call_id, modem->modem_id);
             #if _NOTIFY_MDB
                 ofono->notify(TEL_CALL_ADDED,
                               (tel_call_t*)call,

diff --git a/src/plugins/telephony/telephony.c b/src/plugins/telephony/telephony.c
index f2167b2..8f20688 100644 (file)
--- a/src/plugins/telephony/telephony.c
+++ b/src/plugins/telephony/telephony.c
@@ -174,7 +174,7 @@ void tel_watcher(int event, tel_call_t *call, void *data)
 
         n = MQI_DELETE(tel_calls, where);
         mrp_debug("%d call on service/modem %s removed from Murphy DB",
-                  service, n);
+                  n, service);
         break;
       }
 

diff --git a/src/plugins/telephony/utils.c b/src/plugins/telephony/utils.c
index 1e4f021..b752ad2 100644 (file)
--- a/src/plugins/telephony/utils.c
+++ b/src/plugins/telephony/utils.c
@@ -146,7 +146,7 @@ bool parse_dbus_value(mrp_dbus_msg_t * msg,
             *((char***)spe->valptr) = copy;
         }
 
-        mrp_debug("Parsed string array of size %d", n);
+        mrp_debug("Parsed string array of size %zu", n);
 #else
         int n = 1;
         char ** ap = NULL;