[SMS D-Bus 18/23] SMS: rename tx_queue_entry->msg to ->dbus_msg for clarity

[Inaky Perez-Gonzalez]

From: Inaky Perez-Gonzalez <inaky.perez-gonza...@intel.com>

'msg' gets too confusing: is it the SMS message, a D-Bus message?
---
 src/sms.c |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/sms.c b/src/sms.c
index faaacbe..4ad9e61 100644
--- a/src/sms.c
+++ b/src/sms.c
@@ -134,7 +134,7 @@ struct tx_queue_entry {
        unsigned char cur_pdu;
        unsigned int msg_id;
        unsigned int retry;
-       DBusMessage *msg;
+       DBusMessage *dbus_msg;
        gboolean status_report;
        struct sms_address receiver;
        char *name;
@@ -436,10 +436,10 @@ static DBusMessage *dbus_sms_msg_cancel(
                return __ofono_error_invalid_args(msg);
        sms_msg_cancel(sms_msg,
                       do_network_cancel ? SMS_MSG_CANCEL_IN_NETWORK : 0);
-       sms_msg->msg = dbus_message_ref(msg);
+       sms_msg->dbus_msg = dbus_message_ref(msg);
        __ofono_dbus_pending_reply(
-               &sms_msg->msg,
-               dbus_message_new_method_return(sms_msg->msg));
+               &sms_msg->dbus_msg,
+               dbus_message_new_method_return(sms_msg->dbus_msg));
        return NULL;
 }
 
@@ -507,9 +507,9 @@ static void tx_queue_entry_destroy(struct tx_queue_entry 
*entry)
        g_free(entry->pdus);
        g_free(entry->name);
        entry->state = __OFONO_SMS_TX_ST_INVALID;
-       if (entry->msg) {
-               dbus_message_unref(entry->msg);
-               entry->msg = NULL;
+       if (entry->dbus_msg) {
+               dbus_message_unref(entry->dbus_msg);
+               entry->dbus_msg = NULL;
        }
 }
 
@@ -543,8 +543,8 @@ static void tx_finished(const struct ofono_error *error, 
int mr, void *data)
 
                ofono_sms_tx_state_set(entry, OFONO_SMS_TX_ST_CANCELING);
                entry = g_queue_pop_head(sms->txq);
-               __ofono_dbus_pending_reply(&entry->msg,
-                                       __ofono_error_failed(entry->msg));
+               __ofono_dbus_pending_reply(&entry->dbus_msg,
+                                       __ofono_error_failed(entry->dbus_msg));
 
                __ofono_history_sms_send_status(modem, entry->msg_id,
                                        time(NULL),
@@ -578,8 +578,9 @@ static void tx_finished(const struct ofono_error *error, 
int mr, void *data)
        }
 
        entry = g_queue_pop_head(sms->txq);
-       __ofono_dbus_pending_reply(&entry->msg,
-                               dbus_message_new_method_return(entry->msg));
+       __ofono_dbus_pending_reply(
+               &entry->dbus_msg,
+               dbus_message_new_method_return(entry->dbus_msg));
        __ofono_history_sms_send_status(modem, entry->msg_id,
                                        time(NULL),
                                        OFONO_HISTORY_SMS_STATUS_SUBMITTED);
@@ -817,7 +818,7 @@ static DBusMessage *dbus_SendMessage(DBusConnection *conn, 
DBusMessage *msg,
        if (sms_msg == NULL)
                return __ofono_error_invalid_format(msg);
        /* Unreferenced upon tx_queue_entry_destroy() */
-       sms_msg->msg = dbus_message_ref(msg);
+       sms_msg->dbus_msg = dbus_message_ref(msg);
        return NULL;
 }
 
-- 
1.6.6.1

_______________________________________________
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono