Replacing free with g_free based on changes in util_removeQuotes.

[platform/core/telephony/tel-plugin-imc.git] / src / s_phonebook.c

diff --git a/src/s_phonebook.c b/src/s_phonebook.c
index a94db5b..a9cfaae 100644 (file)
--- a/src/s_phonebook.c
+++ b/src/s_phonebook.c
@@ -133,40 +133,23 @@ static enum tel_phonebook_ton _find_num_plan(int number_plan)
 
 static char* _get_phonebook_type(enum tel_phonebook_type pb_type)
 {
-       char *phonebook_type = NULL;
-       dbg(" Function entry ");
        dbg("pb_type = %d", pb_type);
 
-       phonebook_type = (char*)calloc(sizeof(char), VAL_FIVE);
-       if(NULL == phonebook_type) {
-               err("Memory allcoation failed");
-               return phonebook_type;
-       }
-
-       switch(pb_type)
-       {
+       switch(pb_type) {
                case PB_TYPE_FDN:
-                       phonebook_type = "FD";
-                       break;
+                       return "FD";
                case PB_TYPE_ADN:
                case PB_TYPE_AAS:
                case PB_TYPE_GAS:
-                       phonebook_type = "SM";
-                       break;
+                       return "SM";
                case PB_TYPE_SDN:
-                       phonebook_type = "SN";
-                       break;
+                       return "SN";
                case PB_TYPE_USIM:
-                       phonebook_type = "AP";
-                       break;
+                       return "AP";
                default:
                        dbg("Invalid pb_type [%02x]", pb_type);
-                       free(phonebook_type);
-                       phonebook_type = NULL;
-                       break;
+                       return NULL;
        }
-       dbg(" Function exit");
-       return phonebook_type;
 }
 
 static enum tel_phonebook_type _get_phonebook_enum(const char* pb_type)
@@ -336,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;
@@ -432,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{
@@ -549,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*/
@@ -557,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);
@@ -719,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;
@@ -811,7 +794,6 @@ static      TReturn _select(CoreObject *o, UserRequest *ur, enum tel_phonebook_type p
 
        tcore_hal_send_request(hal, pending);
 
-       free(phonebook_type);
        g_free(cmd_str);
        dbg(" Function exit");
        return TCORE_RETURN_SUCCESS;