apply some patches from private git

I7f72a057460043c5476a9c3cfd0b4ff06aa1db8a Fix network search timeout value (Inho Oh)
I60b22ff42c2f4a536c2c964d5ea5563f00f8c764 Fixed testapp build error (Inho Oh)
Iff8d7ad94c08d4dc414e51a4bd43fc51b6c972a9 Remove the null check code of response callback in macro (DongHoo Park)
I6ee7147d4cdeffafedb95914c6b0adfc7856fba9 Fix memory leak (Inho Oh)

diff --git a/src/common.h b/src/common.h
index 7d9ce01b83343a2934ff1eb63c17adf4d16df797..6de1cdf59ead0dc73acd62f97b6177ab25356f35 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -28,21 +28,13 @@
 
 __BEGIN_DECLS
 
-#include "tapi_log.h"
-
 #define MAKE_RESP_CB_DATA(data,handle,cb,user_data)  \
-       if (!handle || !cb) { return TAPI_API_INVALID_INPUT; } \
+       if (!handle) { return TAPI_API_INVALID_INPUT; } \
        data = g_new0(struct tapi_resp_data, 1); \
        data->handle = handle; \
        data->cb_fn = cb; \
        data->user_data = user_data
 
-#define g_variant_iter_free0( iter ) \
-       if ( iter ) \
-               g_variant_iter_free( iter );\
-       else \
-               dbg("iter : 0");
-
 struct tapi_handle {
        gpointer dbus_connection;
        char *path;

diff --git a/src/tapi_call.c b/src/tapi_call.c
index 942c51652c1954bce4ad20df4c0e7a16b1336f85..b1034b14a14bca37c13fdb49b4a8f0139c1aeca3 100644 (file)
--- a/src/tapi_call.c
+++ b/src/tapi_call.c
@@ -288,9 +288,9 @@ static void on_response_get_call_volume_info(GObject *source_object, GAsyncResul
                        }
                }
                i++;
-               g_variant_iter_free0(iter_row);
+               g_variant_iter_free(iter_row);
        }
-       g_variant_iter_free0(iter);
+       g_variant_iter_free(iter);
 
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
@@ -754,11 +754,11 @@ EXPORT_API int tel_get_call_status_all( TapiHandle *handle, TelCallStatusCallbac
 
                        }
 
-                       g_variant_iter_free0(iter_row);
+                       g_variant_iter_free(iter_row);
 
                        cb( &data, user_data );
                }
-               g_variant_iter_free0(iter);
+               g_variant_iter_free(iter);
        } else {
 
                dbg("[ error ] fail to get call status");

diff --git a/src/tapi_common.c b/src/tapi_common.c
index 1e120071ddf161288cb82d00fcbf2f45b0350b32..7f3a41312da0b0a62901c6460023faa70cab1c55 100644 (file)
--- a/src/tapi_common.c
+++ b/src/tapi_common.c
@@ -374,7 +374,7 @@ static void on_signal_callback(GDBusConnection *conn, const gchar *name, const g
                                        //dbg("item index(%d) id(%d) str(%s)",index, item_id, item_str);
                                        index++;
                                }
-                               g_variant_iter_free0(iter);
+                               g_variant_iter_free(iter);
                        }
                        setup_menu.bIsSatMainMenuHelpInfo = (b_helpinfo ? 1 : 0);
                        setup_menu.bIsUpdatedSatMainMenu = (b_updated ? 1 : 0);
@@ -454,7 +454,7 @@ static void on_signal_callback(GDBusConnection *conn, const gchar *name, const g
                                                        select_item.menuItem[index].itemId, select_item.menuItem[index].textLen, select_item.menuItem[index].text);
                                        index++;
                                }
-                               g_variant_iter_free0(iter);
+                               g_variant_iter_free(iter);
                        }
 
                        dbg("command id (%d)", select_item.commandId);
@@ -578,7 +578,7 @@ static void on_signal_callback(GDBusConnection *conn, const gchar *name, const g
                                        send_sms.smsTpdu.data[index] = data;
                                        index++;
                                }
