Replacing free with g_free based on changes in util_removeQuotes.

Change-Id: I7534e0d505955a8fc5e0d4e0e734aa17b1415e0e

diff --git a/src/s_call.c b/src/s_call.c
old mode 100644 (file)
new mode 100755 (executable)
index 7a89ac9..3a0e283
--- a/src/s_call.c
+++ b/src/s_call.c
@@ -2367,10 +2367,7 @@ static int _callFromCLCCLine(char *line, struct clcc_call_t *p_call)
 ERROR:
        err("Invalid CLCC line");
 
-       if (num) {
-               g_free(num);
-               num = NULL;
-       }
+       g_free(num);
 
        // Free tokens
        tcore_at_tok_free(tokens);

diff --git a/src/s_common.c b/src/s_common.c
index 0c60d87..430aa2f 100644 (file)
--- a/src/s_common.c
+++ b/src/s_common.c
@@ -116,7 +116,7 @@ char* util_hexStringToBytes(char *s)
 
        for (i = 0; i < sz; i += 2) {
                ret[i / 2] = (char) ((util_hexCharToInt(s[i]) << 4) | util_hexCharToInt(s[i + 1]));
-               dbg("[%02x]", ret[i / 2]);
+               msg("           [%02x]", ret[i / 2]);
        }
 
        return ret;

diff --git a/src/s_network.c b/src/s_network.c
old mode 100644 (file)
new mode 100755 (executable)
index e1e7fc1..1ac4c48
--- a/src/s_network.c
+++ b/src/s_network.c
@@ -457,13 +457,10 @@ OUT:
                tcore_user_request_send_response(ur, TRESP_NETWORK_SEARCH, sizeof(struct tresp_network_search), &resp);
        }
 
-       if (tokens)
-               tcore_at_tok_free(tokens);
-
-       if (temp_plmn_info)
-               free(temp_plmn_info);
+       /* Free tokens */
+       tcore_at_tok_free(tokens);
 
-       return;
+       g_free(temp_plmn_info);
 }
 
 static void on_response_set_umts_band(TcorePending *p, int data_len, const void *data, void *user_data)
@@ -980,7 +977,7 @@ static void on_response_get_preferred_plmn(TcorePending *p, int data_len, const
                                                        if (resp.list[i].plmn[5] == '#')
                                                                resp.list[i].plmn[5] = '\0';
 
-                                                       // free(cp_plmn);
+                                                       // g_free(cp_plmn);
                                                }
                                        }
                                }
@@ -1169,10 +1166,9 @@ static void on_response_get_serving_network(TcorePending *p, int data_len, const
                                dbg("dbg.. noti.plmn  : %s", noti.plmn);
                        }
                }
-               if (long_plmn_name)
-                       free(long_plmn_name);
-               if (short_plmn_name)
-                       free(short_plmn_name);
+
+               g_free(long_plmn_name);
+               g_free(short_plmn_name);
        }
        return;
 }