-                               g_variant_iter_free0(iter);
+                               g_variant_iter_free(iter);
                                g_variant_unref(inner_gv);
                                tmp_data_len = index - 1;
                        }
@@ -636,7 +636,7 @@ static void on_signal_callback(GDBusConnection *conn, const gchar *name, const g
                                        g_index++;
                                }
                                //while end
-                               g_variant_iter_free0(iter);
+                               g_variant_iter_free(iter);
                                g_variant_unref(inner_gv);
                        }
 
@@ -775,7 +775,7 @@ EXPORT_API char** tel_get_cp_name_list(void)
        while (g_variant_iter_next(iter, "s", &modem_path)){
                list = g_slist_append(list, modem_path);
        }
-       g_variant_iter_free0 (iter);
+       g_variant_iter_free (iter);
 
        if (!list) {
                dbg( "No CP name");

diff --git a/src/tapi_modem.c b/src/tapi_modem.c
index 379eb1537b828095cd2fa3545aec1a00d8969a84..0f286e65f8ec68d34c18caca1fb53946f5eadbc3 100644 (file)
--- a/src/tapi_modem.c
+++ b/src/tapi_modem.c
@@ -50,6 +50,8 @@ static void on_response_default_set(GObject *source_object, GAsyncResult *res, g
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
        }
+
+       free(evt_cb_data);
 }
 
 static void on_response_get_version(GObject *source_object, GAsyncResult *res, gpointer user_data)
@@ -81,6 +83,8 @@ static void on_response_get_version(GObject *source_object, GAsyncResult *res, g
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data);
        }
+
+       free(evt_cb_data);
 }
 
 static void on_response_get_serial_number(GObject *source_object, GAsyncResult *res, gpointer user_data)
@@ -101,6 +105,8 @@ static void on_response_get_serial_number(GObject *source_object, GAsyncResult *
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, sn, evt_cb_data->user_data);
        }
+
+       free(evt_cb_data);
 }
 
 static void on_response_get_imei(GObject *source_object, GAsyncResult *res, gpointer user_data)
@@ -121,6 +127,8 @@ static void on_response_get_imei(GObject *source_object, GAsyncResult *res, gpoi
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, imei, evt_cb_data->user_data);
        }
+
+       free(evt_cb_data);
 }
 
 static void on_response_set_dun_pin_ctrl(GObject *source_object, GAsyncResult *res, gpointer user_data)
@@ -141,6 +149,8 @@ static void on_response_set_dun_pin_ctrl(GObject *source_object, GAsyncResult *r
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, 0, evt_cb_data->user_data);
        }
+
+       free(evt_cb_data);
 }
 
 /**

diff --git a/src/tapi_network.c b/src/tapi_network.c
index d5f1dd6192cd2292fbdab8d8b9c95b475bb6ad02..94c2d2352234bf49056f8aa31750864ea5f293da 100644 (file)
--- a/src/tapi_network.c
+++ b/src/tapi_network.c
@@ -117,6 +117,8 @@ static void on_response_search_network(GObject *source_object, GAsyncResult *res
                if (evt_cb_data->cb_fn) {
                        evt_cb_data->cb_fn(evt_cb_data->handle, -1, NULL, evt_cb_data->user_data);
                }
+
+               free(evt_cb_data);
                return;
        }
 
@@ -141,13 +143,15 @@ static void on_response_search_network(GObject *source_object, GAsyncResult *res
                        }
                }
                i++;
-               g_variant_iter_free0(iter_row);
+               g_variant_iter_free(iter_row);
        }
-       g_variant_iter_free0(iter);
+       g_variant_iter_free(iter);
 
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data);
        }
+
+       free(evt_cb_data);
 }
 
 static void on_response_get_network_selection_mode(GObject *source_object, GAsyncResult *res, gpointer user_data)
@@ -168,6 +172,8 @@ static void on_response_get_network_selection_mode(GObject *source_object, GAsyn
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &mode, evt_cb_data->user_data);
        }
+
+       free(evt_cb_data);
 }
 
 static void on_response_default_set(GObject *source_object, GAsyncResult *res, gpointer user_data)
@@ -187,6 +193,8 @@ static void on_response_default_set(GObject *source_object, GAsyncResult *res, g
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
        }
+
+       free(evt_cb_data);
 }
 
 static void on_response_get_network_preferred_plmn(GDBusConnection *conn, GAsyncResult *res, gpointer user_data)
@@ -217,6 +225,8 @@ static void on_response_get_network_preferred_plmn(GDBusConnection *conn, GAsync
                if (evt_cb_data->cb_fn) {
                        evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data);
                }
+
+               free(evt_cb_data);
                return;
        }
 
@@ -229,6 +239,8 @@ static void on_response_get_network_preferred_plmn(GDBusConnection *conn, GAsync
                if (evt_cb_data->cb_fn) {
                        evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data);
                }
+
+               free(evt_cb_data);
                return;
        }
 
@@ -249,13 +261,15 @@ static void on_response_get_network_preferred_plmn(GDBusConnection *conn, GAsync
                        }
                }
                i++;
-               g_variant_iter_free0(iter_row);
+               g_variant_iter_free(iter_row);
        }
-       g_variant_iter_free0(iter);
+       g_variant_iter_free(iter);
 
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data);
        }
+
+       free(evt_cb_data);
 }
 
 static void on_response_get_network_band(GObject *source_object, GAsyncResult *res, gpointer user_data)
@@ -277,6 +291,8 @@ static void on_response_get_network_band(GObject *source_object, GAsyncResult *r
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &band, evt_cb_data->user_data);
        }
+
+       free(evt_cb_data);
 }
 
 static void on_response_get_network_mode(GObject *source_object, GAsyncResult *res, gpointer user_data)
@@ -297,6 +313,8 @@ static void on_response_get_network_mode(GObject *source_object, GAsyncResult *r
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &mode, evt_cb_data->user_data);
        }
+
+       free(evt_cb_data);
 }
 
 static void on_response_get_network_service_domain(GObject *source_object, GAsyncResult *res, gpointer user_data)
@@ -317,6 +335,8 @@ static void on_response_get_network_service_domain(GObject *source_object, GAsyn
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &domain, evt_cb_data->user_data);
        }
+
+       free(evt_cb_data);
 }
 
 static void on_response_get_network_serving(GObject *source_object, GAsyncResult *res, gpointer user_data)
@@ -350,6 +370,8 @@ static void on_response_get_network_serving(GObject *source_object, GAsyncResult
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data);
        }
+
+       free(evt_cb_data);
 }
 
 EXPORT_API int tel_search_network(TapiHandle *handle, tapi_response_cb callback, void *user_data)
@@ -363,7 +385,7 @@ EXPORT_API int tel_search_network(TapiHandle *handle, tapi_response_cb callback,
        g_dbus_connection_call(handle->dbus_connection,
                        DBUS_TELEPHONY_SERVICE , handle->path, DBUS_TELEPHONY_NETWORK_INTERFACE,
                        "Search", NULL, NULL,
-                       G_DBUS_CALL_FLAGS_NONE, 60000, NULL,
+                       G_DBUS_CALL_FLAGS_NONE, 180000, NULL,
                        on_response_search_network, evt_cb_data);
 
        return TAPI_API_SUCCESS;

diff --git a/src/tapi_phonebook.c b/src/tapi_phonebook.c
index eed807c6e4b114c5d34270ac6f760026ecdcc27e..3b46c5bbdeb3fdb1ad0273806ef1f4c60c2bc6ab 100644 (file)
--- a/src/tapi_phonebook.c
+++ b/src/tapi_phonebook.c
@@ -172,9 +172,9 @@ static void on_response_get_sim_pb_usim_meta_info(GObject *source_object, GAsync
                        }
                }
                i++;
-               g_variant_iter_free0(iter_row);
+               g_variant_iter_free(iter_row);
        }
-       g_variant_iter_free0(iter);
+       g_variant_iter_free(iter);
 
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data);

diff --git a/src/tapi_sap.c b/src/tapi_sap.c
index 1941218b94a9f91d868fe7a8212e9a48cb3dbb1b..627bf4f0d185f24bc95b06c91af5c9536d210042 100644 (file)
--- a/src/tapi_sap.c
+++ b/src/tapi_sap.c
@@ -175,7 +175,7 @@ static void on_response_sap_transfer_atr(GObject *source_object, GAsyncResult *r
                        i++;
                }
                r_atr.atr_len = (int) i;
-               g_variant_iter_free0(iter);
+               g_variant_iter_free(iter);
                g_variant_unref(inner_gv);
                g_variant_unref(param_gv);
                /*              for(i=0; i < (int)r_atr.atr_len; i++)
@@ -237,7 +237,7 @@ static void on_response_sap_transfer_apdu(GObject *source_object, GAsyncResult *
                        i++;
                }
                r_apdu.apdu_len = (int) i;
-               g_variant_iter_free0(iter);
+               g_variant_iter_free(iter);
                g_variant_unref(inner_gv);
                g_variant_unref(param_gv);
                /*              for(i=0; i < (int)r_apdu.apdu_len; i++)

diff --git a/src/tapi_sat.c b/src/tapi_sat.c
index 6ab6bfa62b6ae979dbde16e233d385a7d626da25..f0c2e117f02f16ae4e7dbb9ae3783383d25c70fc 100644 (file)
--- a/src/tapi_sat.c
+++ b/src/tapi_sat.c
@@ -410,7 +410,7 @@ EXPORT_API int tel_get_sat_main_menu_info(TapiHandle *handle, TelSatSetupMenuInf
                        //dbg("item index(%d) id(%d) str(%s)",index, item_id, item_str);
                        index++;
                }
-               g_variant_iter_free0(iter);
+               g_variant_iter_free(iter);
        }
        pMainMenu->bIsSatMainMenuHelpInfo = (b_helpinfo ? 1 : 0);
        pMainMenu->bIsUpdatedSatMainMenu = (b_updated ? 1 : 0);

diff --git a/src/tapi_sim.c b/src/tapi_sim.c
index 4e5f68027246a28d0a1c4e5385fd4a631acb888f..48e0174e95a49fd778616e71150cece590122c96 100644 (file)
--- a/src/tapi_sim.c
+++ b/src/tapi_sim.c
@@ -256,9 +256,9 @@ static void on_response_get_sim_mailbox_info(GObject *source_object, GAsyncResul
                        }
                }
                i++;
-               g_variant_iter_free0(iter_row);
+               g_variant_iter_free(iter_row);
        }
-       g_variant_iter_free0(iter);
+       g_variant_iter_free(iter);
 
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data);
@@ -338,13 +338,13 @@ static void on_response_get_sim_msisdn(GObject *source_object, GAsyncResult *res
                        }
                }
                i++;
-               g_variant_iter_free0(iter_row);
+               g_variant_iter_free(iter_row);
                /*this can be changed regarding concept*/
                if (i == 3)
                        break;
                /*this can be changed regarding concept*/
        }