diff --git a/src/s_phonebook.c b/src/s_phonebook.c
index fe9ff58..a9cfaae 100644 (file)
--- a/src/s_phonebook.c
+++ b/src/s_phonebook.c
@@ -319,7 +319,7 @@ static void _on_response_getindexlist(TcorePending *p, int data_len, const void
        memset(&resp_readrecord, 0x00, sizeof(struct tresp_phonebook_read_record));
        resp_readrecord.result = PB_FAIL;
        resp_readrecord.phonebook_type = *selected_pb;
-       
+
        if(resp->success > 0)
        {
                CoreObject *o = NULL;
@@ -415,7 +415,7 @@ static void on_response_get_count(TcorePending *p, int data_len, const void *dat
                        __pbindex.total_count = res.total_count;
                }
                dbg("used count = %d,  total count= %d", res.used_count, res.total_count);
-               free(pbtype);
+               g_free(pbtype);
                pbtype = NULL;
        }
        else{
@@ -532,7 +532,7 @@ static void on_response_read_record(TcorePending *p, int data_len, const void *d
                member =  util_removeQuotes((void*)temp);
                memcpy(res.number, member, strlen(member));
                dbg("number %s - %d", res.number, strlen((const char*)res.number));
-               free(member);
+               g_free(member);
                member = NULL;
 
                /*Remove the quotes("") from the name string*/
@@ -540,7 +540,7 @@ static void on_response_read_record(TcorePending *p, int data_len, const void *d
                member =  util_removeQuotes((void*)temp);
                memcpy(res.name, member, strlen(member));
                dbg("name %s - %d", res.name, strlen((const char*)res.name));
-               free(member);
+               g_free(member);
                member = NULL;
                res.dcs = PB_TEXT_ASCII;
                res.name_len = strlen((const char*)res.name);
@@ -702,7 +702,7 @@ static void _response_get_support_list(TcorePending *p, int data_len, const void
                                dbg("SIM barred-dialling-number");
                        }
                        pbtype = strtok (NULL, "(,)");
-                       free(temp);
+                       g_free(temp);
                }
 
                noti_data.b_init = TRUE;

diff --git a/src/s_ps.c b/src/s_ps.c
old mode 100644 (file)
new mode 100755 (executable)
index 20b92e3..5e7c6a8
--- a/src/s_ps.c
+++ b/src/s_ps.c
@@ -57,16 +57,6 @@
 #define AT_XDNS_DISABLE 0
 #define AT_SESSION_DOWN 0
 
-static void _ps_free(void *ptr)
-{
-       dbg("Entry");
-       if (ptr) {
-               (void) free(ptr);
-               ptr = NULL;
-       }
-       dbg("Exit");
-       return;
-}
 static void _unable_to_get_pending(CoreObject *co_ps, CoreObject *ps_context)
 {
        struct tnoti_ps_call_status data_resp = {0};
@@ -300,8 +290,8 @@ static void on_response_get_dns_cmnd(TcorePending *p, int data_len, const void *
                                        && (g_strcmp0("0.0.0.0", dns_sec) == 0)) {
                                dbg("Invalid DNS");
 
-                               _ps_free(dns_prim);
-                               _ps_free(dns_sec);
+                               g_free(dns_prim);
+                               g_free(dns_sec);
 
                                tcore_at_tok_free(tokens);
                                tokens = NULL;
@@ -311,8 +301,8 @@ static void on_response_get_dns_cmnd(TcorePending *p, int data_len, const void *
 
                        /* Set DNS Address */
                        tcore_context_set_ipv4_dns(ps_context, dns_prim, dns_sec);
-                       _ps_free(dns_prim);
-                       _ps_free(dns_sec);
+                       g_free(dns_prim);
+                       g_free(dns_sec);
 
                        tcore_at_tok_free(tokens);
                        tokens = NULL;
@@ -389,6 +379,8 @@ static void on_response_get_pdp_address(TcorePending *p, int data_len, const voi
                        /* Strip off starting " and ending " from this token to read actual PDP address */
                        /* Set IP Address */
                        (void)tcore_context_set_ipv4_addr(ps_context, (const char *)token_pdp_address);
+
+                       g_free(token_pdp_address);
                }
 
                /* Get DNS Address */

diff --git a/src/s_sat.c b/src/s_sat.c
index a38d999..d24c40a 100644 (file)
--- a/src/s_sat.c
+++ b/src/s_sat.c
@@ -78,24 +78,23 @@ static gboolean on_event_sat_proactive_command(CoreObject *o, const void *event_
        line = (char *) lines->data;
        tokens = tcore_at_tok_new(line);
        if (g_slist_length(tokens) != 1) {
-               dbg("invalid message");
+               err("Invalid message");
                tcore_at_tok_free(tokens);
                return FALSE;
        }
-       hexData = (char *) g_slist_nth_data(tokens, 0);
 
-       dbg("hexdata %s ", hexData);
-       dbg("hexdata length %d", strlen(hexData));
+       hexData = (char *)g_slist_nth_data(tokens, 0);
+       dbg("SAT data: [%s] SAT data length: [%d]", hexData, strlen(hexData));
 
        tmp = util_removeQuotes(hexData);
        recordData = util_hexStringToBytes(tmp);
        dbg("recordData: %x", recordData);
-       free(tmp);
+       g_free(tmp);
        util_hex_dump("    ", strlen(hexData) / 2, recordData);
        len_proactive_cmd = strlen(recordData);
        dbg("len_proactive_cmd = %d", len_proactive_cmd);
        tcore_sat_decode_proactive_command((unsigned char *) recordData, (strlen(hexData) / 2) - 1, &decoded_data);
-       free(recordData);
+       g_free(recordData);
 
        proactive_noti.cmd_number = decoded_data.cmd_num;
        proactive_noti.cmd_type = decoded_data.cmd_type;

diff --git a/src/s_sim.c b/src/s_sim.c
index 90d0366..595576d 100644 (file)
--- a/src/s_sim.c
+++ b/src/s_sim.c
@@ -905,7 +905,7 @@ static void _response_get_file_info(TcorePending *p, int data_len, const void *d
                        tmp = util_removeQuotes(hexData);
                        recordData = util_hexStringToBytes(tmp);
                        util_hex_dump("   ", strlen(hexData) / 2, recordData);
-                       free(tmp);
+                       g_free(tmp);
 
                        ptr_data = (unsigned char *)recordData;
                        if (tcore_sim_get_type(co_sim) == SIM_TYPE_USIM) {
@@ -998,7 +998,7 @@ static void _response_get_file_info(TcorePending *p, int data_len, const void *d
                                        } else {
                                                dbg("INVALID FCP received - DEbug!");
                                                tcore_at_tok_free(tokens);
-                                               free(recordData);
+                                               g_free(recordData);
                                                return;
                                        }
 
@@ -1021,7 +1021,7 @@ static void _response_get_file_info(TcorePending *p, int data_len, const void *d
                                        } else {
                                                dbg("INVALID FCP received - DEbug!");
                                                tcore_at_tok_free(tokens);
-                                               free(recordData);
+                                               g_free(recordData);
                                                return;
                                        }
 
@@ -1103,7 +1103,7 @@ static void _response_get_file_info(TcorePending *p, int data_len, const void *d
                                        } else {
                                                dbg("INVALID FCP received[0x%x] - DEbug!", *ptr_data);
                                                tcore_at_tok_free(tokens);
-                                               free(recordData);
+                                               g_free(recordData);
                                                return;
                                        }
 
@@ -1125,7 +1125,7 @@ static void _response_get_file_info(TcorePending *p, int data_len, const void *d
                                        } else {
                                                dbg("INVALID FCP received - DEbug!");
                                                tcore_at_tok_free(tokens);
-                                               free(recordData);
+                                               g_free(recordData);
                                                return;
                                        }
 
@@ -1151,7 +1151,7 @@ static void _response_get_file_info(TcorePending *p, int data_len, const void *d
                                } else {
                                        dbg("INVALID FCP received - DEbug!");
                                        tcore_at_tok_free(tokens);
-                                       free(recordData);
+                                       g_free(recordData);
                                        return;
                                }
                        } else if (tcore_sim_get_type(co_sim) == SIM_TYPE_GSM) {
@@ -1248,7 +1248,7 @@ static void _response_get_file_info(TcorePending *p, int data_len, const void *d
                        file_meta->rec_count = num_of_records;
                        file_meta->current_index = 0; // reset for new record type EF
                        rt = SIM_ACCESS_SUCCESS;
-                       free(recordData);
+                       g_free(recordData);
                } else {
                        /*2. SIM access fail case*/
                        dbg("error to get ef[0x%x]", file_meta->file_id);
@@ -2838,8 +2838,8 @@ static void on_response_transmit_apdu(TcorePending *p, int data_len, const void
                        decoded_data = util_hexStringToBytes(tmp);
 
                        memcpy((char *)res.apdu_resp, decoded_data, res.apdu_resp_length);
-                       free(tmp);
-                       free(decoded_data);
+                       g_free(tmp);
+                       g_free(decoded_data);
                        res.result = SIM_ACCESS_SUCCESS;
                }
        } else {
@@ -2887,8 +2887,8 @@ static void on_response_get_atr(TcorePending *p, int data_len, const void *data,
 
                        res.atr_length = strlen(decoded_data);
                        memcpy((char *)res.atr, decoded_data, res.atr_length);
-                       free(tmp);
-                       free(decoded_data);
+                       g_free(tmp);
+                       g_free(decoded_data);
                        res.result = SIM_ACCESS_SUCCESS;
                }
        } else {

diff --git a/src/s_sms.c b/src/s_sms.c
old mode 100644 (file)
new mode 100755 (executable)
index 25bea45..a4081a4
--- a/src/s_sms.c
+++ b/src/s_sms.c
@@ -467,7 +467,7 @@ static gboolean on_event_sms_incom_msg(CoreObject *o, const void *event_info, vo
        if(tokens)
                tcore_at_tok_free(tokens);
 
-       free(bytePDU);
+       g_free(bytePDU);
 
        return TRUE;
 }
@@ -559,7 +559,7 @@ static gboolean on_event_sms_cb_incom_msg(CoreObject *o, const void *event_info,
 
                                memcpy(cbMsgInfo.cbMsg.msgData, (char*)byte_pdu, cbMsgInfo.cbMsg.length);
                                rtn = tcore_server_send_notification(tcore_plugin_ref_server(tcore_object_ref_plugin(o)), o, TNOTI_SMS_CB_INCOM_MSG, sizeof(struct tnoti_sms_cellBroadcast_msg), &cbMsgInfo);
-                               free(byte_pdu);
+                               g_free(byte_pdu);
                        } else {
                                dbg("Invalid Message Length");
                        }
@@ -780,7 +780,7 @@ static void on_response_class2_read_msg(TcorePending *pending, int data_len, con
 
        rtn = tcore_server_send_notification(tcore_plugin_ref_server(tcore_object_ref_plugin(tcore_pending_ref_core_object(pending))), tcore_pending_ref_core_object(pending), TNOTI_SMS_INCOM_MSG, sizeof(struct tnoti_sms_umts_msg), &gsmMsgInfo);
 
-       free(bytePDU);
+       g_free(bytePDU);
 
        dbg("Exit");
        return;
@@ -914,7 +914,7 @@ static void on_response_read_msg(TcorePending *pending, int data_len, const void
                                                resp_read_msg.result = SMS_INVALID_PARAMETER_FORMAT;
                                        }
                                }
-                               free(byte_pdu);
+                               g_free(byte_pdu);
                        }else {
                                dbg("NULL PDU");
                        }
@@ -1238,6 +1238,8 @@ static void on_response_get_cb_config(TcorePending *p, int data_len, const void
                                                cb_mid_str = util_removeQuotes(pResp);
                                                cb_tokens = tcore_at_tok_new((const char *) cb_mid_str);
 
+                                               g_free(cb_mid_str);
+
                                                num_cb_tokens = g_slist_length(cb_tokens);
                                                dbg("num_cb_tokens = %d", num_cb_tokens);
 
@@ -1503,8 +1505,8 @@ static void on_response_get_sms_params(TcorePending *pending, int data_len, cons
                                for (i = 0; i < (int) respGetParams.paramsInfo.tpSvcCntrAddr.dialNumLen; i++)
                                        dbg("SCAddr = %d [%02x]", i, respGetParams.paramsInfo.tpSvcCntrAddr.diallingNum[i]);
 
-                               free(recordData);
-                               free(hexData);
+                               g_free(recordData);
+                               g_free(hexData);
                        } else {
                                dbg("No response");
                        }
@@ -1732,8 +1734,8 @@ static void on_response_get_paramcnt(TcorePending *p, int data_len, const void *
                                                                }
                                                        } else {
                                                                dbg("INVALID FCP received - DEbug!");
-                                                               free(hexData);
-                                                               free(recordData);
+                                                               g_free(hexData);
+                                                               g_free(recordData);
                                                                tcore_at_tok_free(tokens);
                                                                return;
                                                        }
@@ -1750,8 +1752,8 @@ static void on_response_get_paramcnt(TcorePending *p, int data_len, const void *
                                                                dbg("Getting FileID=[0x%x]", file_id);
                                                        } else {
                                                                dbg("INVALID FCP received - DEbug!");
-                                                               free(hexData);
-                                                               free(recordData);
+                                                               g_free(hexData);
+                                                               g_free(recordData);
                                                                tcore_at_tok_free(tokens);
                                                                return;
                                                        }
@@ -1830,8 +1832,8 @@ static void on_response_get_paramcnt(TcorePending *p, int data_len, const void *
                                                                }
                                                        } else {
                                                                dbg("INVALID FCP received[0x%x] - DEbug!", *ptr_data);
-                                                               free(hexData);
-                                                               free(recordData);
+                                                               g_free(hexData);
+                                                               g_free(recordData);
                                                                tcore_at_tok_free(tokens);
                                                                return;
                                                        }
@@ -1853,8 +1855,8 @@ static void on_response_get_paramcnt(TcorePending *p, int data_len, const void *
                                                                ptr_data = ptr_data + 2;
                                                        } else {
                                                                dbg("INVALID FCP received - DEbug!");
-                                                               free(hexData);
-                                                               free(recordData);
+                                                               g_free(hexData);
+                                                               g_free(recordData);
                                                                tcore_at_tok_free(tokens);
                                                                return;
                                                        }
@@ -1880,8 +1882,8 @@ static void on_response_get_paramcnt(TcorePending *p, int data_len, const void *
                                                        }
                                                } else {
                                                        dbg("INVALID FCP received - DEbug!");
-                                                       free(hexData);
-                                                       free(recordData);
+                                                       g_free(hexData);
+                                                       g_free(recordData);
                                                        tcore_at_tok_free(tokens);
                                                        return;
                                                }
@@ -1980,8 +1982,8 @@ static void on_response_get_paramcnt(TcorePending *p, int data_len, const void *
                                        smsp_record_len = tcore_plugin_ref_property(plugin, "SMSPRECORDLEN");
                                        memcpy(smsp_record_len, &record_len, sizeof(int));
 
-                                       free(recordData);
-                                       free(hexData);
+                                       g_free(recordData);
+                                       g_free(hexData);
                                } else {
                                        /*2. SIM access fail case*/
                                        dbg("SIM access fail");
@@ -2102,7 +2104,7 @@ static void _response_get_efsms_data(TcorePending *p, int data_len, const void *
 
                                //free memory we own
                                g_free(cmd_str);
-                               free(encoded_data);
+                               g_free(encoded_data);
                                util_sms_free_memory(atreq);
                                util_sms_free_memory(pending);
 
@@ -2120,7 +2122,7 @@ static void _response_get_efsms_data(TcorePending *p, int data_len, const void *
                        tcore_hal_send_request(hal, pending);
 
                        g_free(cmd_str);
-                       free(encoded_data);
+                       g_free(encoded_data);
                }
        }
 

diff --git a/src/s_ss.c b/src/s_ss.c
old mode 100644 (file)
new mode 100755 (executable)
index 0d76b6e..35083be
--- a/src/s_ss.c
+++ b/src/s_ss.c
@@ -597,9 +597,7 @@ OUT:
                tcore_at_tok_free(tokens);
        }
 
-       if (NULL != number) {
-               g_free(number);
-       }
+       g_free(number);
        return TRUE;
 }