-       g_variant_iter_free0(iter);
+       g_variant_iter_free(iter);
 
        dbg("msisdn count[%d]", list.count);
        for(i =0; i < list.count; i++){
@@ -396,9 +396,9 @@ static void on_response_get_sim_oplmnwact(GObject *source_object, GAsyncResult *
                        }
                }
                i++;
-               g_variant_iter_free0(iter_row);
+               g_variant_iter_free(iter_row);
        }
-       g_variant_iter_free0(iter);
+       g_variant_iter_free(iter);
 
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data);
@@ -514,7 +514,7 @@ static void on_response_req_sim_authentication(GObject *source_object, GAsyncRes
                        i++;
                }
                auth_resp.authentication_key_length = i;
-               g_variant_iter_free0(iter);
+               g_variant_iter_free(iter);
                i = 0;
 
                cp = g_variant_get_variant(cp_gv);
@@ -525,7 +525,7 @@ static void on_response_req_sim_authentication(GObject *source_object, GAsyncRes
                        i++;
                }
                auth_resp.cipher_length = i;
-               g_variant_iter_free0(iter);
+               g_variant_iter_free(iter);
                i = 0;
 
                it = g_variant_get_variant(it_gv);
@@ -536,7 +536,7 @@ static void on_response_req_sim_authentication(GObject *source_object, GAsyncRes
                        i++;
                }
                auth_resp.integrity_length = i;
-               g_variant_iter_free0(iter);
+               g_variant_iter_free(iter);
                i = 0;
 
                resp = g_variant_get_variant(resp_gv);
@@ -547,7 +547,7 @@ static void on_response_req_sim_authentication(GObject *source_object, GAsyncRes
                        i++;
                }
                auth_resp.resp_length = i;
-               g_variant_iter_free0(iter);
+               g_variant_iter_free(iter);
                i = 0;
        }
        else {
@@ -763,7 +763,7 @@ static void on_response_req_sim_apdu(GObject *source_object, GAsyncResult *res,
                        i++;
                }
                r_apdu.apdu_resp_len = (unsigned char) i;
-               g_variant_iter_free0(iter);
+               g_variant_iter_free(iter);
                g_variant_unref(inner_gv);
                g_variant_unref(param_gv);
                /*              for(i=0; i < (int)r_apdu.apdu_resp_len; i++)
@@ -812,7 +812,7 @@ static void on_response_req_sim_atr(GObject *source_object, GAsyncResult *res, g
                        i++;
                }
                r_atr.atr_resp_len = (unsigned char) i;
-               g_variant_iter_free0(iter);
+               g_variant_iter_free(iter);
                g_variant_unref(inner_gv);
                g_variant_unref(param_gv);
                /*              for(i=0; i < (int)r_atr.atr_resp_len; i++)
@@ -983,9 +983,9 @@ EXPORT_API int tel_get_sim_ecc(TapiHandle *handle, TelSimEccList_t *ecc)
                                }
                        }
                        i++;
-                       g_variant_iter_free0(iter_row);
+                       g_variant_iter_free(iter_row);
                }
-               g_variant_iter_free0(iter);
+               g_variant_iter_free(iter);
        } else {
                dbg( "g_dbus_conn failed. error (%s)", gerr->message);
                g_error_free(gerr);

diff --git a/src/tapi_ss.c b/src/tapi_ss.c
index 448dcbab4bbfc8bc3b016a2df53c14946d8235a6..840a5fecc79781ccb3aca1fdd09f7f45fce4de79 100644 (file)
--- a/src/tapi_ss.c
+++ b/src/tapi_ss.c
@@ -21,6 +21,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "tapi_common.h"
 #include "TapiUtility.h"
@@ -53,6 +54,8 @@ static void on_response_get_ss_barring_status(GObject *source_object, GAsyncResu
                if (evt_cb_data->cb_fn) {
                        evt_cb_data->cb_fn(evt_cb_data->handle, -1, NULL, evt_cb_data->user_data);
                }
+
+               free(evt_cb_data);
                return;
        }
 
@@ -77,13 +80,15 @@ static void on_response_get_ss_barring_status(GObject *source_object, GAsyncResu
 
                }
                i++;
-               g_variant_iter_free0(iter_row);
+               g_variant_iter_free(iter_row);
        }
-       g_variant_iter_free0(iter);
+       g_variant_iter_free(iter);
 
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
        }
+
+       free(evt_cb_data);
 }
 
 static void on_response_change_ss_barring_password(GObject *source_object, GAsyncResult *res, gpointer user_data)
@@ -104,6 +109,7 @@ static void on_response_change_ss_barring_password(GObject *source_object, GAsyn
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
        }
 
+       free(evt_cb_data);
 }
 
 static void on_response_get_ss_forward_status(GObject *source_object, GAsyncResult *res, gpointer user_data)
@@ -158,14 +164,15 @@ static void on_response_get_ss_forward_status(GObject *source_object, GAsyncResu
 
                }
                i++;
-               g_variant_iter_free0(iter_row);
+               g_variant_iter_free(iter_row);
        }
-       g_variant_iter_free0(iter);
+       g_variant_iter_free(iter);
 
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
        }
 
+       free(evt_cb_data);
 }
 
 static void on_response_get_ss_waiting_status(GObject *source_object, GAsyncResult *res, gpointer user_data)
@@ -203,13 +210,15 @@ static void on_response_get_ss_waiting_status(GObject *source_object, GAsyncResu
                        }
                }
                i++;
-               g_variant_iter_free0(iter_row);
+               g_variant_iter_free(iter_row);
        }
-       g_variant_iter_free0(iter);
+       g_variant_iter_free(iter);
 
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
        }
+
+       free(evt_cb_data);
 }
 
 
@@ -233,6 +242,8 @@ static void on_response_get_ss_cli_status(GObject *source_object, GAsyncResult *
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
        }
+
+       free(evt_cb_data);
 }
 
 static void on_response_send_ss_ussd_request(GObject *source_object, GAsyncResult *res, gpointer user_data)
@@ -253,8 +264,7 @@ static void on_response_send_ss_ussd_request(GObject *source_object, GAsyncResul
 
        g_variant_get (dbus_result, "(iiiis)",  &result, &resp.Type, &resp.Status, &resp.Length, &tmp_str);
 
-
-       if ( !result ) {
+       if (!result) {
                memcpy( resp.szString, tmp_str, resp.Length );
                g_free(tmp_str);
        }
@@ -262,6 +272,8 @@ static void on_response_send_ss_ussd_request(GObject *source_object, GAsyncResul
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
        }
+
+       free(evt_cb_data);
 }
 
 EXPORT_API int tel_set_ss_barring(TapiHandle *handle, TelSsBarringInfo_t *info, tapi_response_cb callback, void *user_data)
@@ -293,7 +305,6 @@ EXPORT_API int tel_set_ss_barring(TapiHandle *handle, TelSsBarringInfo_t *info,
                        on_response_get_ss_barring_status, evt_cb_data );
 
        return TAPI_API_SUCCESS;
-
 }
 
 EXPORT_API int tel_get_ss_barring_status(TapiHandle *handle, TelSsClass_t class, TelSsBarringType_t type, tapi_response_cb callback, void *user_data)
@@ -349,7 +360,6 @@ EXPORT_API int tel_change_ss_barring_password(TapiHandle *handle,
                        on_response_change_ss_barring_password, evt_cb_data );
 
        return TAPI_API_SUCCESS;
-
 }
 
 /**********************************************************************************************
@@ -406,7 +416,6 @@ EXPORT_API int tel_set_ss_forward(TapiHandle *handle, const TelSsForwardInfo_t *
                        on_response_get_ss_forward_status, evt_cb_data );
 
        return TAPI_API_SUCCESS;
-
 }
 
 /**********************************************************************************************
@@ -437,7 +446,6 @@ EXPORT_API int tel_get_ss_forward_status(TapiHandle *handle, TelSsClass_t class,
                        on_response_get_ss_forward_status, evt_cb_data );
 
        return TAPI_API_SUCCESS;
-
 }
 
 /**********************************************************************************************
@@ -537,7 +545,6 @@ EXPORT_API int tel_get_ss_cli_status(TapiHandle *handle, TelSsCliType_t type, ta
                        on_response_get_ss_cli_status, evt_cb_data );
 
        return TAPI_API_SUCCESS;
-
 }
 
 /**********************************************************************************************
@@ -568,7 +575,6 @@ EXPORT_API int tel_send_ss_ussd_request(TapiHandle *handle, const TelSsUssdMsgIn
                        on_response_send_ss_ussd_request, evt_cb_data );
 
        return TAPI_API_SUCCESS;
-
 }
 
 /**********************************************************************************************