Code sync from tizen_2.4 33/42733/1
authorJiwan Kim <ji-wan.kim@samsung.com>
Thu, 2 Jul 2015 04:03:28 +0000 (13:03 +0900)
committerJiwan Kim <ji-wan.kim@samsung.com>
Thu, 2 Jul 2015 04:03:28 +0000 (13:03 +0900)
Change-Id: Id8cea45b148357bbe49dc24c1f3f842bbb056ae1

52 files changed:
doc/libtapi_doc.h
include/ITapiCall.h
include/ITapiModem.h
include/ITapiNetText.h
include/ITapiNetwork.h
include/ITapiPhonebook.h
include/ITapiSap.h
include/ITapiSat.h
include/ITapiSim.h
include/ITapiSs.h
include/TapiUtility.h
include/TelCall.h
include/TelMisc.h
include/TelNetwork.h
include/TelPower.h
include/TelSat.h
include/TelSatEnvelope.h
include/TelSatObj.h
include/TelSatProactvCmd.h
include/TelSim.h
include/TelSms.h
include/TelSs.h
include/tapi_common.h
include/tapi_event.h
include/tapi_type.h
packaging/libtapi.spec
src/common.h
src/tapi_call.c
src/tapi_common.c
src/tapi_log.h
src/tapi_modem.c
src/tapi_network.c
src/tapi_phonebook.c
src/tapi_sap.c
src/tapi_sat.c
src/tapi_sim.c
src/tapi_sms.c
src/tapi_ss.c
test_src/CMakeLists.txt
test_src/call.c
test_src/main.c
test_src/menu.c
test_src/menu.h
test_src/modem.c
test_src/network.c
test_src/phonebook.c
test_src/sat.c
test_src/sim.c
test_src/sms.c
test_src/sms_util.c
test_src/sms_util_cdma.c
test_src/ss.c

index 425c67c1f106affe2b3b51ca85fd512a1fafbca3..11a9273223c01d4f6cfcc033d6acaeb90157aafc 100644 (file)
@@ -22,7 +22,6 @@
 #define __TIZEN_TELEPHONY_SERVICE_DOC_H__
 
 /**
- * @internal
  * @ingroup CAPI_TELEPHONY_FRAMEWORK
  * @defgroup CAPI_TELEPHONY_SERVICE Telephony Service
  * @brief The Telephony Service module provides call, modem, network, phonebook, SAT, SIM, SMS, and SS services.
@@ -46,7 +45,6 @@
  */
 
 /**
- * @internal
  * @ingroup CAPI_TELEPHONY_SERVICE
  * @defgroup CAPI_TELEPHONY_SERVICE_CALL Call
  * @brief
@@ -77,7 +75,6 @@
  */
 
 /**
- * @internal
  * @ingroup CAPI_TELEPHONY_SERVICE
  * @defgroup CAPI_TELEPHONY_SERVICE_MODEM Modem
  * @brief
  */
 
 /**
- * @internal
  * @ingroup CAPI_TELEPHONY_SERVICE
  * @defgroup CAPI_TELEPHONY_SERVICE_NETWORK Network
  * @brief
  */
 
 /**
- * @internal
  * @ingroup CAPI_TELEPHONY_SERVICE
  * @defgroup CAPI_TELEPHONY_SERVICE_PHONEBOOK Phonebook
  * @brief
  */
 
 /**
- * @internal
  * @ingroup CAPI_TELEPHONY_SERVICE
  * @defgroup CAPI_TELEPHONY_SERVICE_SAT SAT
  * @brief
  */
 
 /**
- * @internal
  * @ingroup CAPI_TELEPHONY_SERVICE
  * @defgroup CAPI_TELEPHONY_SERVICE_SIM SIM
  * @brief
  */
 
 /**
- * @internal
  * @ingroup CAPI_TELEPHONY_SERVICE
  * @defgroup CAPI_TELEPHONY_SERVICE_SMS SMS
  * @brief
  */
 
 /**
- * @internal
  * @ingroup CAPI_TELEPHONY_SERVICE
  * @defgroup CAPI_TELEPHONY_SERVICE_SS Supplementary Service
  * @brief
index 490ccf353475a10b836c37714757db3cb82c630d..8cb696be0efd51ff6d204cb4524c30c0b42dcd90 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_CALL
  * @{
  */
index 742f493e1f50bd74519e63df23af39ec0b10d50c..74f151d1369d4c91e18b3dce71043fef16da2a13 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_MODEM
  * @{
  */
@@ -245,6 +244,30 @@ char *tel_get_misc_me_imei_sync(TapiHandle *handle);
  */
 int tel_check_modem_power_status(TapiHandle *handle, int *result);
 
+/**
+ * @brief Gets device vendor name and device name of cellular dongle.
+ *
+ * @details This function provides vendor and device name of cellular dongle.
+ *          Result can be delivered with only cellular dongle insertion.
+ *
+ * <b> Sync (or) Async: </b> This is an Asynchronous API.\n
+ *
+ * <b> Prospective Clients: </b> External Apps.
+ *
+ * @since_tizen 2.4
+ * @privlevel public
+ * @privilege %http://tizen.org/privilege/telephony
+ *
+ * @param[in] handle The handle from tel_init()
+ * @param[in] callback To register a callback function for result
+ * @param[in] user_data The user data for user specification
+ *
+ * @return The return type (int) \n
+ *         Integer '0' ( same with #TAPI_API_SUCCESS ): indicates that the operation is completed successfully. \n
+ *         Negative integer : It provides an error code (Refer #TapiResult_t).
+ */
+int tel_get_device_info(TapiHandle *handle, tapi_response_cb callback, void *user_data);
+
 #ifdef __cplusplus
 }
 #endif
index 65db6e7121b2d50728c7abb91f5f522284fffb85..9cbfe52687c25eda13fb7f48a6f79c559322bd1c 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_SMS
  * @{
  */
index 9b695bc5bdb58d98170619592fd8612165246e90..83dc81d73ab6999e330fb8083535ac7d8ba25e5e 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_NETWORK
  * @{
  */
index 70e6ef99558f09542703ff8b3adf3e383418a4f7..b1c7d25392a95e2fecb1484f0e7fcb4e38887019 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_PHONEBOOK
  * @{
  */
index a047bb7c1d277351b96ad3ceea850067f36e2d33..6fa6a129e98557fce9e361014867786deb7fd32e 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_SAP
  * @{
  */
index b6dc22a87eab1988686cfc4a07140cdfbb47e721..33a544d760c97aaed134275f6cf19f5ee653a7a8 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_SAT
  * @{
  */
index f0a8a18c067a466903b0477f0a08f7367081a1ef..8ac4b1057f185f06ff3a87c4fc1144153bc35587 100644 (file)
@@ -26,7 +26,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_SIM
  * @{
  */
index 41aee067ef2274dc25439690b0d9ac827b8422e5..be72a2ce257a76262da6d24da2dfce28d066fc29 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_SS
  * @{
  */
index 292af0248ce1cf41443d8482602ecc7dbb9f586f..d1a555b78af8abbba0f9dfac76fb869e5fc7bfc4 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE
  * @{
  */
index 7d38d189d5274d1e42a7b86ea795134fd1c29276..d943b14c8a9994cb394c61628f62f10f10545ac1 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_CALL
  * @{
  *
index d1af6fcc75220f5bee15ab6859267270d53f53e5..e153b0e4409103613358703cbd660d8597953385 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_MODEM
  * @{
  */
@@ -55,6 +54,7 @@ extern "C" {
 #define TAPI_MISC_MIN_LEN_MAX                          10
 #define TAPI_MISC_MDN_LEN_MAX                          15
 #define TAPI_MISC_NAME_LEN_MAX                         17
+#define TAPI_MISC_ME_DEVICE_NAME_LEN_MAX               32
 
 /**
  * @brief Enumeration for the MMI check key values.
@@ -345,6 +345,16 @@ typedef struct {
        unsigned long plmn; /**< Day of the week */
 } tapi_misc_time_zone_info_type;
 
+/**
+ * @brief The structure type for device info of cellular dongle.
+ * @since_tizen 2.4
+ */
+typedef struct {
+       unsigned char vendor_name[TAPI_MISC_ME_DEVICE_NAME_LEN_MAX+1]; /**< Vendor name */
+       unsigned char device_name[TAPI_MISC_ME_DEVICE_NAME_LEN_MAX+1]; /**< Device name */
+} TelMiscDeviceInfo_t;
+
+
 #ifdef __cplusplus
 }
 #endif
index 90a3076254dccabfad4ad20b506ec40610e7c31a..c9fa6fc8509d42bf2ead547eb79689c30a3df983 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_NETWORK
  * @{
  */
index c00b6a2a4e840ef1d6600fa87952fc75be777ed5..6869213bdc1c0ddf2de0305b82fde10154cec094 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_MODEM
  * @{
  */
index e88dcb5a928097353d878f2f9ed1970db693c95e..dee0c3e0f00ec75838eac973c88e37a187c3130a 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_SAT
  * @{
  */
index 24dc535f335dab58007683e12e6e09d7d28a8dec..835e68c79a462bf001ec996b592129cb93b87782 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_SAT
  * @{
  */
index 9de199add2d1a19ed5cefa10253d55b1b7e0842a..f51d5d1ece70c0a62e0eacb50f5ea119882f3a78 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_SAT
  * @{
  */
index 722fcb07151c96b812b0f9698addecc379b6357e..d65f2cb9d867fcbf3f9b3bd5174ad84865faa61d 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_SAT
  * @{
  */
index 22510f013bfadcdea77834a5f8f5d88b3076ea72..3f70af259765c667aa560d0804b570ebafa1a327 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_SIM
  * @{
  */
@@ -665,6 +664,16 @@ typedef enum {
        TAPI_PB_3G_PBC, /**< 1 byte control info and 1 byte hidden info */
 } TelSimPb3GFileType_t;
 
+/**
+ * @brief Enumeration for the phonebook operation types.
+ * @since_tizen 2.4
+ */
+typedef enum {
+       TAPI_PB_UPDATE, /**< Contact added or updated */
+       TAPI_PB_DELETE, /**< Existing contact deleted */
+       TAPI_PB_MAX, /**< MAX value */
+} TelSimPbOp_t;
+
 /**
  * @brief Enumeration for the list of SST services in the SIM Service Table (GSM).
  * @since_tizen 2.3
@@ -1620,6 +1629,16 @@ typedef struct {
        TelSimPb3GFileTypeCapabiltyInfo_t FileTypeInfo[TAPI_SIM_PB_3G_FILE_MAX_COUNT]; /**< Phonebook file type information */
 } TelSimPbCapabilityInfo_t;
 
+/**
+ * @brief The structure type for phonebook contact change informarion.
+ * @since_tizen 2.4
+ */
+typedef struct {
+       TelSimPbType_t pb_type; /**< Storage file type */
+       unsigned short index; /**< Changed index */
+       TelSimPbOp_t operation; /**< Phonebook operation */
+} TelSimPbContactChangeInfo_t;
+
 
 
 /* SAP (SIM Access Profile) related interface structures and enum */
index 819be5854e70af31e595defe66ef24a46fbf1c92..b96466e20cd56c0d53748be60faf83067fe68e05 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_SMS
  * @{
  */
index 6340912e13d06659d54c5efa0fb820752021c8cc..e393d0bd71a68979ba5eba3b3731ffa14d0832c7 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE_SS
  * @{
  */
index cc44d5985e90c2dedf288373f6ecc57bc5a0f62c..cca2d65f53f5fbcb53db777bdf849469bca570fa 100644 (file)
@@ -26,7 +26,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE
  * @{
  */
index 4d320bca56f28f4425f6699cd757991230277b62..aff7b1126e4cbd2b5fb0b26688e1e17ab427b653 100644 (file)
@@ -30,7 +30,6 @@ __BEGIN_DECLS
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE
  * @{
  */
@@ -78,6 +77,7 @@ __BEGIN_DECLS
 #define TAPI_NOTI_CALL_INFO_TRANSFERED                         DBUS_TELEPHONY_CALL_INTERFACE":Transfered"
 #define TAPI_NOTI_CALL_INFO_CF_CHECK_MESSAGE           DBUS_TELEPHONY_CALL_INTERFACE":CfCheckMessage"
 #define TAPI_NOTI_CALL_INFO_REC                                                DBUS_TELEPHONY_CALL_INTERFACE":CallInfoRec"
+#define TAPI_NOTI_CALL_INFO_FALLBACK                                   DBUS_TELEPHONY_CALL_INTERFACE:":CallFallback"
 #define TAPI_NOTI_CALL_PRIVACY_MODE                                    DBUS_TELEPHONY_CALL_INTERFACE":CallPrivacyMode"
 #define TAPI_NOTI_CALL_OTASP_STATUS                                    DBUS_TELEPHONY_CALL_INTERFACE":CallOtaspStatus"
 #define TAPI_NOTI_CALL_OTAPA_STATUS                                    DBUS_TELEPHONY_CALL_INTERFACE":CallOtapaStatus"
@@ -96,6 +96,8 @@ __BEGIN_DECLS
 #define DBUS_TELEPHONY_MODEM_INTERFACE                         DBUS_TELEPHONY_SERVICE".Modem"
 #define TAPI_NOTI_MODEM_POWER                                          DBUS_TELEPHONY_MODEM_INTERFACE":Power"
 #define TAPI_PROP_MODEM_POWER                                          DBUS_TELEPHONY_MODEM_INTERFACE":power"
+#define TAPI_PROP_MODEM_DONGLE_STATUS                          DBUS_TELEPHONY_MODEM_INTERFACE":dongle_status" /* Dongle inserted or not */
+#define TAPI_PROP_MODEM_DONGLE_LOGIN                           DBUS_TELEPHONY_MODEM_INTERFACE":dongle_login"  /* Dongle Login success or not */
 
 // SIM
 #define DBUS_TELEPHONY_SIM_INTERFACE                           DBUS_TELEPHONY_SERVICE".Sim"
@@ -123,6 +125,7 @@ __BEGIN_DECLS
 
 #define DBUS_TELEPHONY_PB_INTERFACE                                    DBUS_TELEPHONY_SERVICE".Phonebook"
 #define TAPI_NOTI_PB_STATUS                                                    DBUS_TELEPHONY_PB_INTERFACE":Status"
+#define TAPI_NOTI_PB_CONTACT_CHANGE                            DBUS_TELEPHONY_PB_INTERFACE":ContactChange"
 
 // Network
 #define DBUS_TELEPHONY_NETWORK_INTERFACE                       DBUS_TELEPHONY_SERVICE".Network"
index 7983e444a84f574b93e4731242275fe616d41394..804277fd095efe031a13ae781ce57e6d201f0c29 100644 (file)
@@ -26,7 +26,6 @@
  */
 
 /**
- * @internal
  * @addtogroup CAPI_TELEPHONY_SERVICE
  * @{
  */
index deafcd9caeb29899a449e2dca00446109bc91360..af0bfb410a23cb5635b8e25beef7d183bb2a67da 100644 (file)
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 7
-%define patchlevel 84
+%define patchlevel 91
 
 Name:           libtapi
 Version:        %{major}.%{minor}.%{patchlevel}
@@ -60,14 +60,14 @@ mkdir -p %{buildroot}%{_datadir}/license
 
 %files
 %manifest libtapi.manifest
-%defattr(-,root,root,-)
+%defattr(644,system,system,-)
 #%doc COPYING
 %{_libdir}/*.so.*
-%{_bindir}/tapitest
+%attr(755,system,system) %{_bindir}/tapitest
 %{_datadir}/license/libslp-tapi
 
 %files devel
-%defattr(-,root,root,-)
+%defattr(644,system,system,-)
 %{_includedir}/telephony-client/*.h
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.so
index d105a77b31da7473b5c21ce6ffe4ef1c17b2b18d..d33de69e06fa0f6477bf8ecb057a1d3d69224fd7 100644 (file)
@@ -71,7 +71,6 @@ struct tapi_handle {
        char *path;
        char *cp_name;
        GHashTable *evt_list;
-       char cookie[20];
        GCancellable *ca;
 
        GHashTable *cache_property;
index 9ff8f9b7eca21c8a72f9bd078fc5e06ac9157e7c..9e27d989707cd8f03240f9b54f99b87fee3343fd 100644 (file)
@@ -39,11 +39,11 @@ static void on_response_call_dial(GObject *source_object, GAsyncResult *res, gpo
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(i)", &result);
+       g_variant_get(dbus_result, "(i)", &result);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, 0, evt_cb_data->user_data);
@@ -62,11 +62,11 @@ static void on_response_call_answer(GObject *source_object, GAsyncResult *res, g
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(ii)", &result, &data.id);
+       g_variant_get(dbus_result, "(ii)", &result, &data.id);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data);
@@ -85,11 +85,11 @@ static void on_response_call_end(GObject *source_object, GAsyncResult *res, gpoi
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(iii)", &result, &data.id, &data.type);
+       g_variant_get(dbus_result, "(iii)", &result, &data.id, &data.type);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data);
@@ -108,11 +108,11 @@ static void on_response_call_hold(GObject *source_object, GAsyncResult *res, gpo
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(ii)", &result, &data.id);
+       g_variant_get(dbus_result, "(ii)", &result, &data.id);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data);
@@ -131,11 +131,11 @@ static void on_response_call_active(GObject *source_object, GAsyncResult *res, g
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(ii)", &result, &data.id);
+       g_variant_get(dbus_result, "(ii)", &result, &data.id);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data);
@@ -154,11 +154,11 @@ static void on_response_call_swap(GObject *source_object, GAsyncResult *res, gpo
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(ii)", &result, &data.id);
+       g_variant_get(dbus_result, "(ii)", &result, &data.id);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data);
@@ -177,11 +177,11 @@ static void on_response_call_join(GObject *source_object, GAsyncResult *res, gpo
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(ii)", &result, &data.id);
+       g_variant_get(dbus_result, "(ii)", &result, &data.id);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data);
@@ -200,11 +200,11 @@ static void on_response_call_split(GObject *source_object, GAsyncResult *res, gp
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(ii)", &result, &data.id);
+       g_variant_get(dbus_result, "(ii)", &result, &data.id);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data);
@@ -223,11 +223,11 @@ static void on_response_call_transfer(GObject *source_object, GAsyncResult *res,
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(ii)", &result, &data.id);
+       g_variant_get(dbus_result, "(ii)", &result, &data.id);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data);
@@ -245,11 +245,11 @@ static void on_response_call_dtmf(GObject *source_object, GAsyncResult *res, gpo
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(i)", &result);
+       g_variant_get(dbus_result, "(i)", &result);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, 0, evt_cb_data->user_data);
@@ -267,11 +267,11 @@ static void on_response_call_deflect(GObject *source_object, GAsyncResult *res,
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(i)", &result);
+       g_variant_get(dbus_result, "(i)", &result);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, 0, evt_cb_data->user_data);
@@ -290,11 +290,11 @@ static void on_response_get_call_privacy_mode(GObject *source_object, GAsyncResu
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(ii)", &result,&data.mode);
+       g_variant_get(dbus_result, "(ii)", &result, &data.mode);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data);
@@ -312,11 +312,11 @@ static void on_response_set_call_privacy_mode(GObject *source_object, GAsyncResu
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(i)", &result);
+       g_variant_get(dbus_result, "(i)", &result);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, 0, evt_cb_data->user_data);
@@ -340,24 +340,22 @@ static void on_response_get_call_volume_info(GObject *source_object, GAsyncResul
 
        memset(&resp, '\0', sizeof(TelCallGetVolumeInfoResp_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(aa{sv}i)", &iter, &result);
+       g_variant_get(dbus_result, "(aa{sv}i)", &iter, &result);
 
        resp.record_num = g_variant_iter_n_children(iter);
 
-       while ( g_variant_iter_next(iter, "a{sv}", &iter_row ) ) {
-               while ( g_variant_iter_loop( iter_row, "{sv}", &key, &value ) ) {
-
-                       if ( !g_strcmp0(key, "type") ) {
+       while (g_variant_iter_next(iter, "a{sv}", &iter_row)) {
+               while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
+                       if (!g_strcmp0(key, "type")) {
                                int type = g_variant_get_int32(value);
 
                                resp.record[i].device = (type & 0xf0);
                                resp.record[i].type = (type & 0x0f);
-                       }
-                       else if ( !g_strcmp0(key, "level") ) {
+                       } else if (!g_strcmp0(key, "level")) {
                                resp.record[i].volume = g_variant_get_int32(value);
                        }
                }
@@ -382,11 +380,11 @@ static void on_response_set_call_volume_info(GObject *source_object, GAsyncResul
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(i)", &result);
+       g_variant_get(dbus_result, "(i)", &result);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, 0, evt_cb_data->user_data);
@@ -404,11 +402,11 @@ static void on_response_set_call_sound_path(GObject *source_object, GAsyncResult
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(i)", &result);
+       g_variant_get(dbus_result, "(i)", &result);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, 0, evt_cb_data->user_data);
@@ -426,11 +424,11 @@ static void on_response_set_call_mute_status(GObject *source_object, GAsyncResul
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(i)", &result);
+       g_variant_get(dbus_result, "(i)", &result);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, 0, evt_cb_data->user_data);
@@ -449,11 +447,11 @@ static void on_response_get_call_mute_status(GObject *source_object, GAsyncResul
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(iii)", &result, &resp.path, &resp.status);
+       g_variant_get(dbus_result, "(iii)", &result, &resp.path, &resp.status);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
@@ -471,11 +469,11 @@ static void on_response_set_preferred_voice_subscription(GObject *source_object,
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(i)", &result);
+       g_variant_get(dbus_result, "(i)", &result);
 
        if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, 0, evt_cb_data->user_data);
@@ -503,13 +501,13 @@ EXPORT_API int tel_dial_call(TapiHandle *handle, const TelCallDial_t *pParams, t
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "Dial", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_call_dial, evt_cb_data );
+                       on_response_call_dial, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
 
-EXPORT_API int tel_answer_call(TapiHandle *handle, unsigned int CallHandle, TelCallAnswerType_t AnsType, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_answer_call(TapiHandle *handle, unsigned int CallHandle, TelCallAnswerType_t AnsType, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
        GVariant *param = 0;
@@ -523,13 +521,13 @@ EXPORT_API int tel_answer_call(TapiHandle *handle, unsigned int CallHandle, TelC
 
        param = g_variant_new("(ii)", CallHandle, AnsType);
 
-       msg("[%s] Request Answer. id:[%d], type:[%d]", handle->cp_name, CallHandle, AnsType);
+       msg("[%s] Request Answer. call_handle:[%d], type:[%d]", handle->cp_name, CallHandle, AnsType);
 
        g_dbus_connection_call(handle->dbus_connection,
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "Answer", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_call_answer, evt_cb_data );
+                       on_response_call_answer, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
@@ -548,18 +546,18 @@ EXPORT_API int tel_end_call(TapiHandle *handle, unsigned int CallHandle, TelCall
 
        param = g_variant_new("(ii)", CallHandle, EndType);
 
-       msg("[%s] Request End. id:[%d], type:[%d]", handle->cp_name, CallHandle, EndType);
+       msg("[%s] Request End. call_handle:[%d], type:[%d]", handle->cp_name, CallHandle, EndType);
 
        g_dbus_connection_call(handle->dbus_connection,
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "End", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_call_end, evt_cb_data );
+                       on_response_call_end, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_hold_call(TapiHandle *handle, unsigned int CallHandle, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_hold_call(TapiHandle *handle, unsigned int CallHandle, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
        GVariant *param = 0;
@@ -570,18 +568,18 @@ EXPORT_API int tel_hold_call(TapiHandle *handle, unsigned int CallHandle, tapi_r
 
        param = g_variant_new("(i)", CallHandle);
 
-       msg("[%s] Request Hold. id:[%d]", handle->cp_name, CallHandle);
+       msg("[%s] Request Hold. call_handle:[%d]", handle->cp_name, CallHandle);
 
        g_dbus_connection_call(handle->dbus_connection,
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "Hold", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_call_hold, evt_cb_data );
+                       on_response_call_hold, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_active_call(TapiHandle *handle, unsigned int CallHandle, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_active_call(TapiHandle *handle, unsigned int CallHandle, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
        GVariant *param = 0;
@@ -592,18 +590,18 @@ EXPORT_API int tel_active_call(TapiHandle *handle, unsigned int CallHandle, tapi
 
        param = g_variant_new("(i)", CallHandle);
 
-       msg("[%s] Request Active. id:[%d]", handle->cp_name, CallHandle);
+       msg("[%s] Request Active. call_handle:[%d]", handle->cp_name, CallHandle);
 
        g_dbus_connection_call(handle->dbus_connection,
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "Active", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_call_active, evt_cb_data );
+                       on_response_call_active, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_swap_call(TapiHandle *handle, unsigned int CallHandle1, unsigned int CallHandle2, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_swap_call(TapiHandle *handle, unsigned int CallHandle1, unsigned int CallHandle2, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
        GVariant *param = 0;
@@ -614,18 +612,18 @@ EXPORT_API int tel_swap_call(TapiHandle *handle, unsigned int CallHandle1, unsig
 
        param = g_variant_new("(i)", CallHandle1);
 
-       msg("[%s] Request Swap. id:[%d][%d]", handle->cp_name, CallHandle1, CallHandle2);
+       msg("[%s] Request Swap. call_handle:[%d][%d]", handle->cp_name, CallHandle1, CallHandle2);
 
        g_dbus_connection_call(handle->dbus_connection,
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "Swap", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_call_swap, evt_cb_data );
+                       on_response_call_swap, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_join_call(TapiHandle *handle, unsigned int CallHandle1, unsigned int CallHandle2, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_join_call(TapiHandle *handle, unsigned int CallHandle1, unsigned int CallHandle2, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
        GVariant *param = 0;
@@ -642,12 +640,12 @@ EXPORT_API int tel_join_call(TapiHandle *handle, unsigned int CallHandle1, unsig
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "Join", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_call_join, evt_cb_data );
+                       on_response_call_join, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_split_call(TapiHandle *handle, unsigned int CallHandle, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_split_call(TapiHandle *handle, unsigned int CallHandle, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
        GVariant *param = 0;
@@ -658,18 +656,18 @@ EXPORT_API int tel_split_call(TapiHandle *handle, unsigned int CallHandle, tapi_
 
        param = g_variant_new("(i)", CallHandle);
 
-       msg("[%s] Request Split. id:[%d]", handle->cp_name, CallHandle);
+       msg("[%s] Request Split. call_handle:[%d]", handle->cp_name, CallHandle);
 
        g_dbus_connection_call(handle->dbus_connection,
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "Split", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_call_split, evt_cb_data );
+                       on_response_call_split, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_transfer_call(TapiHandle *handle, unsigned int CallHandle, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_transfer_call(TapiHandle *handle, unsigned int CallHandle, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
        GVariant *param = 0;
@@ -680,18 +678,18 @@ EXPORT_API int tel_transfer_call(TapiHandle *handle, unsigned int CallHandle, ta
 
        param = g_variant_new("(i)", CallHandle);
 
-       msg("[%s] Request Transfer. id:[%d]", handle->cp_name, CallHandle);
+       msg("[%s] Request Transfer. call_handle:[%d]", handle->cp_name, CallHandle);
 
        g_dbus_connection_call(handle->dbus_connection,
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "Transfer", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_call_transfer, evt_cb_data );
+                       on_response_call_transfer, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_start_call_cont_dtmf(TapiHandle *handle, unsigned char dtmf_digit, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_start_call_cont_dtmf(TapiHandle *handle, unsigned char dtmf_digit, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
        GVariant *param = 0;
@@ -708,12 +706,12 @@ EXPORT_API int tel_start_call_cont_dtmf(TapiHandle *handle, unsigned char dtmf_d
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "StartContDtmf", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, G_MAXINT, handle->ca,
-                       on_response_call_dtmf, evt_cb_data );
+                       on_response_call_dtmf, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_stop_call_cont_dtmf(TapiHandle *handle, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_stop_call_cont_dtmf(TapiHandle *handle, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
 
@@ -727,12 +725,12 @@ EXPORT_API int tel_stop_call_cont_dtmf(TapiHandle *handle, tapi_response_cb call
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "StopContDtmf", NULL, 0,
                        G_DBUS_CALL_FLAGS_NONE, G_MAXINT, handle->ca,
-                       on_response_call_dtmf, evt_cb_data );
+                       on_response_call_dtmf, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_send_call_burst_dtmf(TapiHandle *handle, const TelCallBurstDtmf_t *info, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_send_call_burst_dtmf(TapiHandle *handle, const TelCallBurstDtmf_t *info, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
        GVariant *param = 0;
@@ -750,12 +748,12 @@ EXPORT_API int tel_send_call_burst_dtmf(TapiHandle *handle, const TelCallBurstDt
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "SendBurstDtmf", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, G_MAXINT, handle->ca,
-                       on_response_call_dtmf, evt_cb_data );
+                       on_response_call_dtmf, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_deflect_call(TapiHandle *handle, unsigned int CallHandle, const TelCallDeflectDstInfo_t *pInfo, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_deflect_call(TapiHandle *handle, unsigned int CallHandle, const TelCallDeflectDstInfo_t *pInfo, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
        GVariant *param = 0;
@@ -773,12 +771,12 @@ EXPORT_API int tel_deflect_call(TapiHandle *handle, unsigned int CallHandle, con
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "Deflect", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_call_deflect, evt_cb_data );
+                       on_response_call_deflect, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_get_call_status(TapiHandle *handle, int call_id, TelCallStatus_t *out )
+EXPORT_API int tel_get_call_status(TapiHandle *handle, int callHandle, TelCallStatus_t *out)
 {
        GVariant *gv = 0;
        GVariant *param = 0;
@@ -794,7 +792,7 @@ EXPORT_API int tel_get_call_status(TapiHandle *handle, int call_id, TelCallStatu
        TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR);
        TAPI_RET_ERR_NUM_IF_FAIL(out, TAPI_API_INVALID_PTR);
 
-       param = g_variant_new("(i)", call_id);
+       param = g_variant_new("(i)", callHandle);
 
        dbg("[%s] Func Entrance ", handle->cp_name);
 
@@ -802,12 +800,12 @@ EXPORT_API int tel_get_call_status(TapiHandle *handle, int call_id, TelCallStatu
                        DBUS_TELEPHONY_SERVICE , handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "GetStatus", param, 0, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca, &gerr);
 
-       if ( gv ) {
-               g_variant_get(gv, "(isibib)", &call_id, &call_number, &call_type, &call_direction, &call_state, &call_multiparty_state);
+       if (gv) {
+               g_variant_get(gv, "(isibibb)", &callHandle, &call_number, &call_type, &call_direction, &call_state, &call_multiparty_state);
 
-               out->CallHandle = (int)call_id;
+               out->CallHandle = (int)callHandle;
                out->bMoCall = (int)call_direction;
-               strncpy( out->pNumber, call_number, TAPI_CALL_DIALDIGIT_LEN_MAX );
+               strncpy(out->pNumber, call_number, TAPI_CALL_DIALDIGIT_LEN_MAX);
 
                dbg("[ check ] call_number : [%s] out->pNumber : [%s]", call_number, out->pNumber);
 
@@ -815,12 +813,12 @@ EXPORT_API int tel_get_call_status(TapiHandle *handle, int call_id, TelCallStatu
                out->CallState = (TelCallStates_t)call_state;
                out->bConferenceState = (int)call_multiparty_state;
 
-               g_free( call_number );
-               g_variant_unref (gv);
+               g_free(call_number);
+               g_variant_unref(gv);
                if (gerr)
-                       g_error_free (gerr);
+                       g_error_free(gerr);
        } else {
-               dbg("[ error ] fail to get call status : (0x%x)", call_id);
+               dbg("[ error ] fail to get call status : (0x%x)", callHandle);
                g_error_free(gerr);
                return TAPI_API_OPERATION_FAILED;
        }
@@ -828,7 +826,7 @@ EXPORT_API int tel_get_call_status(TapiHandle *handle, int call_id, TelCallStatu
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_get_call_status_all( TapiHandle *handle, TelCallStatusCallback cb, void *user_data )
+EXPORT_API int tel_get_call_status_all(TapiHandle *handle, TelCallStatusCallback cb, void *user_data)
 {
        GVariant *gv = 0;
        GVariantIter *iter = 0, *iter_row = 0;
@@ -843,7 +841,7 @@ EXPORT_API int tel_get_call_status_all( TapiHandle *handle, TelCallStatusCallbac
                                                                        DBUS_TELEPHONY_SERVICE , handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                                                                        "GetStatusAll", 0, 0, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca, &gerr);
 
-       if ( gv ) {
+       if (gv) {
 
                TelCallStatus_t data;
                gchar *key = 0;
@@ -852,36 +850,28 @@ EXPORT_API int tel_get_call_status_all( TapiHandle *handle, TelCallStatusCallbac
                g_variant_get(gv, "(aa{sv})", &iter);
 
                while (g_variant_iter_next(iter, "a{sv}", &iter_row)) {
-
                        while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
-
-                               if (!g_strcmp0(key, "call_id")) {
+                               if (!g_strcmp0(key, "call_id"))
                                        data.CallHandle = g_variant_get_int32(value);
-                               }
-                               else if (!g_strcmp0(key, "call_number")) {
+                               else if (!g_strcmp0(key, "call_number"))
                                        strncpy(data.pNumber, g_variant_get_string(value, 0), TAPI_CALL_DIALDIGIT_LEN_MAX);
-                               }
-                               else if (!g_strcmp0(key, "call_type")) {
+                               else if (!g_strcmp0(key, "call_type"))
                                        data.CallType = (int)g_variant_get_int32(value);
-                               }
-                               else if (!g_strcmp0(key, "call_direction")) {
+                               else if (!g_strcmp0(key, "call_direction"))
                                        data.bMoCall = (int)g_variant_get_boolean(value);
-                               }
-                               else if (!g_strcmp0(key, "call_state")) {
+                               else if (!g_strcmp0(key, "call_state"))
                                        data.CallState = (int)g_variant_get_int32(value);
-                               }
-                               else if (!g_strcmp0(key, "call_multiparty_state")) {
+                               else if (!g_strcmp0(key, "call_multiparty_state"))
                                        data.bConferenceState = (int)g_variant_get_boolean(value);
-                               }
                        }
                        g_variant_iter_free(iter_row);
 
-                       cb( &data, user_data );
+                       cb(&data, user_data);
                }
                g_variant_iter_free(iter);
-               g_variant_unref (gv);
+               g_variant_unref(gv);
                if (gerr)
-                       g_error_free (gerr);
+                       g_error_free(gerr);
        } else {
                if (strstr(gerr->message, "No access rights")) {
                        err("Permission denied");
@@ -895,7 +885,7 @@ EXPORT_API int tel_get_call_status_all( TapiHandle *handle, TelCallStatusCallbac
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_get_call_privacy_mode(TapiHandle *handle, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_get_call_privacy_mode(TapiHandle *handle, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
 
@@ -909,12 +899,12 @@ EXPORT_API int tel_get_call_privacy_mode(TapiHandle *handle, tapi_response_cb ca
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "GetPrivacyMode", 0, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_get_call_privacy_mode, evt_cb_data );
+                       on_response_get_call_privacy_mode, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_set_call_privacy_mode(TapiHandle *handle, TelCallPrivacyMode_t privacy_mode, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_set_call_privacy_mode(TapiHandle *handle, TelCallPrivacyMode_t privacy_mode, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
        GVariant *pParam = 0;
@@ -931,12 +921,12 @@ EXPORT_API int tel_set_call_privacy_mode(TapiHandle *handle, TelCallPrivacyMode_
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "SetPrivacyMode", pParam, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_set_call_privacy_mode, evt_cb_data );
+                       on_response_set_call_privacy_mode, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_get_call_volume_info(TapiHandle *handle, TelSoundDevice_t device, TelSoundType_t type, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_get_call_volume_info(TapiHandle *handle, TelSoundDevice_t device, TelSoundType_t type, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
        GVariant *param = 0;
@@ -953,12 +943,12 @@ EXPORT_API int tel_get_call_volume_info(TapiHandle *handle, TelSoundDevice_t dev
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "GetSoundVolumeLevel", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_get_call_volume_info, evt_cb_data );
+                       on_response_get_call_volume_info, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_set_call_volume_info(TapiHandle *handle, TelCallVolumeInfo_t *info, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_set_call_volume_info(TapiHandle *handle, TelCallVolumeInfo_t *info, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
        GVariant *param = 0;
@@ -977,12 +967,12 @@ EXPORT_API int tel_set_call_volume_info(TapiHandle *handle, TelCallVolumeInfo_t
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "SetSoundVolumeLevel", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_set_call_volume_info, evt_cb_data );
+                       on_response_set_call_volume_info, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_set_call_sound_path(TapiHandle *handle, TelCallSoundPathInfo_t *info, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_set_call_sound_path(TapiHandle *handle, TelCallSoundPathInfo_t *info, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
        GVariant *param = 0;
@@ -1000,12 +990,12 @@ EXPORT_API int tel_set_call_sound_path(TapiHandle *handle, TelCallSoundPathInfo_
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "SetSoundPath", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_set_call_sound_path, evt_cb_data );
+                       on_response_set_call_sound_path, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_set_call_mute_status(TapiHandle *handle, TelSoundMuteStatus_t mute, TelSoundMutePath_t path, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_set_call_mute_status(TapiHandle *handle, TelSoundMuteStatus_t mute, TelSoundMutePath_t path, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
        GVariant *param = 0;
@@ -1022,12 +1012,12 @@ EXPORT_API int tel_set_call_mute_status(TapiHandle *handle, TelSoundMuteStatus_t
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "SetSoundMuteStatus", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_set_call_mute_status, evt_cb_data );
+                       on_response_set_call_mute_status, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_get_call_mute_status(TapiHandle *handle, tapi_response_cb callback, void *user_data )
+EXPORT_API int tel_get_call_mute_status(TapiHandle *handle, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = 0;
 
@@ -1042,7 +1032,7 @@ EXPORT_API int tel_get_call_mute_status(TapiHandle *handle, tapi_response_cb cal
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_CALL_INTERFACE,
                        "GetSoundMuteStatus", 0, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_get_call_mute_status, evt_cb_data );
+                       on_response_get_call_mute_status, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
index d1eb146d0d01b7ce193fad4e24de1a0fbdd7cefc..ba6ce94d7545714cdecbd3a24ac67e58eebe5972 100644 (file)
@@ -39,9 +39,6 @@
 #include "common.h"
 #include "tapi_log.h"
 
-extern char *g_cookie_name;
-extern int g_cookie_size;
-
 TelSatEventDownloadType_t g_event_list[TAPI_SAT_EVENT_LIST_MAX_COUNT] = {-1};
 
 static void _process_sms_event(const gchar *sig, GVariant *param,
@@ -51,8 +48,8 @@ static void _process_sms_event(const gchar *sig, GVariant *param,
 
        if (!g_strcmp0(sig, "IncommingMsg")) {
                struct tel_noti_sms_incomming_msg noti;
-               guchardecoded_sca = NULL;
-               guchardecoded_tpdu = NULL;
+               guchar *decoded_sca = NULL;
+               guchar *decoded_tpdu = NULL;
 
                gchar *sca = NULL;
                gchar *tpdu = NULL;
@@ -65,17 +62,22 @@ static void _process_sms_event(const gchar *sig, GVariant *param,
 
                g_variant_get(param, "(isis)", &noti.format, &sca, &msg_len, &tpdu);
 
-               decoded_sca = g_base64_decode((const gchar*)sca, &decoded_sca_len);
-               decoded_tpdu = g_base64_decode((const gchar*)tpdu, &decoded_tpdu_len);
-
+               decoded_sca = g_base64_decode((const gchar *)sca, &decoded_sca_len);
+               decoded_tpdu = g_base64_decode((const gchar *)tpdu, &decoded_tpdu_len);
+               if (NULL == decoded_tpdu) {
+                       err("g_base64_decode: Failed to decode tpdu");
+                       return;
+               }
                dbg("ds :%d, dt : %d, ml :%d", decoded_sca_len, decoded_tpdu_len, msg_len);
-               if(TAPI_SIM_SMSP_ADDRESS_LEN < decoded_sca_len)
+               if (TAPI_SIM_SMSP_ADDRESS_LEN < decoded_sca_len)
                        decoded_sca_len = TAPI_SIM_SMSP_ADDRESS_LEN;
 
-               if(TAPI_NETTEXT_SMDATA_SIZE_MAX+1 <decoded_tpdu_len)
+               if (TAPI_NETTEXT_SMDATA_SIZE_MAX+1 < decoded_tpdu_len)
                        decoded_tpdu_len = TAPI_NETTEXT_SMDATA_SIZE_MAX+1;
 
-               memcpy(noti.Sca, decoded_sca, decoded_sca_len);
+               if (decoded_sca)
+                       memcpy(noti.Sca, decoded_sca, decoded_sca_len);
+
                memcpy(noti.szData, decoded_tpdu, decoded_tpdu_len);
 
                noti.MsgLength = msg_len;
@@ -86,22 +88,25 @@ static void _process_sms_event(const gchar *sig, GVariant *param,
                g_free(decoded_tpdu);
 
                CALLBACK_CALL(&noti);
-       }
-       else if (!g_strcmp0(sig, "IncommingCbMsg")) {
+       } else if (!g_strcmp0(sig, "IncommingCbMsg")) {
                struct tel_noti_sms_incomming_cb_msg noti = {0};
                gchar *cb_msg = NULL;
 
-               guchar * decoded_cbmsg = NULL;
+               guchar *decoded_cbmsg = NULL;
                gsize decoded_cbmsg_len = 0;
                int cb_msg_len = 0;
 
                g_variant_get(param, "(iis)", &noti.CbMsgType, &cb_msg_len, &cb_msg);
 
                decoded_cbmsg = g_base64_decode(cb_msg, &decoded_cbmsg_len);
+               if (NULL == decoded_cbmsg) {
+                       err("g_base64_decode: Failed to decode cbmsg");
+                       return;
+               }
 
                dbg("dt : %d, ml :%d", decoded_cbmsg_len, cb_msg_len);
 
-               if(TAPI_NETTEXT_CB_SIZE_MAX+1 <decoded_cbmsg_len)
+               if (TAPI_NETTEXT_CB_SIZE_MAX+1 < decoded_cbmsg_len)
                        decoded_cbmsg_len = TAPI_NETTEXT_CB_SIZE_MAX+1;
 
                memcpy(&(noti.szMsgData[0]), decoded_cbmsg, decoded_cbmsg_len);
@@ -112,8 +117,7 @@ static void _process_sms_event(const gchar *sig, GVariant *param,
                g_free(decoded_cbmsg);
 
                CALLBACK_CALL(&noti);
-       }
-       else if (!g_strcmp0(sig, "IncommingEtwsMsg")) {
+       } else if (!g_strcmp0(sig, "IncommingEtwsMsg")) {
                struct tel_noti_sms_incomming_etws_msg noti;
 
                GVariant *etwsMsg = NULL;
@@ -125,11 +129,11 @@ static void _process_sms_event(const gchar *sig, GVariant *param,
                memset(&noti, 0, sizeof(struct tel_noti_sms_incomming_etws_msg));
                g_variant_get(param, "(ii@v)", &noti.EtwsMsgType, &noti.Length, &etwsMsg);
 
-               inner_gv = g_variant_get_variant( etwsMsg );
+               inner_gv = g_variant_get_variant(etwsMsg);
                g_variant_get(inner_gv, "ay", &iter);
-               while( g_variant_iter_loop( iter, "y", &noti.szMsgData[i] ) ) {
+               while (g_variant_iter_loop(iter, "y", &noti.szMsgData[i])) {
                         i++;
-                        if( i >= TAPI_NETTEXT_ETWS_SIZE_MAX + 1 )
+                        if (i >= TAPI_NETTEXT_ETWS_SIZE_MAX + 1)
                                 break;
                }
                g_variant_iter_free(iter);
@@ -137,20 +141,17 @@ static void _process_sms_event(const gchar *sig, GVariant *param,
                g_variant_unref(inner_gv);
 
                CALLBACK_CALL(&noti);
-       }
-       else if (!g_strcmp0(sig, "MemoryStatus")) {
+       } else if (!g_strcmp0(sig, "MemoryStatus")) {
                int noti = 0;
 
                g_variant_get(param, "(i)", &noti);
                CALLBACK_CALL(&noti);
-       }
-       else if (!g_strcmp0(sig, "SmsReady")) {
+       } else if (!g_strcmp0(sig, "SmsReady")) {
                gint noti = 0;
 
                g_variant_get(param, "(i)", &noti);
                CALLBACK_CALL(&noti);
-       }
-       else {
+       } else {
                dbg("not handled Sms noti[%s]", sig);
        }
 }
@@ -160,43 +161,38 @@ static void _process_call_event(const gchar *sig, GVariant *param,
 {
        TAPI_RETURN_IF_FAIL(evt_cb_data);
 
-       if (!g_strcmp0(sig, "VoiceCallStatusIdle") || !g_strcmp0(sig, "VideoCallStatusIdle") ) {
+       if (!g_strcmp0(sig, "VoiceCallStatusIdle") || !g_strcmp0(sig, "VideoCallStatusIdle")) {
                TelCallStatusIdleNoti_t data;
                int start_time = 0, end_time = 0;
                g_variant_get(param, "(iiii)", &data.id, &data.cause, &start_time, &end_time);
-               msg("[ check ] (%s) %s : call_id(%d), end_cause(0x%x)", handle->cp_name, "Status Idle noti", data.id, data.cause);
+               msg("[ check ] (%s) %s : call_handle(%d), end_cause(0x%x)", handle->cp_name, "Status Idle noti", data.id, data.cause);
                CALLBACK_CALL(&data);
-       }
-       else if (!g_strcmp0(sig, "VoiceCallStatusDialing") || !g_strcmp0(sig, "VideoCallStatusDialing")) {
+       } else if (!g_strcmp0(sig, "VoiceCallStatusDialing") || !g_strcmp0(sig, "VideoCallStatusDialing")) {
                TelCallStatusDialingNoti_t data;
                g_variant_get(param, "(i)", &data.id);
-               msg("[ check ] (%s) %s : call_id(%d)", handle->cp_name, "Status Dialing noti", data.id);
+               msg("[ check ] (%s) %s : call_handle(%d)", handle->cp_name, "Status Dialing noti", data.id);
                CALLBACK_CALL(&data);
-       }
-       else if (!g_strcmp0(sig, "VoiceCallStatusAlert") || !g_strcmp0(sig, "VideoCallStatusAlert")) {
+       } else if (!g_strcmp0(sig, "VoiceCallStatusAlert") || !g_strcmp0(sig, "VideoCallStatusAlert")) {
                TelCallStatusAlertNoti_t data;
                g_variant_get(param, "(i)", &data.id);
-               msg("[ check ] (%s) %s : call_id(%d)", handle->cp_name, "Status Alert noti", data.id);
+               msg("[ check ] (%s) %s : call_handle(%d)", handle->cp_name, "Status Alert noti", data.id);
                CALLBACK_CALL(&data);
-       }
-       else if (!g_strcmp0(sig, "VoiceCallStatusActive") || !g_strcmp0(sig, "VideoCallStatusActive")) {
+       } else if (!g_strcmp0(sig, "VoiceCallStatusActive") || !g_strcmp0(sig, "VideoCallStatusActive")) {
                TelCallStatusActiveNoti_t data;
                g_variant_get(param, "(i)", &data.id);
-               msg("[ check ] (%s) %s : call_id(%d)", handle->cp_name, "Status Active noti", data.id);
+               msg("[ check ] (%s) %s : call_handle(%d)", handle->cp_name, "Status Active noti", data.id);
                CALLBACK_CALL(&data);
-       }
-       else if (!g_strcmp0(sig, "VoiceCallStatusHeld") ) {
+       } else if (!g_strcmp0(sig, "VoiceCallStatusHeld")) {
                TelCallStatusHeldNoti_t data;
                g_variant_get(param, "(i)", &data.id);
-               msg("[ check ] (%s) %s : call_id(%d)", handle->cp_name, "Status Held noti", data.id);
+               msg("[ check ] (%s) %s : call_handle(%d)", handle->cp_name, "Status Held noti", data.id);
                CALLBACK_CALL(&data);
-       }
-       else if (!g_strcmp0(sig, "VoiceCallStatusIncoming") || !g_strcmp0(sig, "VideoCallStatusIncoming")) {
+       } else if (!g_strcmp0(sig, "VoiceCallStatusIncoming") || !g_strcmp0(sig, "VideoCallStatusIncoming")) {
                TelCallIncomingCallInfo_t data;
                gchar *number = NULL;
                gchar *name = NULL;
 
-               memset((void*)&data, 0, sizeof(TelCallIncomingCallInfo_t));
+               memset((void *)&data, 0, sizeof(TelCallIncomingCallInfo_t));
                g_variant_get(param, "(iiisbis)",
                                &data.CallHandle,
                                &data.CliMode,
@@ -213,7 +209,7 @@ static void _process_call_event(const gchar *sig, GVariant *param,
                        memcpy(data.CallingNameInfo.szNameData, name, strlen(name));
                        g_free(name);
                }
-               msg("[ check ] %s : call_id(%d)", "Status Incoming noti", data.CallHandle);
+               msg("[ check ] %s : call_handle(%d)", "Status Incoming noti", data.CallHandle);
                msg("[ check ] %s : cli_mode(%d)", "Status Incoming noti", data.CliMode);
                msg("[ check ] %s : cli_cause(%d)", "Status Incoming noti", data.CliCause);
                msg("[ check ] %s : cli_number(%s)", "Status Incoming noti", data.szCallingPartyNumber);
@@ -222,109 +218,94 @@ static void _process_call_event(const gchar *sig, GVariant *param,
                msg("[ check ] %s : call_name(%s)", "Status Incoming noti", data.CallingNameInfo.szNameData);
 
                CALLBACK_CALL(&data);
-       }
-       else if (!g_strcmp0(sig, "Waiting")) {
+       } else if (!g_strcmp0(sig, "Waiting")) {
                TelCallInfoWaitingNoti_t data;
                g_variant_get(param, "(i)", &data.id);
                msg("[ check ] (%s) %s : data.id(%d)", handle->cp_name, "Call Info Waiting noti", data.id);
                CALLBACK_CALL(&data.id);
-       }
-       else if (!g_strcmp0(sig, "Forwarded")) {
+       } else if (!g_strcmp0(sig, "Forwarded")) {
                TelCallInfoForwardedNoti_t data;
                g_variant_get(param, "(i)", &data.id);
                msg("[ check ] (%s) %s : data.id(%d)", handle->cp_name, "Call Info Forwarded noti", data.id);
                CALLBACK_CALL(&data.id);
-       }
-       else if (!g_strcmp0(sig, "ForwardedCall")) {
+       } else if (!g_strcmp0(sig, "ForwardedCall")) {
                TelCallInfoForwardedCallNoti_t data;
                g_variant_get(param, "(i)", &data.id);
                dbg("[ check ] (%s) %s : data.id(%d)", handle->cp_name, "Call Info Forwarded Call noti", data.id);
                CALLBACK_CALL(&data.id);
-       }
-       else if (!g_strcmp0(sig, "BarredIncoming")) {
+       } else if (!g_strcmp0(sig, "BarredIncoming")) {
                TelCallInfoBarredIncomingNoti_t data;
                g_variant_get(param, "(i)", &data.id);
                msg("[ check ] (%s) %s : data.id(%d)", handle->cp_name, "Call Info Barred Incoming noti", data.id);
                CALLBACK_CALL(&data.id);
-       }
-       else if (!g_strcmp0(sig, "BarredOutgoing")) {
+       } else if (!g_strcmp0(sig, "BarredOutgoing")) {
                TelCallInfoBarredOutgoingNoti_t data;
                g_variant_get(param, "(i)", &data.id);
                msg("[ check ] (%s) %s : data.id(%d)", handle->cp_name, "Call Info Barred Outgoing noti", data.id);
                CALLBACK_CALL(&data.id);
-       }
-       else if (!g_strcmp0(sig, "ForwardConditional")) {
+       } else if (!g_strcmp0(sig, "ForwardConditional")) {
                TelCallInfoForwardConditionalNoti_t data;
                g_variant_get(param, "(i)", &data.id);
                msg("[ check ] (%s) %s : data.id(%d)", handle->cp_name, "Call Info Forward Conditional noti", data.id);
                CALLBACK_CALL(&data.id);
-       }
-       else if (!g_strcmp0(sig, "ForwardUnconditional")) {
+       } else if (!g_strcmp0(sig, "ForwardUnconditional")) {
                TelCallInfoForwardUnconditionalNoti_t data;
                g_variant_get(param, "(i)", &data.id);
                msg("[ check ] (%s) %s : data.id(%d)", handle->cp_name, "Call Info Forward Unconditional noti", data.id);
                CALLBACK_CALL(&data.id);
-       }
-       else if (!g_strcmp0(sig, "CallActive")) {
+       } else if (!g_strcmp0(sig, "CallActive")) {
                TelCallInfoActiveNoti_t data;
                g_variant_get(param, "(i)", &data.id);
                msg("[ check ] (%s) %s : data.id(%d)", handle->cp_name, "Call Info Call Active noti", data.id);
                CALLBACK_CALL(&data.id);
-       }
-       else if (!g_strcmp0(sig, "CallHeld")) {
+       } else if (!g_strcmp0(sig, "CallHeld")) {
                TelCallInfoHeldNoti_t data;
                g_variant_get(param, "(i)", &data.id);
                msg("[ check ] (%s) %s : data.id(%d)", handle->cp_name, "Call Info Call Held noti", data.id);
                CALLBACK_CALL(&data.id);
-       }
-       else if (!g_strcmp0(sig, "CallJoined")) {
+       } else if (!g_strcmp0(sig, "CallJoined")) {
                TelCallInfoJoinedNoti_t data;
                g_variant_get(param, "(i)", &data.id);
                msg("[ check ] (%s) %s : data.id(%d)", handle->cp_name, "Call Info Call Joined noti", data.id);
                CALLBACK_CALL(&data.id);
-       }
-       else if (!g_strcmp0(sig, "CallPrivacyMode")) {
+       } else if (!g_strcmp0(sig, "CallPrivacyMode")) {
                TelCallVoicePrivacyNoti_t data;
                g_variant_get(param, "(i)", &data.privacy_mode);
                msg("[ check ] %s (%s): data.privacy_mode(%d) ", "Call Privacy Info noti", handle->cp_name, data.privacy_mode);
                CALLBACK_CALL(&data);
-       }
-       else if (!g_strcmp0(sig, "CallOtaspStatus")) {
+       } else if (!g_strcmp0(sig, "CallOtaspStatus")) {
                TelCallOtaspStatusNoti_t otasp;
                g_variant_get(param, "(i)", &otasp.otasp_status);
                msg("[ check ] %s (%s): otasp_status(%d)", "Call OTASP Status ", handle->cp_name, otasp.otasp_status);
                CALLBACK_CALL(&otasp);
-       }
-       else if (!g_strcmp0(sig, "CallOtapaStatus")) {
+       } else if (!g_strcmp0(sig, "CallOtapaStatus")) {
                TelCallOtapaStatusNoti_t otapa;
                g_variant_get(param, "(i)", &otapa.otapa_status);
                msg("[ check ] %s : otapa_status(%d)", "Call OTAPA Status ", otapa.otapa_status);
                CALLBACK_CALL(&otapa);
-       }
-       else if (!g_strcmp0(sig, "CallSignalInfo")) {
+       } else if (!g_strcmp0(sig, "CallSignalInfo")) {
                TelCallSignalInfoNoti_t signal_info;
                unsigned int signal;
                g_variant_get(param, "(iii)", &signal_info.signal_type, &signal_info.pitch_type, &signal);
                msg("[ check ] %s (%s): Signal type(%d) Pitch type(%d)  Signal (%d)", "Call Alert Signal Info ", handle->cp_name, signal_info.signal_type, signal_info.pitch_type, signal);
                 if (signal_info.signal_type == TAPI_CALL_SIGNAL_TYPE_TONE) {
                        signal_info.signal.sig_tone_type = signal;
-               } else if(signal_info.signal_type == TAPI_CALL_SIGNAL_TYPE_ISDN_ALERTING) {
+               } else if (signal_info.signal_type == TAPI_CALL_SIGNAL_TYPE_ISDN_ALERTING) {
                        signal_info.signal.sig_isdn_alert_type = signal;
-               } else if(signal_info.signal_type == TAPI_CALL_SIGNAL_TYPE_IS54B_ALERTING) {
+               } else if (signal_info.signal_type == TAPI_CALL_SIGNAL_TYPE_IS54B_ALERTING) {
                        signal_info.signal.sig_is54b_alert_type = signal;
                } else {
                        err("Unknown Signal type");
                        return;
                }
                CALLBACK_CALL(&signal_info);
-       }
-       else if (!g_strcmp0(sig, "CallInfoRec")) {
+       } else if (!g_strcmp0(sig, "CallInfoRec")) {
                TelCallRecordInfoNoti_t noti;
                gchar *data = NULL;
 
                memset(&noti, '\0', sizeof(TelCallRecordInfoNoti_t));
                g_variant_get(param, "(iis)", &noti.info.id, &noti.info.type, &data);
-               if(noti.info.type == TAPI_CALL_REC_INFO_TYPE_NAME) {
+               if (noti.info.type == TAPI_CALL_REC_INFO_TYPE_NAME) {
                        strncpy(noti.info.data.name, data, TAPI_CALLING_NAME_SIZE_MAX);
                        msg("[ check ] %s (%s): id(%d) type(%d) name(%s)", "CallInfoRec", handle->cp_name,
                                noti.info.id, noti.info.type, noti.info.data.name);
@@ -336,44 +317,37 @@ static void _process_call_event(const gchar *sig, GVariant *param,
 
                CALLBACK_CALL(&noti);
                g_free(data);
-       }
-       else if (!g_strcmp0(sig, "CallSoundPath")) {
+       } else if (!g_strcmp0(sig, "CallSoundPath")) {
                TelCallSoundPathNoti_t data;
                g_variant_get(param, "(i)", &data.path);
                msg("[ check ] (%s) %s : path(%d)", handle->cp_name, "Call Sound Path noti", data.path);
                CALLBACK_CALL(&data);
-       }
-       else if (!g_strcmp0(sig, "CallSoundRingbackTone")) {
+       } else if (!g_strcmp0(sig, "CallSoundRingbackTone")) {
                TelCallSoundRingbackToneNoti_t status;
                g_variant_get(param, "(i)", &status);
                msg("[ check ] (%s) %s : status(%d)", handle->cp_name, "Call Sound Ringbacktone noti", status);
                CALLBACK_CALL(&status);
-       }
-       else if (!g_strcmp0(sig, "CallSoundWbamr")) {
+       } else if (!g_strcmp0(sig, "CallSoundWbamr")) {
                TelCallSoundWbamrNoti_t status;
                g_variant_get(param, "(i)", &status);
                msg("[ check ] (%s) %s : status(%d)", handle->cp_name, "Call Sound Wbamr noti", status);
                CALLBACK_CALL(&status);
-       }
-       else if (!g_strcmp0(sig, "CallSoundNoiseReduction")) {
+       } else if (!g_strcmp0(sig, "CallSoundNoiseReduction")) {
                TelCallSoundNoiseReductionNoti_t data;
                g_variant_get(param, "(i)", &data.status);
                msg("[ check ] (%s) %s : status(%d)", handle->cp_name, "Call Sound Noise Reduction noti", data.status);
                CALLBACK_CALL(&data);
-       }
-       else if (!g_strcmp0(sig, "CallSoundClockStatus")) {
+       } else if (!g_strcmp0(sig, "CallSoundClockStatus")) {
                gboolean data;
                g_variant_get(param, "(b)", &data);
                msg("[ check ] (%s) %s : status(%d)", handle->cp_name, "Call Sound Clock Status noti", data);
                CALLBACK_CALL(&data);
-       }
-       else if (!g_strcmp0(sig, "CallPreferredVoiceSubscription")) {
+       } else if (!g_strcmp0(sig, "CallPreferredVoiceSubscription")) {
                TelCallPreferredVoiceSubsNoti_t data;
                g_variant_get(param, "(i)", &data.preferred_subs);
                dbg("[ check ] %s : Voice preferred_subs(%d)", "Call Preferred Voice Subscription noti", data.preferred_subs);
                CALLBACK_CALL(&data);
-       }
-       else {
+       } else {
                dbg("not handled Call noti[%s]", sig);
        }
 }
@@ -427,18 +401,20 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                memcpy(setup_menu.satMainTitle, title, TAPI_SAT_DEF_TITLE_LEN_MAX+1);
                g_free(title);
                setup_menu.satMainMenuNum = item_cnt;
-               if(items && item_cnt > 0){
+               if (items && item_cnt > 0) {
                        gchar *item_str;
                        gint item_id;
                        unbox = g_variant_get_variant(items);
                        dbg("items(%p) items type_format(%s)", items, g_variant_get_type_string(unbox));
 
                        g_variant_get(unbox, "a(si)", &iter);
-                       while(g_variant_iter_loop(iter,"(si)",&item_str, &item_id)){
+                       while (g_variant_iter_loop(iter, "(si)", &item_str, &item_id)) {
                                setup_menu.satMainMenuItem[sat_index].itemId = item_id;
-                               memcpy(setup_menu.satMainMenuItem[sat_index].itemString, item_str, TAPI_SAT_DEF_ITEM_STR_LEN_MAX + 6);
-                               dbg("item index(%d) id(%d) str(%s)",sat_index, setup_menu.satMainMenuItem[sat_index].itemId, setup_menu.satMainMenuItem[sat_index].itemString);
-                               //dbg("item index(%d) id(%d) str(%s)",index, item_id, item_str);
+                               memcpy(setup_menu.satMainMenuItem[sat_index].itemString,
+                                       item_str, TAPI_SAT_DEF_ITEM_STR_LEN_MAX + 6);
+                               dbg("item index(%d) id(%d) str(%s)", sat_index,
+                                       setup_menu.satMainMenuItem[sat_index].itemId,
+                                       setup_menu.satMainMenuItem[sat_index].itemString);
                                sat_index++;
                        }
                        g_variant_iter_free(iter);
@@ -447,12 +423,12 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                setup_menu.bIsUpdatedSatMainMenu = (b_updated ? 1 : 0);
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-               if(icon_id) {
+               if (icon_id) {
                        unbox = g_variant_get_variant(icon_id);
                        g_variant_get(unbox, "a(biiiiiis)", &iter);
 
-                       while(g_variant_iter_loop(iter,"(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)){
-                               if(!is_exist)
+                       while (g_variant_iter_loop(iter, "(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
+                               if (!is_exist)
                                        break;
                                setup_menu.iconId.bIsPresent = is_exist;
                                setup_menu.iconId.iconQualifier = icon_quali;
@@ -460,7 +436,7 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                                setup_menu.iconId.iconInfo.width = width;
                                setup_menu.iconId.iconInfo.height = height;
                                setup_menu.iconId.iconInfo.ics = ics;
-                               if(icon_data_len > 0) {
+                               if (icon_data_len > 0) {
                                        setup_menu.iconId.iconInfo.iconDataLen = icon_data_len;
                                        memcpy(setup_menu.iconId.iconInfo.iconFile, icon_data, icon_data_len);
                                }
@@ -470,12 +446,12 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                        g_variant_iter_free(iter);
                }
 
-               if(icon_list){
+               if (icon_list) {
                        unbox_list = g_variant_get_variant(icon_list);
                        g_variant_get(unbox_list, "a(biiv)", &iter);
 
-                       while(g_variant_iter_loop(iter,"(biiv)", &is_list_exist, &icon_list_quali, &list_cnt, &icon_list_info)){
-                               if(!is_list_exist)
+                       while (g_variant_iter_loop(iter, "(biiv)", &is_list_exist, &icon_list_quali, &list_cnt, &icon_list_info)) {
+                               if (!is_list_exist)
                                        break;
                                setup_menu.iconIdList.bIsPresent = is_list_exist;
                                setup_menu.iconIdList.iconListQualifier = icon_list_quali;
@@ -484,12 +460,12 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                                unbox_list_info = g_variant_get_variant(icon_list_info);
                                g_variant_get(unbox_list_info, "a(iiiiis)", &iter2);
 
-                               while(g_variant_iter_loop(iter2,"(iiiiis)",&icon_list_identifier, &list_width, &list_height, &list_ics, &icon_list_data_len, &icon_list_data)){
-                                       setup_menu.iconIdList.iconIdentifierList[icon_index]= icon_identifier;
+                               while (g_variant_iter_loop(iter2, "(iiiiis)", &icon_list_identifier, &list_width, &list_height, &list_ics, &icon_list_data_len, &icon_list_data)) {
+                                       setup_menu.iconIdList.iconIdentifierList[icon_index] = icon_identifier;
                                        setup_menu.iconIdList.iconInfo[icon_index].width = list_width;
                                        setup_menu.iconIdList.iconInfo[icon_index].height = list_height;
                                        setup_menu.iconIdList.iconInfo[icon_index].ics = list_ics;
-                                       if(icon_list_data_len > 0) {
+                                       if (icon_list_data_len > 0) {
                                                setup_menu.iconIdList.iconInfo[icon_index].iconDataLen = icon_list_data_len;
                                                memcpy(setup_menu.iconIdList.iconInfo[icon_index].iconFile, icon_list_data, icon_list_data_len);
                                        }
@@ -511,10 +487,9 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                        setup_menu.iconId.iconInfo.height, setup_menu.iconId.iconInfo.ics, setup_menu.iconId.iconInfo.iconDataLen);
 
                CALLBACK_CALL(&setup_menu);
-       }
-       else if (!g_strcmp0(sig, "DisplayText")) {
+       } else if (!g_strcmp0(sig, "DisplayText")) {
                TelSatDisplayTextInd_t display_text;
-               gchartext;
+               gchar *text;
                gint command_id, text_len, duration;
                gboolean high_priority, user_rsp_required, immediately_rsp;
 
@@ -545,12 +520,12 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                display_text.b_immediately_resp = (immediately_rsp ? 1 : 0);
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-               if(icon_id) {
+               if (icon_id) {
                        unbox = g_variant_get_variant(icon_id);
                        g_variant_get(unbox, "a(biiiiiis)", &iter);
 
-                       while(g_variant_iter_loop(iter,"(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
-                               if(!is_exist)
+                       while (g_variant_iter_loop(iter, "(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
+                               if (!is_exist)
                                        break;
                                display_text.iconId.bIsPresent = is_exist;
                                display_text.iconId.iconQualifier = icon_quali;
@@ -558,7 +533,7 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                                display_text.iconId.iconInfo.width = width;
                                display_text.iconId.iconInfo.height = height;
                                display_text.iconId.iconInfo.ics = ics;
-                               if(icon_data_len > 0) {
+                               if (icon_data_len > 0) {
                                        display_text.iconId.iconInfo.iconDataLen = icon_data_len;
                                        memcpy(display_text.iconId.iconInfo.iconFile, icon_data, icon_data_len);
                                }
@@ -577,13 +552,12 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                dbg("immediately response (%d)", display_text.b_immediately_resp);
 
                CALLBACK_CALL(&display_text);
-       }
-       else if (!g_strcmp0(sig, "SelectItem")) {
+       } else if (!g_strcmp0(sig, "SelectItem")) {
                TelSatSelectItemInd_t select_item;
 
                gboolean help_info ;
                gchar *selected_text;
-               gint command_id, default_item_id, menu_cnt, text_len =0;
+               gint command_id, default_item_id, menu_cnt, text_len = 0;
                GVariant *menu_items;
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                GVariantIter *iter, *iter2;
@@ -621,14 +595,14 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                select_item.text.stringLen = text_len;
                select_item.defaultItemIndex = default_item_id;
                select_item.menuItemCount = menu_cnt;
-               if(menu_items && menu_cnt > 0){
+               if (menu_items && menu_cnt > 0) {
                        gchar *item_str;
                        gint item_id, item_len;
                        unbox = g_variant_get_variant(menu_items);
                        dbg("items(%p) items type_format(%s)", menu_items, g_variant_get_type_string(unbox));
 
                        g_variant_get(unbox, "a(iis)", &iter);
-                       while(g_variant_iter_loop(iter,"(iis)",&item_id, &item_len, &item_str)){
+                       while (g_variant_iter_loop(iter, "(iis)", &item_id, &item_len, &item_str)) {
                                select_item.menuItem[select_item_index].itemId = item_id;
                                select_item.menuItem[select_item_index].textLen = item_len;
                                memcpy(select_item.menuItem[select_item_index].text, item_str, TAPI_SAT_ITEM_TEXT_LEN_MAX + 1);
@@ -640,12 +614,12 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                }
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-               if(icon_id) {
+               if (icon_id) {
                        unbox = g_variant_get_variant(icon_id);
                        g_variant_get(unbox, "a(biiiiiis)", &iter);
 
-                       while(g_variant_iter_loop(iter,"(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
-                               if(!is_exist)
+                       while (g_variant_iter_loop(iter, "(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
+                               if (!is_exist)
                                        break;
                                select_item.iconId.bIsPresent = is_exist;
                                select_item.iconId.iconQualifier = icon_quali;
@@ -653,7 +627,7 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                                select_item.iconId.iconInfo.width = width;
                                select_item.iconId.iconInfo.height = height;
                                select_item.iconId.iconInfo.ics = ics;
-                               if(icon_data_len > 0) {
+                               if (icon_data_len > 0) {
                                        select_item.iconId.iconInfo.iconDataLen = icon_data_len;
                                        memcpy(select_item.iconId.iconInfo.iconFile, icon_data, icon_data_len);
                                }
@@ -663,12 +637,12 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                        g_variant_iter_free(iter);
                }
 
-               if(icon_list){
+               if (icon_list) {
                        unbox_list = g_variant_get_variant(icon_list);
                        g_variant_get(unbox_list, "a(biiv)", &iter);
 
-                       while(g_variant_iter_loop(iter,"(biiv)", &is_list_exist, &icon_list_quali, &list_cnt, &icon_list_info)) {
-                               if(!is_list_exist)
+                       while (g_variant_iter_loop(iter, "(biiv)", &is_list_exist, &icon_list_quali, &list_cnt, &icon_list_info)) {
+                               if (!is_list_exist)
                                        break;
                                select_item.iconIdList.bIsPresent = is_list_exist;
                                select_item.iconIdList.iconListQualifier = icon_list_quali;
@@ -677,12 +651,12 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                                unbox_list_info = g_variant_get_variant(icon_list_info);
                                g_variant_get(unbox_list_info, "a(iiiiis)", &iter2);
 
-                               while(g_variant_iter_loop(iter2,"(iiiiis)",&icon_list_identifier, &list_width, &list_height, &list_ics, &icon_list_data_len, &icon_list_data)){
-                                       select_item.iconIdList.iconIdentifierList[icon_index]= icon_identifier;
+                               while (g_variant_iter_loop(iter2, "(iiiiis)", &icon_list_identifier, &list_width, &list_height, &list_ics, &icon_list_data_len, &icon_list_data)) {
+                                       select_item.iconIdList.iconIdentifierList[icon_index] = icon_identifier;
                                        select_item.iconIdList.iconInfo[icon_index].width = list_width;
                                        select_item.iconIdList.iconInfo[icon_index].height = list_height;
                                        select_item.iconIdList.iconInfo[icon_index].ics = list_ics;
-                                       if(icon_list_data_len > 0) {
+                                       if (icon_list_data_len > 0) {
                                                select_item.iconIdList.iconInfo[icon_index].iconDataLen = icon_list_data_len;
                                                memcpy(select_item.iconIdList.iconInfo[icon_index].iconFile, icon_list_data, icon_list_data_len);
                                        }
@@ -701,8 +675,7 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                dbg("item count(%d)", select_item.menuItemCount);
 
                CALLBACK_CALL(&select_item);
-       }
-       else if (!g_strcmp0(sig, "GetInkey")) {
+       } else if (!g_strcmp0(sig, "GetInkey")) {
                TelSatGetInkeyInd_t get_inkey;
 
                gint command_id, key_type, input_character_mode;
@@ -721,10 +694,10 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                g_variant_get(param, "(iiibbsii@v)", &command_id, &key_type, &input_character_mode,
-                       &b_numeric,&b_help_info, &text, &text_len, &duration, &icon_id);
+                       &b_numeric, &b_help_info, &text, &text_len, &duration, &icon_id);
 #else
                g_variant_get(param, "(iiibbsii)", &command_id, &key_type, &input_character_mode,
-                       &b_numeric,&b_help_info, &text, &text_len, &duration);
+                       &b_numeric, &b_help_info, &text, &text_len, &duration);
 #endif
                get_inkey.commandId = command_id;
                get_inkey.keyType = key_type;
@@ -737,12 +710,12 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                get_inkey.duration = duration;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-               if(icon_id) {
+               if (icon_id) {
                        unbox = g_variant_get_variant(icon_id);
                        g_variant_get(unbox, "a(biiiiiis)", &iter);
 
-                       while(g_variant_iter_loop(iter,"(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
-                               if(!is_exist)
+                       while (g_variant_iter_loop(iter, "(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
+                               if (!is_exist)
                                        break;
                                get_inkey.iconId.bIsPresent = is_exist;
                                get_inkey.iconId.iconQualifier = icon_quali;
@@ -750,7 +723,7 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                                get_inkey.iconId.iconInfo.width = width;
                                get_inkey.iconId.iconInfo.height = height;
                                get_inkey.iconId.iconInfo.ics = ics;
-                               if(icon_data_len > 0) {
+                               if (icon_data_len > 0) {
                                        get_inkey.iconId.iconInfo.iconDataLen = icon_data_len;
                                        memcpy(get_inkey.iconId.iconInfo.iconFile, icon_data, icon_data_len);
                                }
@@ -770,8 +743,7 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                dbg("duration", get_inkey.duration);
 
                CALLBACK_CALL(&get_inkey);
-       }
-       else if (!g_strcmp0(sig, "GetInput")) {
+       } else if (!g_strcmp0(sig, "GetInput")) {
                TelSatGetInputInd_t get_input;
 
                gint command_id, input_character_mode;
@@ -810,12 +782,12 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                get_input.defaultText.stringLen = def_text_len;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-               if(icon_id) {
+               if (icon_id) {
                        unbox = g_variant_get_variant(icon_id);
                        g_variant_get(unbox, "a(biiiiiis)", &iter);
 
-                       while(g_variant_iter_loop(iter,"(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
-                               if(!is_exist)
+                       while (g_variant_iter_loop(iter, "(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
+                               if (!is_exist)
                                        break;
                                get_input.iconId.bIsPresent = is_exist;
                                get_input.iconId.iconQualifier = icon_quali;
@@ -823,7 +795,7 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                                get_input.iconId.iconInfo.width = width;
                                get_input.iconId.iconInfo.height = height;
                                get_input.iconId.iconInfo.ics = ics;
-                               if(icon_data_len > 0) {
+                               if (icon_data_len > 0) {
                                        get_input.iconId.iconInfo.iconDataLen = icon_data_len;
                                        memcpy(get_input.iconId.iconInfo.iconFile, icon_data, icon_data_len);
                                }
@@ -846,14 +818,13 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                dbg("default text length(%d)", get_input.defaultText.stringLen);
 
                CALLBACK_CALL(&get_input);
-       }
-       else if (!g_strcmp0(sig, "SendSMS")) {
+       } else if (!g_strcmp0(sig, "SendSMS")) {
                TelSatSendSmsIndSmsData_t send_sms;
 
                gint command_id, ton, npi, tpdu_type;
                gboolean b_packing_required;
                gint text_len, number_len, tpdu_data_len;
-               gchartext = NULL, *dialling_number = NULL;
+               gchar *text = NULL, *dialling_number = NULL;
                GVariant *tpdu_data;
 
                memset(&send_sms, 0, sizeof(TelSatSendSmsIndSmsData_t));
@@ -874,7 +845,7 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                send_sms.smsTpdu.tpduType = tpdu_type;
                send_sms.smsTpdu.dataLen = tpdu_data_len;
 
-               if(tpdu_data){
+               if (tpdu_data) {
                        int send_sms_index = 0;
                        guchar data;
                        GVariantIter *iter = NULL;
@@ -884,7 +855,7 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                        dbg("tpdu data exist type_format(%s)", g_variant_get_type_string(inner_gv));
 
                        g_variant_get(inner_gv, "ay", &iter);
-                       while( g_variant_iter_loop (iter, "y", &data)){
+                       while (g_variant_iter_loop(iter, "y", &data)) {
                                dbg("index(%d) data(%c)", send_sms_index, data);
                                send_sms.smsTpdu.data[send_sms_index] = data;
                                send_sms_index++;
@@ -903,8 +874,7 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                dbg("tpdu length (%d)", send_sms.smsTpdu.dataLen);
 
                CALLBACK_CALL(&send_sms);
-       }
-       else if (!g_strcmp0(sig, "SetupEventList")) {
+       } else if (!g_strcmp0(sig, "SetupEventList")) {
                int g_index = 0;
                gint event_cnt;
                GVariant *evt_list;
@@ -914,7 +884,7 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
 
                g_variant_get(param, "(i@v)", &event_cnt, &evt_list);
 
-               if(evt_list){
+               if (evt_list) {
                        guchar data;
                        GVariantIter *iter = NULL;
                        GVariant *inner_gv = NULL;
@@ -923,29 +893,23 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                        dbg("event list exist type_format(%s)", g_variant_get_type_string(inner_gv));
 
                        g_variant_get(inner_gv, "ai", &iter);
-                       while( g_variant_iter_loop (iter, "i", &data)){
+                       while (g_variant_iter_loop(iter, "i", &data)) {
                                dbg("g_index(%d) event(%d)", g_index, data);
                                g_event_list[g_index] = data;
 
-                               if(data == TAPI_EVENT_SAT_DW_TYPE_IDLE_SCREEN_AVAILABLE){
+                               if (data == TAPI_EVENT_SAT_DW_TYPE_IDLE_SCREEN_AVAILABLE)
                                        event_list.bIsIdleScreenAvailable = 1;
-                               }
-                               else if(data == TAPI_EVENT_SAT_DW_TYPE_LANGUAGE_SELECTION){
+                               else if (data == TAPI_EVENT_SAT_DW_TYPE_LANGUAGE_SELECTION)
                                        event_list.bIsLanguageSelection = 1;
-                               }
-                               else if(data == TAPI_EVENT_SAT_DW_TYPE_BROWSER_TERMINATION){
+                               else if (data == TAPI_EVENT_SAT_DW_TYPE_BROWSER_TERMINATION)
                                        event_list.bIsBrowserTermination = 1;
-                               }
-                               else if(data == TAPI_EVENT_SAT_DW_TYPE_DATA_AVAILABLE){
+                               else if (data == TAPI_EVENT_SAT_DW_TYPE_DATA_AVAILABLE)
                                        event_list.bIsDataAvailable = 1;
-                               }
-                               else if(data == TAPI_EVENT_SAT_DW_TYPE_CHANNEL_STATUS){
+                               else if (data == TAPI_EVENT_SAT_DW_TYPE_CHANNEL_STATUS)
                                        event_list.bIsChannelStatus = 1;
-                               }
 
                                g_index++;
-                       }
-                       //while end
+                       } /* while end */
                        g_variant_iter_free(iter);
                        g_variant_unref(inner_gv);
                }
@@ -953,12 +917,11 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                dbg("event list cnt(%d)", event_cnt);
 
                CALLBACK_CALL(&event_list);
-       }
-       else if (!g_strcmp0(sig, "Refresh")) {
+       } else if (!g_strcmp0(sig, "Refresh")) {
                TelSatRefreshInd_t refresh_info;
 
                gint command_id = 0;
-               gint refresh_type =0;
+               gint refresh_type = 0;
                gint file_cnt = 0;
                GVariant *file_list = NULL;
 
@@ -969,7 +932,7 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                refresh_info.commandId = command_id;
                refresh_info.refreshMode = refresh_type;
 
-               if(file_list){
+               if (file_list) {
                        int g_index = 0;
                        guchar data;
                        GVariantIter *iter = NULL;
@@ -979,14 +942,14 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                        dbg("file list exist type_format(%s)", g_variant_get_type_string(inner_gv));
 
                        g_variant_get(inner_gv, "ai", &iter);
-                       while( g_variant_iter_loop (iter, "i", &data)){
+                       while (g_variant_iter_loop(iter, "i", &data)) {
                                dbg("g_index(%d) file id(%d)", g_index, data);
                                refresh_info.fileId[g_index] = data;
                                g_index++;
                        }
                        file_cnt = g_index;
 
-                       //while end
+                       /* while end */
                        g_variant_iter_free(iter);
                        g_variant_unref(inner_gv);
                }
@@ -995,8 +958,7 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                dbg("refresh event/file cnt(%d)", refresh_info.fileCount);
 
                CALLBACK_CALL(&refresh_info);
-       }
-       else if (!g_strcmp0(sig, "SendDtmf")) {
+       } else if (!g_strcmp0(sig, "SendDtmf")) {
                TelSatSendDtmfIndDtmfData_t send_dtmf;
 
                gint command_id = 0;
@@ -1020,18 +982,16 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                dbg("dtmf event dtmf(%s)", send_dtmf.dtmfString.string);
 
                CALLBACK_CALL(&send_dtmf);
-       }
-       else if (!g_strcmp0(sig, "EndProactiveSession")) {
+       } else if (!g_strcmp0(sig, "EndProactiveSession")) {
                int command_type = 0;
 
                g_variant_get(param, "(i)", &command_type);
                dbg("end session evt : command type(%d)", command_type);
                CALLBACK_CALL(&command_type);
-       }
-       else if (!g_strcmp0(sig, "CallControlResult")) {
+       } else if (!g_strcmp0(sig, "CallControlResult")) {
                TelSatCallCtrlIndData_t call_ctrl_result_ind;
                gint call_ctrl_result = 0, disp_len = 0;
-               gint bc_repeat_indicator = 0, ton = 0x0F, npi=0X0F;
+               gint bc_repeat_indicator = 0, ton = 0x0F, npi = 0X0F;
                gchar *text = NULL, *call_num = NULL, *ss_string = NULL, *sub_addr = NULL, *ccp1 = NULL, *ccp2 = NULL;
 
                memset(&call_ctrl_result_ind, 0x00, sizeof(TelSatCallCtrlIndData_t));
@@ -1040,15 +1000,16 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                        &ss_string, &sub_addr, &ccp1, &ccp2, &bc_repeat_indicator);
 
                call_ctrl_result_ind.callCtrlResult = call_ctrl_result;
-               disp_len = strlen(text); //alpha id
-               if(disp_len >1) {
+               disp_len = strlen(text); /* alpha id */
+               if (disp_len > 1) {
                        call_ctrl_result_ind.dispData.stringLen = disp_len;
                        memcpy(&call_ctrl_result_ind.dispData.string, text, disp_len);
                        call_ctrl_result_ind.bIsUserInfoDisplayEnabled = 1;
                }
                g_free(text);
 
-               if(strlen(call_num) > 1 && (g_strcmp0(call_num,"") != 0) ){
+               if (strlen(call_num) > 1 && (g_strcmp0(call_num, "") != 0)) {
+                       /* Call number exist */
                        call_ctrl_result_ind.callCtrlCnfType = TAPI_SAT_CALL_TYPE_MO_VOICE;
                        call_ctrl_result_ind.u.callCtrlCnfCallData.address.stringLen = strlen(call_num);
                        memcpy(&call_ctrl_result_ind.u.callCtrlCnfCallData.address.string, call_num, strlen(call_num));
@@ -1059,8 +1020,8 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                        call_ctrl_result_ind.u.callCtrlCnfCallData.ccp1.stringLen = strlen(ccp2);
                        memcpy(&call_ctrl_result_ind.u.callCtrlCnfCallData.ccp1.string, ccp2, strlen(ccp2));
                        call_ctrl_result_ind.u.callCtrlCnfCallData.bcRepeatIndicator = bc_repeat_indicator;
-               }//call number exist
-               else if( strlen(ss_string) > 1 && (g_strcmp0(ss_string,"") != 0) ){
+               } else if (strlen(ss_string) > 1 && (g_strcmp0(ss_string, "") != 0)) {
+                       /* SS string exist */
                        call_ctrl_result_ind.callCtrlCnfType = TAPI_SAT_CALL_TYPE_SS;
                        call_ctrl_result_ind.u.callCtrlCnfSsData.ssString.stringLen = strlen(ss_string);
                        memcpy(&call_ctrl_result_ind.u.callCtrlCnfSsData.ssString.string, ss_string, strlen(ss_string));
@@ -1071,8 +1032,7 @@ static void _process_sat_event(const gchar *sig, GVariant *param,
                        call_ctrl_result_ind.u.callCtrlCnfSsData.ccp1.stringLen = strlen(ccp2);
                        memcpy(&call_ctrl_result_ind.u.callCtrlCnfSsData.ccp1.string, ccp2, strlen(ccp2));
                        call_ctrl_result_ind.u.callCtrlCnfSsData.bcRepeatIndicator = bc_repeat_indicator;
-               }//ss string exist
-               else{
+               } else {
                        dbg("not matched call control");
                        goto EXIT;
                }
@@ -1085,10 +1045,9 @@ EXIT:
                g_free(ccp1);
                g_free(ccp2);
                g_free(ss_string);
-       }
-       else if (!g_strcmp0(sig, "MoSmControlResult")) {
+       } else if (!g_strcmp0(sig, "MoSmControlResult")) {
                TelSatMoSmCtrlIndData_t mo_sm_ctrl_result_ind;
-               gint call_ctrl_result = 0 ,disp_len = 0;
+               gint call_ctrl_result = 0 , disp_len = 0;
                gint rp_dst_ton = 0x0F, rp_dst_npi = 0X0F, tp_dst_ton = 0x0F, tp_dst_npi = 0X0F;
                gchar *text = NULL, *rp_dst_call_num = NULL, *tp_dst_call_num = NULL;
 
@@ -1097,25 +1056,25 @@ EXIT:
                g_variant_get(param, "(isiisiis)", &call_ctrl_result, &text,
                        &rp_dst_ton, &rp_dst_npi, &rp_dst_call_num, &tp_dst_ton, &tp_dst_npi, &tp_dst_call_num);
 
-               mo_sm_ctrl_result_ind.moSmsCtrlResult= call_ctrl_result;
-               disp_len = strlen(text); //alpha id
-               if(disp_len >1) {
+               mo_sm_ctrl_result_ind.moSmsCtrlResult = call_ctrl_result;
+               disp_len = strlen(text); /* alpha id */
+               if (disp_len > 1) {
                        mo_sm_ctrl_result_ind.dispData.stringLen = disp_len;
                        memcpy(&mo_sm_ctrl_result_ind.dispData.string, text, disp_len);
                        mo_sm_ctrl_result_ind.bIsUserInfoDisplayEnabled = 1;
                }
 
-               if(strlen(rp_dst_call_num) > 1 && (g_strcmp0(rp_dst_call_num,"") != 0) ){
+               if (strlen(rp_dst_call_num) > 1 && (g_strcmp0(rp_dst_call_num, "") != 0)) {
+                       /* RP DST Call number exist */
                        mo_sm_ctrl_result_ind.tpDestAddr.bIsDigitOnly = 1;
                        mo_sm_ctrl_result_ind.rpDestAddr.stringLen = strlen(rp_dst_call_num);
                        memcpy(&mo_sm_ctrl_result_ind.rpDestAddr.string, rp_dst_call_num, strlen(rp_dst_call_num));
-               }// rp dst call number exist
-               else if( strlen(tp_dst_call_num) > 1 && (g_strcmp0(tp_dst_call_num,"") != 0) ){
+               } else if (strlen(tp_dst_call_num) > 1 && (g_strcmp0(tp_dst_call_num, "") != 0)) {
+                       /* TP DST Call number exist */
                        mo_sm_ctrl_result_ind.tpDestAddr.bIsDigitOnly = 1;
                        mo_sm_ctrl_result_ind.tpDestAddr.stringLen = strlen(tp_dst_call_num);
                        memcpy(&mo_sm_ctrl_result_ind.tpDestAddr.string, tp_dst_call_num, strlen(tp_dst_call_num));
-               }//tp dst call number exist
-               else{
+               } else {
                        dbg("Any destination address are not provided, use default one.");
                }
                g_free(text);
@@ -1123,8 +1082,7 @@ EXIT:
                g_free(tp_dst_call_num);
 
                CALLBACK_CALL(&mo_sm_ctrl_result_ind);
-       }
-       else {
+       } else {
                dbg("not handled Sat noti[%s]", sig);
        }
 }
@@ -1143,7 +1101,7 @@ static void _process_sim_event(const gchar *sig, GVariant *param,
                g_variant_get(param, "(i)", &type);
                CALLBACK_CALL(&type);
        } else {
-               dbg("not handled SIM noti[%s]",sig );
+               dbg("not handled SIM noti[%s]", sig);
        }
 }
 
@@ -1164,10 +1122,20 @@ static void _process_pb_event(const gchar *sig, GVariant *param,
                        &status.pb_list.b_gas);
 
                msg("(%s) init[%d] fdn[%d] adn[%d] sdn[%d] usim[%d] aas[%d] gas[%d]",
-                       handle->cp_name, status.init_completed, status.pb_list.b_fdn,status.pb_list.b_adn,status.pb_list.b_sdn,status.pb_list.b_3g,status.pb_list.b_aas,status.pb_list.b_gas);
+                       handle->cp_name, status.init_completed, status.pb_list.b_fdn, status.pb_list.b_adn, status.pb_list.b_sdn, status.pb_list.b_3g, status.pb_list.b_aas, status.pb_list.b_gas);
                CALLBACK_CALL(&status);
+       } else if (!g_strcmp0(sig, "ContactChange")) {
+               TelSimPbContactChangeInfo_t ContactChange;
+               g_variant_get(param, "(iqi)",
+                       &ContactChange.pb_type,
+                       &ContactChange.index,
+                       &ContactChange.operation);
+
+               msg("(%s) type[%d] index[%d] operation[%d]",
+                       handle->cp_name, ContactChange.pb_type, ContactChange.index, ContactChange.operation);
+               CALLBACK_CALL(&ContactChange);
        } else {
-               dbg("not handled Phonebook noti[%s]",sig );
+               dbg("not handled Phonebook noti[%s]", sig);
        }
 }
 
@@ -1185,7 +1153,7 @@ static void _process_sap_event(const gchar *sig, GVariant *param,
                g_variant_get(param, "(i)", &disconnect);
                CALLBACK_CALL(&disconnect);
        } else {
-               dbg("not handled SAP noti[%s]",sig );
+               dbg("not handled SAP noti[%s]", sig);
        }
 }
 
@@ -1200,8 +1168,7 @@ static void _process_modem_event(const gchar *sig, GVariant *param,
                g_variant_get(param, "(i)", &noti);
 
                CALLBACK_CALL(&noti);
-       }
-       else {
+       } else {
                dbg("not handled Modem noti[%s]", sig);
        }
 
@@ -1227,32 +1194,30 @@ static void _process_ss_event(const gchar *sig, GVariant *param,
                g_variant_get(param, "(iiis)", &noti.Type, &noti.Dcs, &noti.Length, &str);
 
                if (str) {
-                       g_strlcpy((char*)noti.szString, str, TAPI_SS_USSD_DATA_SIZE_MAX);
+                       g_strlcpy((char *)noti.szString, str, TAPI_SS_USSD_DATA_SIZE_MAX);
                        g_free(str);
                }
 
                CALLBACK_CALL(&noti);
-       }
-       else if (!g_strcmp0(sig, "NotifySsInfo")) {
+       } else if (!g_strcmp0(sig, "NotifySsInfo")) {
                TelSsInfo_t noti;
                memset(&noti, 0, sizeof(TelSsInfo_t));
 
                g_variant_get(param, "(ii)", &noti.Cause, &noti.SsType);
 
                CALLBACK_CALL(&noti);
-       }
-       else if (!g_strcmp0(sig, "ReleaseComplete")) {
+       } else if (!g_strcmp0(sig, "ReleaseComplete")) {
                TelSsRelCompMsgInfo_t noti;
                GVariant *msg = 0;
                int len = 0;
 
-               memset ( &noti, 0, sizeof( TelSsRelCompMsgInfo_t ));
+               memset(&noti, 0, sizeof(TelSsRelCompMsgInfo_t));
 
                g_variant_get(param, "(i@v)", &len, &msg);
 
                noti.RelCompMsgLen = (unsigned char)len;
 
-               if(msg){
+               if (msg) {
                        int count = 0;
                        guchar data;
                        GVariantIter *msg_iter = NULL;
@@ -1262,7 +1227,7 @@ static void _process_ss_event(const gchar *sig, GVariant *param,
                        msg("[ check ] data exist type_format(%s)", g_variant_get_type_string(inner_gv));
 
                        g_variant_get(inner_gv, "ay", &msg_iter);
-                       while( g_variant_iter_loop (msg_iter, "y", &data)){
+                       while (g_variant_iter_loop(msg_iter, "y", &data)) {
                                msg("index(%d) data(%c)", count, data);
                                noti.szRelCompMsg[count] = data;
                                count++;
@@ -1273,55 +1238,36 @@ static void _process_ss_event(const gchar *sig, GVariant *param,
                }
 
                CALLBACK_CALL(&noti);
-
-       } else if ( !g_strcmp0(sig, "NotifyForwarding") ) {
-
+       } else if (!g_strcmp0(sig, "NotifyForwarding")) {
                TelSsForwardNoti_t noti;
                memset(&noti, 0, sizeof(TelSsForwardNoti_t));
 
-               g_variant_get (param, "(aa{sv})", &iter);
+               g_variant_get(param, "(aa{sv})", &iter);
 
                noti.record_num = g_variant_iter_n_children(iter);
 
-               if (TAPI_SS_RECORD_NUM_MAX < noti.record_num) {
+               if (TAPI_SS_RECORD_NUM_MAX < noti.record_num)
                        noti.record_num = TAPI_SS_RECORD_NUM_MAX;
-               }
 
-               while ( g_variant_iter_next(iter, "a{sv}", &iter_row ) && (i < noti.record_num)) {
-                       while ( g_variant_iter_loop( iter_row, "{sv}", &key, &value ) ) {
-
-                               if ( !g_strcmp0(key, "ss_class") ) {
+               while (g_variant_iter_next(iter, "a{sv}", &iter_row) && (i < noti.record_num)) {
+                       while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
+                               if (!g_strcmp0(key, "ss_class"))
                                        noti.record[i].Class = g_variant_get_int32(value);
-                               }
-
-                               if ( !g_strcmp0(key, "ss_status") ) {
+                               else if (!g_strcmp0(key, "ss_status"))
                                        noti.record[i].Status = g_variant_get_int32(value);
-                               }
-
-                               if ( !g_strcmp0(key, "forwarding_mode") ) {
+                               else if (!g_strcmp0(key, "forwarding_mode"))
                                        noti.record[i].ForwardCondition = g_variant_get_int32(value);
-                               }
-
-                               if ( !g_strcmp0(key, "number_present") ) {
+                               else  if (!g_strcmp0(key, "number_present"))
                                        noti.record[i].bCallForwardingNumberPresent = g_variant_get_int32(value);
-                               }
-
-                               if ( !g_strcmp0(key, "no_reply_time") ) {
+                               else if (!g_strcmp0(key, "no_reply_time"))
                                        noti.record[i].NoReplyWaitTime = g_variant_get_int32(value);
-                               }
-
-                               if ( !g_strcmp0(key, "type_of_number") ) {
+                               else if (!g_strcmp0(key, "type_of_number"))
                                        noti.record[i].Ton = g_variant_get_int32(value);
-                               }
-
-                               if ( !g_strcmp0(key, "numbering_plan_identity") ) {
+                               else if (!g_strcmp0(key, "numbering_plan_identity"))
                                        noti.record[i].Npi = g_variant_get_int32(value);
-                               }
-
-                               if ( !g_strcmp0(key, "forwarding_number") ) {
-                                       strncpy((char *)noti.record[i].szCallForwardingNumber, g_variant_get_string(value, 0), TAPI_CALL_DIALDIGIT_LEN_MAX );
-                               }
-
+                               else if (!g_strcmp0(key, "forwarding_number"))
+                                       strncpy((char *)noti.record[i].szCallForwardingNumber,
+                                               g_variant_get_string(value, 0), TAPI_CALL_DIALDIGIT_LEN_MAX);
                        }
                        i++;
                        g_variant_iter_free(iter_row);
@@ -1330,29 +1276,25 @@ static void _process_ss_event(const gchar *sig, GVariant *param,
 
                CALLBACK_CALL(&noti);
 
-       } else if ( !g_strcmp0(sig, "NotifyWaiting") ) {
+       } else if (!g_strcmp0(sig, "NotifyWaiting")) {
 
                TelSsWaitingNoti_t noti;
                memset(&noti, '\0', sizeof(TelSsWaitingNoti_t));
 
-               g_variant_get (param, "(aa{sv})", &iter);
+               g_variant_get(param, "(aa{sv})", &iter);
 
                noti.record_num = g_variant_iter_n_children(iter);
 
-               if (TAPI_SS_RECORD_NUM_MAX < noti.record_num) {
+               if (TAPI_SS_RECORD_NUM_MAX < noti.record_num)
                        noti.record_num = TAPI_SS_RECORD_NUM_MAX;
-               }
 
-               while ( g_variant_iter_next(iter, "a{sv}", &iter_row ) && (i < noti.record_num)) {
-                       while ( g_variant_iter_loop( iter_row, "{sv}", &key, &value ) ) {
+               while (g_variant_iter_next(iter, "a{sv}", &iter_row) && (i < noti.record_num)) {
+                       while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
 
-                               if ( !g_strcmp0(key, "ss_class") ) {
+                               if (!g_strcmp0(key, "ss_class"))
                                        noti.record[i].Class = g_variant_get_int32(value);
-                               }
-
-                               if ( !g_strcmp0(key, "ss_status") ) {
+                               else if (!g_strcmp0(key, "ss_status"))
                                        noti.record[i].Status = g_variant_get_int32(value);
-                               }
                        }
                        i++;
                        g_variant_iter_free(iter_row);
@@ -1361,34 +1303,25 @@ static void _process_ss_event(const gchar *sig, GVariant *param,
 
                CALLBACK_CALL(&noti);
 
-       } else if ( !g_strcmp0(sig, "NotifyBarring") ) {
-
+       } else if (!g_strcmp0(sig, "NotifyBarring")) {
                TelSsBarringNoti_t noti;
                memset(&noti, '\0', sizeof(TelSsBarringNoti_t));
 
-               g_variant_get (param, "(aa{sv})", &iter);
+               g_variant_get(param, "(aa{sv})", &iter);
 
                noti.record_num = g_variant_iter_n_children(iter);
 
-               if (TAPI_SS_RECORD_NUM_MAX < noti.record_num) {
+               if (TAPI_SS_RECORD_NUM_MAX < noti.record_num)
                        noti.record_num = TAPI_SS_RECORD_NUM_MAX;
-               }
 
-               while ( g_variant_iter_next(iter, "a{sv}", &iter_row ) ) {
-                       while ( g_variant_iter_loop( iter_row, "{sv}", &key, &value ) && (i < noti.record_num)) {
-
-                               if ( !g_strcmp0(key, "ss_class") ) {
+               while (g_variant_iter_next(iter, "a{sv}", &iter_row)) {
+                       while (g_variant_iter_loop(iter_row, "{sv}", &key, &value) && (i < noti.record_num)) {
+                               if (!g_strcmp0(key, "ss_class"))
                                        noti.record[i].Class = g_variant_get_int32(value);
-                               }
-
-                               if ( !g_strcmp0(key, "ss_status") ) {
+                               else if (!g_strcmp0(key, "ss_status"))
                                        noti.record[i].Status = g_variant_get_int32(value);
-                               }
-
-                               if ( !g_strcmp0(key, "barring_mode") ) {
+                               else if (!g_strcmp0(key, "barring_mode"))
                                        noti.record[i].Flavour = g_variant_get_int32(value);
-                               }
-
                        }
                        i++;
                        g_variant_iter_free(iter_row);
@@ -1412,33 +1345,29 @@ static void _process_gps_event(const gchar *sig, GVariant *param,
 
        TAPI_RETURN_IF_FAIL(evt_cb_data);
 
-       if (!g_strcmp0(sig, "AssistData")) {
+       if (!g_strcmp0(sig, "AssistData"))
                b_decode_data = TRUE;
-       }
-       else if (!g_strcmp0(sig, "MeasurePosition")) {
+       else if (!g_strcmp0(sig, "MeasurePosition"))
                b_decode_data = TRUE;
-       }
-       else if (!g_strcmp0(sig, "ResetAssistData")) {
+       else if (!g_strcmp0(sig, "ResetAssistData"))
                /* noting to decode */
-       }
-       else if (!g_strcmp0(sig, "FrequencyAiding")) {
+               b_decode_data = FALSE;
+       else if (!g_strcmp0(sig, "FrequencyAiding"))
                b_decode_data = TRUE;
-       }
-       else {
+       else
                dbg("not handled Gps noti[%s]", sig);
-       }
 
        /* decoding data */
-       if(b_decode_data) {
+       if (b_decode_data) {
                gchar *data = NULL;
                gsize length;
                dbg("[%s] decoding start", sig);
 
                g_variant_get(param, "(s)", &data);
                decoded_data = g_base64_decode((const gchar *)data, &length);
-               if (decoded_data) {
+               if (decoded_data)
                        CALLBACK_CALL(decoded_data);
-               }
+
                g_free(data);
                dbg("length=%d", length);
        }
@@ -1464,12 +1393,12 @@ static void on_prop_callback(GDBusConnection *conn, const gchar *name, const gch
 
        TAPI_RETURN_IF_FAIL(handle);
 
-       if (!g_variant_is_of_type (param, G_VARIANT_TYPE ("(sa{sv}as)"))) {
+       if (!g_variant_is_of_type(param, G_VARIANT_TYPE("(sa{sv}as)"))) {
                err("PropertiesChanged parameter type mismatch ('%s')", g_variant_get_type_string(param));
                return;
        }
 
-       g_variant_get (param, "(&s@a{sv}^a&s)", &interface_name_for_signal,
+       g_variant_get(param, "(&s@a{sv}^a&s)", &interface_name_for_signal,
                        &changed_properties, &invalidated_properties);
 
        if (!changed_properties) {
@@ -1477,78 +1406,76 @@ static void on_prop_callback(GDBusConnection *conn, const gchar *name, const gch
                goto fail;
        }
 
-       g_variant_iter_init (&iter, changed_properties);
-       while (g_variant_iter_next (&iter, "{sv}", &key, &value)) {
-
+       g_variant_iter_init(&iter, changed_properties);
+       while (g_variant_iter_next(&iter, "{sv}", &key, &value)) {
                memset(noti_id, 0, 256);
-               snprintf (noti_id, 255, "%s:%s", interface_name_for_signal, key);
+               snprintf(noti_id, 255, "%s:%s", interface_name_for_signal, key);
 
-               evt_cb_data = g_hash_table_lookup (handle->evt_list, noti_id);
+               evt_cb_data = g_hash_table_lookup(handle->evt_list, noti_id);
                if (!evt_cb_data) {
-                       g_variant_unref (value);
+                       g_variant_unref(value);
                        g_free((gchar *)key);
                        /* ignore un-registered property change callback */
                        continue;
 
                }
-               if (g_variant_is_of_type (value, G_VARIANT_TYPE_STRING )) {
-                       data = g_try_malloc0 (g_variant_get_size (value) + 3);
+
+               if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
+                       data = g_try_malloc0(g_variant_get_size(value) + 3);
                        if (!data) {
-                               warn ("g_try_malloc0 failed");
-                               g_variant_unref (value);
+                               warn("g_try_malloc0 failed");
+                               g_variant_unref(value);
                                g_free((gchar *)key);
                                continue;
                        }
                        data[0] = 's';
                        data[1] = ':';
-                       memcpy (data + 2, g_variant_get_data (value),
-                                       g_variant_get_size (value));
-               }
-               else if (g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN )) {
-                       data = g_strdup_printf ("b:%d",
-                                       *(guchar *) g_variant_get_data (value));
-               }
-               else {
-                       data = g_strdup_printf ("i:%d", *(int *) g_variant_get_data (value));
+                       memcpy(data + 2, g_variant_get_data(value),
+                                       g_variant_get_size(value));
+               } else if (g_variant_is_of_type(value, G_VARIANT_TYPE_BOOLEAN)) {
+                       data = g_strdup_printf("b:%d",
+                                       *(guchar *) g_variant_get_data(value));
+               } else {
+                       data = g_strdup_printf("i:%d", *(int *) g_variant_get_data(value));
                }
 
-               prev_value = g_hash_table_lookup (handle->cache_property, noti_id);
+               prev_value = g_hash_table_lookup(handle->cache_property, noti_id);
                if (prev_value) {
-                       if (g_strcmp0 (data, prev_value) == 0) {
-                               g_free (data);
-                               g_variant_unref (value);
+                       if (g_strcmp0(data, prev_value) == 0) {
+                               g_free(data);
+                               g_variant_unref(value);
                                g_free((gchar *)key);
                                continue;
                        }
                }
 
                msg("[%s] save prop: [%s] - [%s]", handle->cp_name, noti_id, data);
-               g_hash_table_replace (handle->cache_property, g_strdup(noti_id), data);
+               g_hash_table_replace(handle->cache_property, g_strdup(noti_id), data);
 
                {
                        int param_i = 0;
                        if (data[0] == 's') {
-                               CALLBACK_CALL((void * ) (data + 2));
-                       }
-                       else {
-                               param_i = atoi (data + 2);
-                               CALLBACK_CALL((void * )&param_i);
+                               CALLBACK_CALL((void *) (data + 2));
+                       } else {
+                               param_i = atoi(data + 2);
+                               CALLBACK_CALL((void *)&param_i);
                        }
                }
-               g_variant_unref (value);
+               g_variant_unref(value);
                g_free((gchar *)key);
        }
 
-       if (changed_properties != NULL )
-               g_variant_unref (changed_properties);
+       if (changed_properties != NULL)
+               g_variant_unref(changed_properties);
 
 fail:
        if (invalidated_properties)
-               g_free (invalidated_properties);
+               g_free(invalidated_properties);
 }
 
-static void on_signal_callback(GDBusConnection *conn, const gchar *name, const gchar *path, const gchar *interface,
-               const gchar *sig, GVariant *param, gpointer user_data)
+static void on_signal_callback(GDBusConnection *conn,
+       const gchar *name, const gchar *path, const gchar *interface,
+       const gchar *sig, GVariant *param, gpointer user_data)
 {
        TapiHandle *handle = user_data;
        struct tapi_evt_cb *evt_cb_data = NULL;
@@ -1565,42 +1492,30 @@ static void on_signal_callback(GDBusConnection *conn, const gchar *name, const g
                return;
        }
 
-       if (!g_strcmp0(interface, DBUS_TELEPHONY_SMS_INTERFACE)) {
+       if (!g_strcmp0(interface, DBUS_TELEPHONY_SMS_INTERFACE))
                _process_sms_event(sig, param, handle, noti_id, evt_cb_data);
-       }
-       else if (!g_strcmp0(interface, DBUS_TELEPHONY_CALL_INTERFACE)) {
+       else if (!g_strcmp0(interface, DBUS_TELEPHONY_CALL_INTERFACE))
                _process_call_event(sig, param, handle, noti_id, evt_cb_data);
-       }
-       else if (!g_strcmp0(interface, DBUS_TELEPHONY_SAT_INTERFACE)) {
+       else if (!g_strcmp0(interface, DBUS_TELEPHONY_SAT_INTERFACE))
                _process_sat_event(sig, param, handle, noti_id, evt_cb_data);
-       }
-       else if (!g_strcmp0(interface, DBUS_TELEPHONY_SIM_INTERFACE)) {
+       else if (!g_strcmp0(interface, DBUS_TELEPHONY_SIM_INTERFACE))
                _process_sim_event(sig, param, handle, noti_id, evt_cb_data);
-       }
-       else if (!g_strcmp0(interface, DBUS_TELEPHONY_PB_INTERFACE)) {
+       else if (!g_strcmp0(interface, DBUS_TELEPHONY_PB_INTERFACE))
                _process_pb_event(sig, param, handle, noti_id, evt_cb_data);
-       }
-       else if (!g_strcmp0(interface, DBUS_TELEPHONY_SAP_INTERFACE)) {
+       else if (!g_strcmp0(interface, DBUS_TELEPHONY_SAP_INTERFACE))
                _process_sap_event(sig, param, handle, noti_id, evt_cb_data);
-       }
-       else if (!g_strcmp0(interface, DBUS_TELEPHONY_MODEM_INTERFACE)) {
+       else if (!g_strcmp0(interface, DBUS_TELEPHONY_MODEM_INTERFACE))
                _process_modem_event(sig, param, handle, noti_id, evt_cb_data);
-       }
-       else if (!g_strcmp0(interface, DBUS_TELEPHONY_SS_INTERFACE)) {
+       else if (!g_strcmp0(interface, DBUS_TELEPHONY_SS_INTERFACE))
                _process_ss_event(sig, param, handle, noti_id, evt_cb_data);
-       }
-       else if (!g_strcmp0(interface, DBUS_TELEPHONY_GPS_INTERFACE)) {
+       else if (!g_strcmp0(interface, DBUS_TELEPHONY_GPS_INTERFACE))
                _process_gps_event(sig, param, handle, noti_id, evt_cb_data);
-       }
-       else if (!g_strcmp0(interface, DBUS_TELEPHONY_NETWORK_INTERFACE)) {
+       else if (!g_strcmp0(interface, DBUS_TELEPHONY_NETWORK_INTERFACE))
                _process_network_event(sig, param, handle, noti_id, evt_cb_data);
-       }
-       else {
-       }
        g_free(noti_id);
 }
 
-EXPORT_API char** tel_get_cp_name_list(void)
+EXPORT_API char **tel_get_cp_name_list(void)
 {
        gpointer d_conn = NULL;
        GError *error = NULL;
@@ -1618,7 +1533,7 @@ EXPORT_API char** tel_get_cp_name_list(void)
        d_conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
        if (!d_conn) {
                err("Error creating dbus connection: %s\n", error->message);
-               g_error_free (error);
+               g_error_free(error);
                return NULL;
        }
 
@@ -1626,31 +1541,29 @@ EXPORT_API char** tel_get_cp_name_list(void)
                        "org.tizen.telephony.Manager", "GetModems", NULL, NULL,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, NULL, &error);
        if (!rst) {
-               err( "GetModems() failed. (%s)", error->message);
-               g_error_free (error);
+               err("GetModems() failed. (%s)", error->message);
+               g_error_free(error);
                goto OUT;
        }
 
-       g_variant_get (rst, "(as)", &iter);
-       while (g_variant_iter_next(iter, "s", &modem_path)){
+       g_variant_get(rst, "(as)", &iter);
+       while (g_variant_iter_next(iter, "s", &modem_path))
                list = g_slist_append(list, modem_path);
-       }
-       g_variant_iter_free (iter);
+       g_variant_iter_free(iter);
 
        if (!list) {
-               err( "No CP name");
+               err("No CP name");
                goto OUT;
        }
 
        element_cnt = g_slist_length(list);
-       cp_list = g_new0(char*, element_cnt + 1);
-       if (!cp_list) {
+       cp_list = g_new0(char *, element_cnt + 1);
+       if (!cp_list)
                goto OUT;
-       }
 
        for (l = list; l; l = l->next, i++) {
                cp_list[i] = g_strdup(l->data);
-               g_free (l->data);
+               g_free(l->data);
 
                dbg("cp name[%d] = %s", i, cp_list[i]);
        }
@@ -1659,7 +1572,7 @@ EXPORT_API char** tel_get_cp_name_list(void)
        g_slist_free(list);
 
 OUT:
-       if(d_conn)
+       if (d_conn)
                g_object_unref(d_conn);
 
        if (rst)
@@ -1668,8 +1581,8 @@ OUT:
        return cp_list;
 }
 
-static char *get_property (TapiHandle *handle, const char *property,
-               const GVariantType *type)
+static char *get_property(TapiHandle *handle, const char *property,
+       const GVariantType *type)
 {
        char **dbus_info;
        GVariant *value = NULL;
@@ -1677,7 +1590,7 @@ static char *get_property (TapiHandle *handle, const char *property,
        GError *error = NULL;
        char *data = NULL;
 
-       dbus_info = g_strsplit (property, ":", 2);
+       dbus_info = g_strsplit(property, ":", 2);
        if (!dbus_info) {
                dbg("invalid property");
                return NULL ;
@@ -1688,11 +1601,11 @@ static char *get_property (TapiHandle *handle, const char *property,
                goto OUT;
        }
 
-       value_container = g_dbus_connection_call_sync (handle->dbus_connection,
+       value_container = g_dbus_connection_call_sync(handle->dbus_connection,
                        DBUS_TELEPHONY_SERVICE, handle->path,
                        "org.freedesktop.DBus.Properties", "Get",
-                       g_variant_new ("(ss)", dbus_info[0], dbus_info[1]),
-                       G_VARIANT_TYPE ("(v)"), G_DBUS_CALL_FLAGS_NONE,
+                       g_variant_new("(ss)", dbus_info[0], dbus_info[1]),
+                       G_VARIANT_TYPE("(v)"), G_DBUS_CALL_FLAGS_NONE,
                        TAPI_DEFAULT_TIMEOUT, handle->ca, &error);
 
        if (error) {
@@ -1702,43 +1615,41 @@ static char *get_property (TapiHandle *handle, const char *property,
                        return g_strdup("No access rights");
                } else {
                        warn("dbus error = %d (%s)", error->code, error->message);
-                       g_error_free (error);
+                       g_error_free(error);
                }
        }
 
        if (!value_container)
                return NULL ;
 
-       g_variant_get (value_container, "(v)", &value);
-       g_variant_unref (value_container);
+       g_variant_get(value_container, "(v)", &value);
+       g_variant_unref(value_container);
 
-       if (g_variant_is_of_type (value, G_VARIANT_TYPE_STRING )) {
-               data = g_try_malloc0 (g_variant_get_size (value));
+       if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
+               data = g_try_malloc0(g_variant_get_size(value));
                if (!data) {
-                       warn ("calloc failed");
-                       g_variant_unref (value);
+                       warn("calloc failed");
+                       g_variant_unref(value);
                        goto OUT;
                }
-               memcpy (data, g_variant_get_data (value), g_variant_get_size (value));
-       }
-       else if (g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN )) {
-               data = g_strdup_printf ("%d", *(guchar *) g_variant_get_data (value));
-       }
-       else {
-               data = g_strdup_printf ("%d", *(int *) g_variant_get_data (value));
+               memcpy(data, g_variant_get_data(value), g_variant_get_size(value));
+       } else if (g_variant_is_of_type(value, G_VARIANT_TYPE_BOOLEAN)) {
+               data = g_strdup_printf("%d", *(guchar *) g_variant_get_data(value));
+       } else {
+               data = g_strdup_printf("%d", *(int *) g_variant_get_data(value));
        }
        msg("prop:[%s][%s] - [%s]", handle->cp_name, dbus_info[1], data);
 
-       g_variant_unref (value);
+       g_variant_unref(value);
 
 OUT:
-       g_strfreev (dbus_info);
+       g_strfreev(dbus_info);
 
        return data;
 }
 
 EXPORT_API int tel_get_property_int (TapiHandle *handle,
-               const char *property, int *result)
+       const char *property, int *result)
 {
        char *data;
 
@@ -1746,16 +1657,15 @@ EXPORT_API int tel_get_property_int (TapiHandle *handle,
        TAPI_RET_ERR_NUM_IF_FAIL(property, TAPI_API_INVALID_INPUT);
        TAPI_RET_ERR_NUM_IF_FAIL(result, TAPI_API_INVALID_INPUT);
 
-       data = get_property (handle, property, G_VARIANT_TYPE_INT32);
-       if (!data) {
+       data = get_property(handle, property, G_VARIANT_TYPE_INT32);
+       if (!data)
                return TAPI_API_OPERATION_FAILED;
-       } else if (!g_strcmp0(data, "No access rights")) {
+       else if (!g_strcmp0(data, "No access rights"))
                return TAPI_API_ACCESS_DENIED;
-       }
 
        *result = atoi(data);
 
-       g_free (data);
+       g_free(data);
 
        return TAPI_API_SUCCESS;
 }
@@ -1768,19 +1678,18 @@ EXPORT_API int tel_get_property_string(TapiHandle *handle, const char *property,
        TAPI_RET_ERR_NUM_IF_FAIL(property, TAPI_API_INVALID_INPUT);
        TAPI_RET_ERR_NUM_IF_FAIL(result, TAPI_API_INVALID_INPUT);
 
-       data = get_property (handle, property, G_VARIANT_TYPE_STRING);
-       if (!data) {
+       data = get_property(handle, property, G_VARIANT_TYPE_STRING);
+       if (!data)
                return TAPI_API_OPERATION_FAILED;
-       } else if (!g_strcmp0(data, "No access rights")) {
+       else if (!g_strcmp0(data, "No access rights"))
                return TAPI_API_ACCESS_DENIED;
-       }
 
        *result = data;
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API TapiHandletel_init(const char *cp_name)
+EXPORT_API TapiHandle *tel_init(const char *cp_name)
 {
        GError *error = NULL;
        struct tapi_handle *handle;
@@ -1790,27 +1699,26 @@ EXPORT_API TapiHandle* tel_init(const char *cp_name)
 #endif
 
        handle = g_new0(struct tapi_handle, 1);
-       if (!handle) {
+       if (!handle)
                return NULL;
-       }
 
        handle->dbus_connection = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
        if (!handle->dbus_connection) {
                err("Error creating dbus connection: %s\n", error->message);
                g_free(handle);
-               g_error_free (error);
+               g_error_free(error);
                return NULL;
        }
 
-       msg("tel_init: [%s]:[%s]:[%s]", g_dbus_connection_get_unique_name(
-                               handle->dbus_connection), program_invocation_name, cp_name?cp_name:"Null");
+       msg("tel_init: [%s]:[%s]:[%s]",
+               g_dbus_connection_get_unique_name(handle->dbus_connection),
+               program_invocation_name, cp_name ? cp_name : "NULL");
 
        handle->ca = g_cancellable_new();
 
        if (cp_name) {
                handle->cp_name = g_strdup(cp_name);
-       }
-       else {
+       } else {
                char **list = NULL;
                int i = 0;
 
@@ -1828,25 +1736,24 @@ EXPORT_API TapiHandle* tel_init(const char *cp_name)
                        g_object_unref(handle->ca);
                        g_object_unref(handle->dbus_connection);
                        g_free(handle);
-                       g_free (list);
+                       g_free(list);
                        return NULL;
                }
 
                handle->cp_name = g_strdup(list[0]);
 
                /* Free the list of CP names */
-               while (list[i] != NULL) {
+               while (list[i] != NULL)
                        g_free(list[i++]);
-               }
 
-               g_free (list);
+               g_free(list);
        }
 
        handle->evt_list = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
        handle->cache_property = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 
        handle->path = g_strdup_printf("%s/%s",
-                       DBUS_TELEPHONY_DEFAULT_PATH, handle->cp_name);
+               DBUS_TELEPHONY_DEFAULT_PATH, handle->cp_name);
 
        return handle;
 }
@@ -1861,7 +1768,7 @@ static gboolean _unregister_noti(gpointer key, gpointer value, gpointer user_dat
        return TRUE;
 }
 
-EXPORT_API int tel_deinit(TapiHandlehandle)
+EXPORT_API int tel_deinit(TapiHandle *handle)
 {
        TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_INPUT);
 
@@ -1879,7 +1786,7 @@ EXPORT_API int tel_deinit(TapiHandle* handle)
        g_cancellable_cancel(handle->ca);
        g_object_unref(handle->ca);
 
-       g_object_unref (handle->dbus_connection);
+       g_object_unref(handle->dbus_connection);
 
        memset(handle, 0, sizeof(struct tapi_handle));
        g_free(handle);
@@ -1889,8 +1796,8 @@ EXPORT_API int tel_deinit(TapiHandle* handle)
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_register_noti_event (TapiHandle *handle, const char *noti_id,
-               tapi_notification_cb callback, void *user_data)
+EXPORT_API int tel_register_noti_event(TapiHandle *handle, const char *noti_id,
+       tapi_notification_cb callback, void *user_data)
 {
        gchar **dbus_str = NULL;
        gpointer tmp = NULL;
@@ -1901,20 +1808,20 @@ EXPORT_API int tel_register_noti_event (TapiHandle *handle, const char *noti_id,
        TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_INPUT);
        TAPI_RET_ERR_NUM_IF_FAIL(noti_id, TAPI_API_INVALID_INPUT);
 
-       tmp = g_hash_table_lookup (handle->evt_list, noti_id);
-       if (tmp != NULL ) {
+       tmp = g_hash_table_lookup(handle->evt_list, noti_id);
+       if (tmp != NULL) {
                dbg("noti_id(%s) is already registered", noti_id);
                return TAPI_API_INVALID_INPUT;
        }
 
-       dbus_str = g_strsplit (noti_id, ":", 2);
+       dbus_str = g_strsplit(noti_id, ":", 2);
        if (!dbus_str) {
                dbg("invalid noti_id");
                return TAPI_API_INVALID_INPUT;
        }
 
        if (!dbus_str[0] || !dbus_str[1]) {
-               g_strfreev (dbus_str);
+               g_strfreev(dbus_str);
                dbg("invalid noti_id");
                return TAPI_API_INVALID_INPUT;
        }
@@ -1928,35 +1835,34 @@ EXPORT_API int tel_register_noti_event (TapiHandle *handle, const char *noti_id,
        if (dbus_str[1][0] >= 'a' && dbus_str[1][0] <= 'z') {
                /* Property change callback - only one time */
                if (handle->prop_callback_evt_id == 0) {
-                       handle->prop_callback_evt_id = g_dbus_connection_signal_subscribe (
-                                       handle->dbus_connection, DBUS_TELEPHONY_SERVICE, /* Sender */
-                                       "org.freedesktop.DBus.Properties", /* Interface */
-                                       "PropertiesChanged", /* Member */
-                                       handle->path, /* Object path */
-                                       NULL, /* arg0 */
-                                       G_DBUS_SIGNAL_FLAGS_NONE, on_prop_callback, handle, NULL );
+                       handle->prop_callback_evt_id = g_dbus_connection_signal_subscribe(handle->dbus_connection,
+                               DBUS_TELEPHONY_SERVICE, /* Sender */
+                               "org.freedesktop.DBus.Properties", /* Interface */
+                               "PropertiesChanged", /* Member */
+                               handle->path, /* Object path */
+                               NULL, /* arg0 */
+                               G_DBUS_SIGNAL_FLAGS_NONE, on_prop_callback, handle, NULL);
                }
-       }
-       else {
+       } else {
                /* Signal callback */
-               evt_cb_data->evt_id = g_dbus_connection_signal_subscribe (
-                               handle->dbus_connection, DBUS_TELEPHONY_SERVICE, /* Sender */
+               evt_cb_data->evt_id = g_dbus_connection_signal_subscribe(handle->dbus_connection,
+                               DBUS_TELEPHONY_SERVICE, /* Sender */
                                dbus_str[0], /* Interface */
                                dbus_str[1], /* Member */
                                handle->path, /* Object path */
                                NULL, /* arg0 */
-                               G_DBUS_SIGNAL_FLAGS_NONE, on_signal_callback, handle, NULL );
+                               G_DBUS_SIGNAL_FLAGS_NONE, on_signal_callback, handle, NULL);
 
        }
 
-       g_hash_table_insert (handle->evt_list, g_strdup (noti_id), evt_cb_data);
+       g_hash_table_insert(handle->evt_list, g_strdup(noti_id), evt_cb_data);
 
-       g_strfreev (dbus_str);
+       g_strfreev(dbus_str);
 
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_deregister_noti_event (TapiHandle *handle,
+EXPORT_API int tel_deregister_noti_event(TapiHandle *handle,
                const char *noti_id)
 {
        struct tapi_evt_cb *evt_cb_data = NULL;
@@ -1965,16 +1871,16 @@ EXPORT_API int tel_deregister_noti_event (TapiHandle *handle,
        TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_INPUT);
        TAPI_RET_ERR_NUM_IF_FAIL(handle->dbus_connection, TAPI_API_INVALID_INPUT);
 
-       evt_cb_data = g_hash_table_lookup (handle->evt_list, noti_id);
+       evt_cb_data = g_hash_table_lookup(handle->evt_list, noti_id);
        if (!evt_cb_data) {
                dbg("event does not registered");
                return TAPI_API_INVALID_INPUT;
        }
 
-       g_dbus_connection_signal_unsubscribe (handle->dbus_connection,
+       g_dbus_connection_signal_unsubscribe(handle->dbus_connection,
                        evt_cb_data->evt_id);
 
-       rv = g_hash_table_remove (handle->evt_list, noti_id);
+       rv = g_hash_table_remove(handle->evt_list, noti_id);
        if (!rv) {
                dbg("fail to deregister noti event(%s)", noti_id);
                return TAPI_API_OPERATION_FAILED;
index 158d2acf4f8c187f8f8cc087ad44e1c23798d479..9a4fdf346a8de93504670ad204a0218a28caf1ca 100644 (file)
@@ -31,31 +31,31 @@ __BEGIN_DECLS
 #define TAPI_LOG_TAG "LIBTAPI"
 #endif
 
-#define msg(fmt,args...)  { RLOG(LOG_INFO, TAPI_LOG_TAG, fmt "\n", ##args); }
-#define dbg(fmt,args...)  { RLOG(LOG_DEBUG, TAPI_LOG_TAG, fmt "\n", ##args); }
-#define warn(fmt,args...)  { RLOG(LOG_WARN, TAPI_LOG_TAG, fmt "\n", ##args); }
-#define err(fmt,args...)  { RLOG(LOG_ERROR, TAPI_LOG_TAG, fmt "\n", ##args); }
-#define fatal(fmt,args...)  { RLOG(LOG_FATAL, TAPI_LOG_TAG, fmt "\n", ##args); }
+#define msg(fmt,args...)  do { RLOG(LOG_INFO, TAPI_LOG_TAG, fmt "\n", ##args); } while (0)
+#define dbg(fmt,args...)  do { RLOG(LOG_DEBUG, TAPI_LOG_TAG, fmt "\n", ##args); } while (0)
+#define warn(fmt,args...)  do { RLOG(LOG_WARN, TAPI_LOG_TAG, fmt "\n", ##args); } while (0)
+#define err(fmt,args...)  do { RLOG(LOG_ERROR, TAPI_LOG_TAG, fmt "\n", ##args); } while (0)
+#define fatal(fmt,args...)  do { RLOG(LOG_FATAL, TAPI_LOG_TAG, fmt "\n", ##args); } while (0)
 
-#define smsg(fmt,args...)  { SECURE_RLOG(LOG_INFO, TAPI_LOG_TAG, fmt "\n", ##args); }
-#define sdbg(fmt,args...)  { SECURE_RLOG(LOG_DEBUG, TAPI_LOG_TAG, fmt "\n", ##args); }
-#define swarn(fmt,args...)  { SECURE_RLOG(LOG_WARN, TAPI_LOG_TAG, fmt "\n", ##args); }
-#define serr(fmt,args...)  { SECURE_RLOG(LOG_ERROR, TAPI_LOG_TAG, fmt "\n", ##args); }
-#define sfatal(fmt,args...)  { SECURE_RLOG(LOG_FATAL, TAPI_LOG_TAG, fmt "\n", ##args); }
+#define smsg(fmt,args...)  do { SECURE_RLOG(LOG_INFO, TAPI_LOG_TAG, fmt "\n", ##args); } while (0)
+#define sdbg(fmt,args...)  do { SECURE_RLOG(LOG_DEBUG, TAPI_LOG_TAG, fmt "\n", ##args); } while (0)
+#define swarn(fmt,args...)  do { SECURE_RLOG(LOG_WARN, TAPI_LOG_TAG, fmt "\n", ##args); } while (0)
+#define serr(fmt,args...)  do { SECURE_RLOG(LOG_ERROR, TAPI_LOG_TAG, fmt "\n", ##args); } while (0)
+#define sfatal(fmt,args...)  do { SECURE_RLOG(LOG_FATAL, TAPI_LOG_TAG, fmt "\n", ##args); } while (0)
 
 #else
 
-#define msg(fmt,args...)
-#define dbg(fmt,args...)
-#define warn(fmt,args...)
-#define err(fmt,args...)
-#define fatal(fmt,args...)
+#define msg(fmt,args...) do {} while (0)
+#define dbg(fmt,args...) do {} while (0)
+#define warn(fmt,args...) do {} while (0)
+#define err(fmt,args...) do {} while (0)
+#define fatal(fmt,args...) do {} while (0)
 
-#define smsg(fmt,args...)
-#define sdbg(fmt,args...)
-#define swarn(fmt,args...)
-#define serr(fmt,args...)
-#define sfatal(fmt,args...)
+#define smsg(fmt,args...) do {} while (0)
+#define sdbg(fmt,args...) do {} while (0)
+#define swarn(fmt,args...) do {} while (0)
+#define serr(fmt,args...) do {} while (0)
+#define sfatal(fmt,args...) do {} while (0)
 
 #endif
 
index 734cf05c1a5df66a692f116b44ff80b5c4ac7565..603fc9893aeb9526ebe22033ee6e7ffa8c40f220 100644 (file)
@@ -41,15 +41,14 @@ static void on_response_default_set(GObject *source_object, GAsyncResult *res, g
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(i)", &result);
+       g_variant_get(dbus_result, "(i)", &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -68,12 +67,12 @@ static void on_response_get_version(GObject *source_object, GAsyncResult *res, g
 
        memset(&data, 0, sizeof(TelMiscVersionInformation));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
 
-       g_variant_get (dbus_result, "(issssss)", &result,
+       g_variant_get(dbus_result, "(issssss)", &result,
                        &sw, &hw, &rf, &product, &prl, &eri);
 
        dbg("product code [%s]", product);
@@ -114,11 +113,11 @@ static void on_response_get_serial_number(GObject *source_object, GAsyncResult *
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(issss)", &result,
+       g_variant_get(dbus_result, "(issss)", &result,
                        &sn, &meid, &imei, &imeisv);
 
        g_strlcpy((gchar *)data.szEsn, sn, TAPI_MISC_ME_SN_LEN_MAX);
@@ -153,11 +152,11 @@ static void on_response_get_imei(GObject *source_object, GAsyncResult *res, gpoi
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(is)", &result, &imei);
+       g_variant_get(dbus_result, "(is)", &result, &imei);
 
        if (evt_cb_data->cb_fn) {
                if (result != 0)
@@ -171,6 +170,43 @@ static void on_response_get_imei(GObject *source_object, GAsyncResult *res, gpoi
        g_variant_unref(dbus_result);
 }
 
+static void on_response_get_device_info(GObject *source_object, GAsyncResult *res, gpointer user_data)
+{
+       GError *error = NULL;
+       GDBusConnection *conn = NULL;
+       struct tapi_resp_data *evt_cb_data = user_data;
+       int result = -1;
+       TelMiscDeviceInfo_t data;
+       char *vendor_name = NULL;
+       char *device_name = NULL;
+       GVariant *dbus_result;
+
+       memset(&data, 0, sizeof(TelMiscDeviceInfo_t));
+
+       conn = G_DBUS_CONNECTION(source_object);
+       dbus_result = g_dbus_connection_call_finish(conn, res, &error);
+       CHECK_ERROR(error);
+
+       g_variant_get(dbus_result, "(iss)", &result,
+                       &vendor_name, &device_name);
+
+       dbg("vendor_name [%s] device_name [%s] , result[%d]", vendor_name, device_name, result);
+
+       if (!result) {
+               g_strlcpy((gchar *)data.vendor_name, vendor_name, TAPI_MISC_ME_DEVICE_NAME_LEN_MAX+1);
+               g_strlcpy((gchar *)data.device_name, device_name, TAPI_MISC_ME_DEVICE_NAME_LEN_MAX+1);
+
+               g_free(vendor_name);
+               g_free(device_name);
+       }
+
+       if (evt_cb_data->cb_fn)
+               evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data);
+
+       g_free(evt_cb_data);
+       g_variant_unref(dbus_result);
+}
+
 static void on_response_get_flight_mode(GObject *source_object, GAsyncResult *res, gpointer user_data)
 {
        GError *error = NULL;
@@ -181,15 +217,14 @@ static void on_response_get_flight_mode(GObject *source_object, GAsyncResult *re
 
        GVariant *dbus_result;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(bi)", &mode, &result);
+       g_variant_get(dbus_result, "(bi)", &mode, &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &mode, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -251,15 +286,12 @@ EXPORT_API int tel_set_flight_mode(TapiHandle *handle, tapi_power_flight_mode_ty
 
        msg("[%s] requested flight mode:[%d] (1:enter, 2:leave)", handle->cp_name, mode);
 
-       if (mode == TAPI_POWER_FLIGHT_MODE_ENTER) {
+       if (mode == TAPI_POWER_FLIGHT_MODE_ENTER)
                b_mode = TRUE;
-       }
-       else if (mode == TAPI_POWER_FLIGHT_MODE_LEAVE) {
+       else if (mode == TAPI_POWER_FLIGHT_MODE_LEAVE)
                b_mode = FALSE;
-       }
-       else {
+       else
                return TAPI_API_INVALID_INPUT;
-       };
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
@@ -339,7 +371,7 @@ EXPORT_API TelMiscVersionInformation *tel_get_misc_me_version_sync(TapiHandle *h
        if (!dbus_result)
                return NULL;
 
-       g_variant_get (dbus_result, "(issssss)", &result,
+       g_variant_get(dbus_result, "(issssss)", &result,
                        &sw, &hw, &rf, &product, &prl, &eri);
        g_variant_unref(dbus_result);
 
@@ -414,7 +446,7 @@ EXPORT_API char *tel_get_misc_me_imei_sync(TapiHandle *handle)
        if (!dbus_result)
                return NULL;
 
-       g_variant_get (dbus_result, "(is)", &result, &imei);
+       g_variant_get(dbus_result, "(is)", &result, &imei);
        g_variant_unref(dbus_result);
 
        if (result != 0) {
@@ -449,7 +481,7 @@ EXPORT_API TelMiscSNInformation *tel_get_misc_me_sn_sync(TapiHandle *handle)
 {
        GVariant *dbus_result;
        GError *error = NULL;
-       char *sn = NULL, *meid = NULL,*imei = NULL, *imeisv = NULL;
+       char *sn = NULL, *meid = NULL, *imei = NULL, *imeisv = NULL;
        TelMiscSNInformation *data = NULL;
        int result = 0;
 
@@ -469,7 +501,7 @@ EXPORT_API TelMiscSNInformation *tel_get_misc_me_sn_sync(TapiHandle *handle)
        if (!dbus_result)
                return NULL;
 
-       g_variant_get (dbus_result, "(issss)", &result, &sn, &meid, &imei, &imeisv);
+       g_variant_get(dbus_result, "(issss)", &result, &sn, &meid, &imei, &imeisv);
        g_variant_unref(dbus_result);
 
        if (result != 0)
@@ -513,3 +545,19 @@ EXPORT_API int tel_check_modem_power_status(TapiHandle *handle, int *result)
 
        return ret;
 }
+EXPORT_API int tel_get_device_info(TapiHandle *handle, tapi_response_cb callback, void *user_data)
+{
+       struct tapi_resp_data *evt_cb_data = NULL;
+
+       dbg("Func Entrance");
+
+       MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
+
+       g_dbus_connection_call(handle->dbus_connection,
+                       DBUS_TELEPHONY_SERVICE , handle->path, DBUS_TELEPHONY_MODEM_INTERFACE,
+                       "GetDeviceInfo", NULL, NULL,
+                       G_DBUS_CALL_FLAGS_NONE, -1, handle->ca,
+                       on_response_get_device_info, evt_cb_data);
+
+       return TAPI_API_SUCCESS;
+}
index e71bb4c54f662a0a0d1d8fc479ed361f93a85c2d..2742998c3268a04d878b1b10684a773b59671022 100644 (file)
 static int _convert_systemtype_to_act(int type)
 {
        switch (type) {
-               case TAPI_NETWORK_SYSTEM_GSM:
-                       return 0x1;
+       case TAPI_NETWORK_SYSTEM_GSM:
+               return 0x1;
 
-               case TAPI_NETWORK_SYSTEM_GPRS:
-                       return 0x2;
+       case TAPI_NETWORK_SYSTEM_GPRS:
+               return 0x2;
 
-               case TAPI_NETWORK_SYSTEM_EGPRS:
-                       return 0x3;
+       case TAPI_NETWORK_SYSTEM_EGPRS:
+               return 0x3;
 
-               case TAPI_NETWORK_SYSTEM_PCS1900:
-                       break;
+       case TAPI_NETWORK_SYSTEM_PCS1900:
+               break;
 
-               case TAPI_NETWORK_SYSTEM_UMTS:
-                       return 0x4;
+       case TAPI_NETWORK_SYSTEM_UMTS:
+               return 0x4;
 
-               case TAPI_NETWORK_SYSTEM_GSM_AND_UMTS:
-                       return 0x5;
+       case TAPI_NETWORK_SYSTEM_GSM_AND_UMTS:
+               return 0x5;
 
-               case TAPI_NETWORK_SYSTEM_IS95A:
-                       return 0x11;
+       case TAPI_NETWORK_SYSTEM_IS95A:
+               return 0x11;
 
-               case TAPI_NETWORK_SYSTEM_IS95B:
-                       return 0x12;
+       case TAPI_NETWORK_SYSTEM_IS95B:
+               return 0x12;
 
-               case TAPI_NETWORK_SYSTEM_CDMA_1X:
-                       return 0x13;
+       case TAPI_NETWORK_SYSTEM_CDMA_1X:
+               return 0x13;
 
-               case TAPI_NETWORK_SYSTEM_EVDO_REV_0:
-                       return 0x14;
+       case TAPI_NETWORK_SYSTEM_EVDO_REV_0:
+               return 0x14;
 
-               case TAPI_NETWORK_SYSTEM_1X_EVDO_REV_0_HYBRID:
-                       return 0x15;
+       case TAPI_NETWORK_SYSTEM_1X_EVDO_REV_0_HYBRID:
+               return 0x15;
 
-               case TAPI_NETWORK_SYSTEM_EVDO_REV_A:
-                       return 0x16;
+       case TAPI_NETWORK_SYSTEM_EVDO_REV_A:
+               return 0x16;
 
-               case TAPI_NETWORK_SYSTEM_1X_EVDO_REV_A_HYBRID:
-                       return 0x17;
+       case TAPI_NETWORK_SYSTEM_1X_EVDO_REV_A_HYBRID:
+               return 0x17;
 
-               case TAPI_NETWORK_SYSTEM_EVDO_REV_B:
-                       return 0x18;
+       case TAPI_NETWORK_SYSTEM_EVDO_REV_B:
+               return 0x18;
 
-               case TAPI_NETWORK_SYSTEM_1X_EVDO_REV_B_HYBRID:
-                       return 0x19;
+       case TAPI_NETWORK_SYSTEM_1X_EVDO_REV_B_HYBRID:
+               return 0x19;
 
-               case TAPI_NETWORK_SYSTEM_EVDV:
-                       return 0x1A;
+       case TAPI_NETWORK_SYSTEM_EVDV:
+               return 0x1A;
 
-               case TAPI_NETWORK_SYSTEM_EHRPD:
-                       return 0x1B;
+       case TAPI_NETWORK_SYSTEM_EHRPD:
+               return 0x1B;
 
-               case TAPI_NETWORK_SYSTEM_LTE:
-                       return 0x21;
+       case TAPI_NETWORK_SYSTEM_LTE:
+               return 0x21;
 
-               default:
-                       break;
+       default:
+               break;
        }
 
        return 0xFF;
@@ -97,66 +97,66 @@ static int _convert_systemtype_to_act(int type)
 static int _convert_act_to_systemtype(int act)
 {
        switch (act) {
-               case 0x1:
-                       return TAPI_NETWORK_SYSTEM_GSM;
+       case 0x1:
+               return TAPI_NETWORK_SYSTEM_GSM;
 
-               case 0x2:
-                       return TAPI_NETWORK_SYSTEM_GPRS;
+       case 0x2:
+               return TAPI_NETWORK_SYSTEM_GPRS;
 
-               case 0x3:
-                       return TAPI_NETWORK_SYSTEM_EGPRS;
+       case 0x3:
+               return TAPI_NETWORK_SYSTEM_EGPRS;
 
-               case 0x4:
-                       return TAPI_NETWORK_SYSTEM_UMTS;
+       case 0x4:
+               return TAPI_NETWORK_SYSTEM_UMTS;
 
-               case 0x5:
-                       return TAPI_NETWORK_SYSTEM_GSM_AND_UMTS;
+       case 0x5:
+               return TAPI_NETWORK_SYSTEM_GSM_AND_UMTS;
 
-               case 0x11:
-                       return TAPI_NETWORK_SYSTEM_IS95A;
+       case 0x11:
+               return TAPI_NETWORK_SYSTEM_IS95A;
 
-               case 0x12:
-                       return TAPI_NETWORK_SYSTEM_IS95B;
+       case 0x12:
+               return TAPI_NETWORK_SYSTEM_IS95B;
 
-               case 0x13:
-                       return TAPI_NETWORK_SYSTEM_CDMA_1X;
+       case 0x13:
+               return TAPI_NETWORK_SYSTEM_CDMA_1X;
 
-               case 0x14:
-                       return TAPI_NETWORK_SYSTEM_EVDO_REV_0;
+       case 0x14:
+               return TAPI_NETWORK_SYSTEM_EVDO_REV_0;
 
-               case 0x15:
-                       return TAPI_NETWORK_SYSTEM_1X_EVDO_REV_0_HYBRID;
+       case 0x15:
+               return TAPI_NETWORK_SYSTEM_1X_EVDO_REV_0_HYBRID;
 
-               case 0x16:
-                       return TAPI_NETWORK_SYSTEM_EVDO_REV_A;
+       case 0x16:
+               return TAPI_NETWORK_SYSTEM_EVDO_REV_A;
 
-               case 0x17:
-                       return TAPI_NETWORK_SYSTEM_1X_EVDO_REV_A_HYBRID;
+       case 0x17:
+               return TAPI_NETWORK_SYSTEM_1X_EVDO_REV_A_HYBRID;
 
-               case 0x18:
-                       return TAPI_NETWORK_SYSTEM_EVDO_REV_B;
+       case 0x18:
+               return TAPI_NETWORK_SYSTEM_EVDO_REV_B;
 
-               case 0x19:
-                       return TAPI_NETWORK_SYSTEM_1X_EVDO_REV_B_HYBRID;
+       case 0x19:
+               return TAPI_NETWORK_SYSTEM_1X_EVDO_REV_B_HYBRID;
 
-               case 0x1A:
-                       return TAPI_NETWORK_SYSTEM_EVDV;
+       case 0x1A:
+               return TAPI_NETWORK_SYSTEM_EVDV;
 
-               case 0x1B:
-                       return TAPI_NETWORK_SYSTEM_EHRPD;
+       case 0x1B:
+               return TAPI_NETWORK_SYSTEM_EHRPD;
 
-               case 0x21:
-                       return TAPI_NETWORK_SYSTEM_LTE;
+       case 0x21:
+               return TAPI_NETWORK_SYSTEM_LTE;
 
-               default:
-                       break;
+       default:
+               break;
        }
 
        return TAPI_NETWORK_SYSTEM_NO_SRV;
 }
 
-static void on_signal_registration_status (TapiHandle *handle, GVariant *param,
-               char *noti_id, struct tapi_evt_cb *evt_cb_data)
+static void on_signal_registration_status(TapiHandle *handle, GVariant *param,
+       char *noti_id, struct tapi_evt_cb *evt_cb_data)
 {
        TelNetworkRegistrationStatus_t noti;
 
@@ -165,7 +165,7 @@ static void on_signal_registration_status (TapiHandle *handle, GVariant *param,
        CALLBACK_CALL(&noti);
 }
 
-static void on_signal_strength (TapiHandle *handle, GVariant *param,
+static void on_signal_strength(TapiHandle *handle, GVariant *param,
                char *noti_id, struct tapi_evt_cb *evt_cb_data)
 {
        struct tel_noti_network_signal_strength noti;
@@ -175,8 +175,8 @@ static void on_signal_strength (TapiHandle *handle, GVariant *param,
        CALLBACK_CALL(&noti);
 }
 
-static void on_signal_cell_info (TapiHandle *handle, GVariant *param,
-               char *noti_id, struct tapi_evt_cb *evt_cb_data)
+static void on_signal_cell_info(TapiHandle *handle, GVariant *param,
+       char *noti_id, struct tapi_evt_cb *evt_cb_data)
 {
        struct tel_noti_network_cell_info noti;
 
@@ -186,8 +186,8 @@ static void on_signal_cell_info (TapiHandle *handle, GVariant *param,
        CALLBACK_CALL(&noti);
 }
 
-static void on_signal_change (TapiHandle *handle, GVariant *param,
-               char *noti_id, struct tapi_evt_cb *evt_cb_data)
+static void on_signal_change(TapiHandle *handle, GVariant *param,
+       char *noti_id, struct tapi_evt_cb *evt_cb_data)
 {
        struct tel_noti_network_change noti;
        char *plmn = NULL;
@@ -206,8 +206,8 @@ static void on_signal_change (TapiHandle *handle, GVariant *param,
        CALLBACK_CALL(&noti);
 }
 
-static void on_signal_time_info (TapiHandle *handle, GVariant *param,
-               char *noti_id, struct tapi_evt_cb *evt_cb_data)
+static void on_signal_time_info(TapiHandle *handle, GVariant *param,
+       char *noti_id, struct tapi_evt_cb *evt_cb_data)
 {
        struct tel_noti_network_time_info noti;
        char *plmn = NULL;
@@ -226,8 +226,8 @@ static void on_signal_time_info (TapiHandle *handle, GVariant *param,
        CALLBACK_CALL(&noti);
 }
 
-static void on_signal_identity (TapiHandle *handle, GVariant *param,
-               char *noti_id, struct tapi_evt_cb *evt_cb_data)
+static void on_signal_identity(TapiHandle *handle, GVariant *param,
+       char *noti_id, struct tapi_evt_cb *evt_cb_data)
 {
        struct tel_noti_network_identity noti;
        char *plmn = NULL, *s_name = NULL, *f_name = NULL;
@@ -252,8 +252,8 @@ static void on_signal_identity (TapiHandle *handle, GVariant *param,
        CALLBACK_CALL(&noti);
 }
 
-static void on_emergency_callback_mode (TapiHandle *handle, GVariant *param,
-               char *noti_id, struct tapi_evt_cb *evt_cb_data)
+static void on_emergency_callback_mode(TapiHandle *handle, GVariant *param,
+       char *noti_id, struct tapi_evt_cb *evt_cb_data)
 {
        struct tel_noti_network_emergency_callback_mode noti;
 
@@ -264,8 +264,8 @@ static void on_emergency_callback_mode (TapiHandle *handle, GVariant *param,
        CALLBACK_CALL(&noti);
 }
 
-static void on_signal_default_data_subscription (TapiHandle *handle, GVariant *param,
-               char *noti_id, struct tapi_evt_cb *evt_cb_data)
+static void on_signal_default_data_subscription(TapiHandle *handle, GVariant *param,
+       char *noti_id, struct tapi_evt_cb *evt_cb_data)
 {
        struct tel_noti_network_default_data_subs noti;
 
@@ -276,8 +276,8 @@ static void on_signal_default_data_subscription (TapiHandle *handle, GVariant *p
        CALLBACK_CALL(&noti);
 }
 
-static void on_signal_default_subscription (TapiHandle *handle, GVariant *param,
-               char *noti_id, struct tapi_evt_cb *evt_cb_data)
+static void on_signal_default_subscription(TapiHandle *handle, GVariant *param,
+       char *noti_id, struct tapi_evt_cb *evt_cb_data)
 {
        struct tel_noti_network_default_subs noti;
 
@@ -288,6 +288,7 @@ static void on_signal_default_subscription (TapiHandle *handle, GVariant *param,
        CALLBACK_CALL(&noti);
 }
 
+
 static struct signal_map signals[] = {
        { "RegistrationStatus", on_signal_registration_status },
        { "SignalStrength", on_signal_strength },
@@ -306,15 +307,15 @@ void _process_network_event(const gchar *sig, GVariant *param,
        unsigned int i;
        TAPI_RETURN_IF_FAIL(evt_cb_data);
 
-       for (i = 0; i < sizeof (signals) / sizeof (struct signal_map); i++) {
+       for (i = 0; i < sizeof(signals) / sizeof(struct signal_map); i++) {
                dbg("Received (%s)(%s) signal from telephony", handle->cp_name, sig);
-               if (!g_strcmp0 (sig, signals[i].signal_name)) {
-                       signals[i].callback (handle, param, noti_id, evt_cb_data);
+               if (!g_strcmp0(sig, signals[i].signal_name)) {
+                       signals[i].callback(handle, param, noti_id, evt_cb_data);
                        return;
                }
        }
 
-       dbg("not handled NETWORK noti[%s]",sig );
+       dbg("not handled NETWORK noti[%s]", sig);
 }
 
 static gboolean _check_plmn(const char *plmn)
@@ -337,7 +338,7 @@ static gboolean _check_plmn(const char *plmn)
 
 static gboolean _check_operation(TelNetworkPreferredPlmnOp_t operation)
 {
-       switch(operation) {
+       switch (operation) {
        case TAPI_NETWORK_PREF_PLMN_ADD:
        case TAPI_NETWORK_PREF_PLMN_EDIT:
        case TAPI_NETWORK_PREF_PLMN_DELETE:
@@ -356,34 +357,36 @@ static gboolean _check_network_mode(int mode)
        if (mode == TAPI_NETWORK_MODE_AUTO) {
                return TRUE;
        } else {
-               if (mode & TAPI_NETWORK_MODE_GSM) {
+               if (mode & TAPI_NETWORK_MODE_GSM)
                        mode &= ~TAPI_NETWORK_MODE_GSM;
-               }
-               if (mode & TAPI_NETWORK_MODE_WCDMA) {
+
+               if (mode & TAPI_NETWORK_MODE_WCDMA)
                        mode &= ~TAPI_NETWORK_MODE_WCDMA;
-               }
-               if (mode & TAPI_NETWORK_MODE_1XRTT) {
+
+               if (mode & TAPI_NETWORK_MODE_1XRTT)
                        mode &= ~TAPI_NETWORK_MODE_1XRTT;
-               }
-               if (mode & TAPI_NETWORK_MODE_LTE) {
+
+               if (mode & TAPI_NETWORK_MODE_LTE)
                        mode &= ~TAPI_NETWORK_MODE_LTE;
-               }
-               if (mode & TAPI_NETWORK_MODE_EVDO) {
+
+               if (mode & TAPI_NETWORK_MODE_EVDO)
                        mode &= ~TAPI_NETWORK_MODE_EVDO;
-               }
+
                if (mode == 0)
                        return TRUE;
        }
+
        err("mode %d is not supported", mode);
        return FALSE;
 }
 
 static gboolean _check_emergency_callback_mode(TelNetworkEmergencyCallbackMode_t mode)
 {
-       switch(mode) {
+       switch (mode) {
        case TAPI_NETWORK_EMERGENCY_CALLBACK_MODE_ENTER:
        case TAPI_NETWORK_EMERGENCY_CALLBACK_MODE_EXIT:
                return TRUE;
+
        default:
                /*Do Nothing*/
                err("Default Case executed. Unknown Emergency callback mode");
@@ -395,7 +398,7 @@ static gboolean _check_emergency_callback_mode(TelNetworkEmergencyCallbackMode_t
 
 static gboolean _check_roaming_preference(TelNetworkPrefNetType_t roam_pref)
 {
-       switch(roam_pref) {
+       switch (roam_pref) {
        case TAPI_NETWORK_PREF_NET_TYPE_HOME_ONLY:
        case TAPI_NETWORK_PREF_NET_TYPE_AFFILIATED:
        case TAPI_NETWORK_PREF_NET_TYPE_AUTOMATIC:
@@ -406,16 +409,18 @@ static gboolean _check_roaming_preference(TelNetworkPrefNetType_t roam_pref)
        case TAPI_NETWORK_PREF_NET_TYPE_ROAM_DUAL:
        case TAPI_NETWORK_PREF_NET_TYPE_BLANK:
                return TRUE;
+
        default:
                /*Do Nothing*/
                err("Default Case executed. Unknown roaming preference");
                break;
        }
+
        err("roam_pref %d is not supported", roam_pref);
        return FALSE;
 }
 
-static void on_response_search_network (GObject *source_object,
+static void on_response_search_network(GObject *source_object,
                GAsyncResult *res, gpointer user_data)
 {
        GError *error = NULL;
@@ -431,13 +436,12 @@ static void on_response_search_network (GObject *source_object,
        GVariantIter *iter_row = NULL;
        const gchar *key = NULL;
 
-       memset (&list, 0, sizeof(TelNetworkPlmnList_t));
+       memset(&list, 0, sizeof(TelNetworkPlmnList_t));
 
-       dbus_result = g_dbus_connection_call_finish (
-                       G_DBUS_CONNECTION (source_object), res, &error);
+       dbus_result = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source_object), res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(aa{sv}i)", &iter, &result);
+       g_variant_get(dbus_result, "(aa{sv}i)", &iter, &result);
 
        list.networks_count = g_variant_iter_n_children(iter);
 
@@ -447,14 +451,11 @@ static void on_response_search_network (GObject *source_object,
                        if (!g_strcmp0(key, "plmn")) {
                                strncpy(list.network_list[i].plmn, g_variant_get_string(value, NULL), TAPI_NETWORK_PLMN_LEN_MAX);
                                list.network_list[i].plmn_id = atoi(g_variant_get_string(value, NULL));
-                       }
-                       if (!g_strcmp0(key, "act")) {
+                       } else if (!g_strcmp0(key, "act")) {
                                list.network_list[i].access_technology = _convert_act_to_systemtype(g_variant_get_int32(value));
-                       }
-                       if (!g_strcmp0(key, "type")) {
+                       } else if (!g_strcmp0(key, "type")) {
                                list.network_list[i].type_of_plmn = g_variant_get_int32(value);
-                       }
-                       if (!g_strcmp0(key, "name")) {
+                       } else if (!g_strcmp0(key, "name")) {
                                strncpy(list.network_list[i].network_name, g_variant_get_string(value, NULL), 40);
                        }
                }
@@ -463,16 +464,15 @@ static void on_response_search_network (GObject *source_object,
        }
        g_variant_iter_free(iter);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
-static void on_response_get_network_selection_mode (GObject *source_object,
-               GAsyncResult *res, gpointer user_data)
+static void on_response_get_network_selection_mode(GObject *source_object,
+       GAsyncResult *res, gpointer user_data)
 {
        GError *error = NULL;
        struct tapi_resp_data *evt_cb_data = user_data;
@@ -481,21 +481,19 @@ static void on_response_get_network_selection_mode (GObject *source_object,
        GVariant *dbus_result;
        int mode = 0;
 
-       dbus_result = g_dbus_connection_call_finish (
-                       G_DBUS_CONNECTION (source_object), res, &error);
+       dbus_result = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source_object), res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(ii)", &mode, &result);
+       g_variant_get(dbus_result, "(ii)", &mode, &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &mode, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
-static void on_response_default_set (GObject *source_object, GAsyncResult *res,
+static void on_response_default_set(GObject *source_object, GAsyncResult *res,
                gpointer user_data)
 {
        GError *error = NULL;
@@ -504,21 +502,19 @@ static void on_response_default_set (GObject *source_object, GAsyncResult *res,
 
        GVariant *dbus_result;
 
-       dbus_result = g_dbus_connection_call_finish (
-                       G_DBUS_CONNECTION (source_object), res, &error);
+       dbus_result = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source_object), res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(i)", &result);
+       g_variant_get(dbus_result, "(i)", &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
-static void on_response_get_network_preferred_plmn (GObject *source_object,
+static void on_response_get_network_preferred_plmn(GObject *source_object,
                GAsyncResult *res, gpointer user_data)
 {
        GError *error = NULL;
@@ -534,21 +530,19 @@ static void on_response_get_network_preferred_plmn (GObject *source_object,
        GVariantIter *iter_row = NULL;
        const gchar *key = NULL;
 
-       memset (&list, 0, sizeof(TelNetworkPreferredPlmnList_t));
+       memset(&list, 0, sizeof(TelNetworkPreferredPlmnList_t));
 
-       dbus_result = g_dbus_connection_call_finish (
-                       G_DBUS_CONNECTION (source_object), res, &error);
+       dbus_result = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source_object), res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(aa{sv}i)", &iter, &result);
+       g_variant_get(dbus_result, "(aa{sv}i)", &iter, &result);
 
        list.NumOfPrefPlmns = g_variant_iter_n_children(iter);
 
        if (list.NumOfPrefPlmns == 0) {
                dbg("num_of_.. = 0");
-               if (evt_cb_data->cb_fn) {
+               if (evt_cb_data->cb_fn)
                        evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data);
-               }
 
                g_free(evt_cb_data);
                return;
@@ -557,33 +551,28 @@ static void on_response_get_network_preferred_plmn (GObject *source_object,
        i = 0;
        while (g_variant_iter_next(iter, "a{sv}", &iter_row)) {
                while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
-                       if (!g_strcmp0(key, "plmn")) {
+                       if (!g_strcmp0(key, "plmn"))
                                strncpy(list.PrefPlmnRecord[i].Plmn, g_variant_get_string(value, NULL), 6);
-                       }
-                       if (!g_strcmp0(key, "act")) {
+                       else if (!g_strcmp0(key, "act"))
                                list.PrefPlmnRecord[i].SystemType = _convert_act_to_systemtype(g_variant_get_int32(value));
-                       }
-                       if (!g_strcmp0(key, "index")) {
+                       else if (!g_strcmp0(key, "index"))
                                list.PrefPlmnRecord[i].Index = g_variant_get_int32(value);
-                       }
-                       if (!g_strcmp0(key, "name")) {
+                       else if (!g_strcmp0(key, "name"))
                                strncpy(list.PrefPlmnRecord[i].network_name, g_variant_get_string(value, NULL), 40);
-                       }
                }
                i++;
                g_variant_iter_free(iter_row);
        }
        g_variant_iter_free(iter);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
-static void on_response_get_network_mode (GObject *source_object,
+static void on_response_get_network_mode(GObject *source_object,
                GAsyncResult *res, gpointer user_data)
 {
        GError *error = NULL;
@@ -593,21 +582,19 @@ static void on_response_get_network_mode (GObject *source_object,
        GVariant *dbus_result;
        int mode = 0;
 
-       dbus_result = g_dbus_connection_call_finish (
-                       G_DBUS_CONNECTION (source_object), res, &error);
+       dbus_result = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source_object), res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(ii)", &mode, &result);
+       g_variant_get(dbus_result, "(ii)", &mode, &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &mode, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
-static void on_response_get_network_serving (GObject *source_object,
+static void on_response_get_network_serving(GObject *source_object,
                GAsyncResult *res, gpointer user_data)
 {
        GError *error = NULL;
@@ -624,13 +611,12 @@ static void on_response_get_network_serving (GObject *source_object,
        int v0, v4, v5;
        char v1, v2, v3, v6, v7;
 
-       memset (&data, 0, sizeof(TelNetworkServing_t));
+       memset(&data, 0, sizeof(TelNetworkServing_t));
 
-       dbus_result = g_dbus_connection_call_finish (
-                       G_DBUS_CONNECTION (source_object), res, &error);
+       dbus_result = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source_object), res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(a{sv}i)", &iter, &result);
+       g_variant_get(dbus_result, "(a{sv}i)", &iter, &result);
 
        while (g_variant_iter_loop(iter, "{sv}", &key, &value)) {
                if (!g_strcmp0(key, "serving")) {
@@ -640,12 +626,10 @@ static void on_response_get_network_serving (GObject *source_object,
                                snprintf(data.plmn, 7, "%s", plmn);
                                g_free(plmn);
                        }
-               }
-               else if (!g_strcmp0(key, "g_serving")) {
+               } else if (!g_strcmp0(key, "g_serving")) {
                        g_variant_get(value, "(i)", &v0);
                        data.info.lac = v0;
-               }
-               else if (!g_strcmp0(key, "c_serving")) {
+               } else if (!g_strcmp0(key, "c_serving")) {
                        g_variant_get(value, "(iuuuiiuu)", &v0, &v1, &v2, &v3, &v4, &v5, &v6, &v7);
                        data.info.cdma_info.carrier = v0;
                        data.info.cdma_info.system_id = v1;
@@ -659,15 +643,14 @@ static void on_response_get_network_serving (GObject *source_object,
        }
        g_variant_iter_free(iter);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
-static void on_response_get_neighboring_cell_info (GObject *source_object,
+static void on_response_get_neighboring_cell_info(GObject *source_object,
                GAsyncResult *res, gpointer user_data)
 {
        GError *error = NULL;
@@ -684,47 +667,42 @@ static void on_response_get_neighboring_cell_info (GObject *source_object,
        const gchar *key = NULL;
        gint v0, v1, v2, v3, v4, v5;
 
-       memset (&list, 0, sizeof(TelNetworkNeighboringCellInfo_t));
+       memset(&list, 0, sizeof(TelNetworkNeighboringCellInfo_t));
 
-       dbus_result = g_dbus_connection_call_finish (
-                       G_DBUS_CONNECTION (source_object), res, &error);
+       dbus_result = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source_object), res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(aa{sv}i)", &iter, &result);
+       g_variant_get(dbus_result, "(aa{sv}i)", &iter, &result);
 
        while (g_variant_iter_next(iter, "a{sv}", &iter_row)) {
                while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
                        if (!g_strcmp0(key, "serving")) {
-                               g_variant_get(value, "(iii)", &v0,&v1,&v2);
+                               g_variant_get(value, "(iii)", &v0, &v1, &v2);
                                list.serving.act = _convert_act_to_systemtype(v0);
                                list.serving.mcc = v1;
                                list.serving.mnc = v2;
-                       }
-                       else if (!g_strcmp0(key, "g_serving")) {
-                               g_variant_get(value, "(iiiii)", &v0,&v1,&v2,&v3,&v4);
-                               list.serving.cell.geran.cell_id = v0;
-                               list.serving.cell.geran.lac             = v1;
-                               list.serving.cell.geran.bcch    = v2;
-                               list.serving.cell.geran.bsic    = v3;
-                               list.serving.cell.geran.rxlev   = v4;
-                       }
-                       else if (!g_strcmp0(key, "u_serving")) {
-                               g_variant_get(value, "(iiiii)", &v0,&v1,&v2,&v3,&v4);
-                               list.serving.cell.umts.cell_id  = v0;
-                               list.serving.cell.umts.lac              = v1;
-                               list.serving.cell.umts.arfcn    = v2;
-                               list.serving.cell.umts.psc              = v3;
-                               list.serving.cell.umts.rscp             = v4;
-                       }
-                       else if (!g_strcmp0(key, "l_serving")) {
-                               g_variant_get(value, "(iiiii)", &v0,&v1,&v2,&v3,&v4);
-                               list.serving.cell.lte.cell_id   = v0;
-                               list.serving.cell.lte.lac               = v1;
-                               list.serving.cell.lte.earfcn    = v2;
-                               list.serving.cell.lte.tac               = v3;
-                               list.serving.cell.lte.rssi              = v4;
-                       }
-                       else if (!g_strcmp0(key, "c_serving")) {
+                       } else if (!g_strcmp0(key, "g_serving")) {
+                               g_variant_get(value, "(iiiii)", &v0, &v1, &v2, &v3, &v4);
+                               list.serving.cell.geran.cell_id = v0;
+                               list.serving.cell.geran.lac = v1;
+                               list.serving.cell.geran.bcch = v2;
+                               list.serving.cell.geran.bsic = v3;
+                               list.serving.cell.geran.rxlev = v4;
+                       } else if (!g_strcmp0(key, "u_serving")) {
+                               g_variant_get(value, "(iiiii)", &v0, &v1, &v2, &v3, &v4);
+                               list.serving.cell.umts.cell_id = v0;
+                               list.serving.cell.umts.lac = v1;
+                               list.serving.cell.umts.arfcn = v2;
+                               list.serving.cell.umts.psc = v3;
+                               list.serving.cell.umts.rscp = v4;
+                       } else if (!g_strcmp0(key, "l_serving")) {
+                               g_variant_get(value, "(iiiii)", &v0, &v1, &v2, &v3, &v4);
+                               list.serving.cell.lte.cell_id = v0;
+                               list.serving.cell.lte.lac = v1;
+                               list.serving.cell.lte.earfcn = v2;
+                               list.serving.cell.lte.tac = v3;
+                               list.serving.cell.lte.rssi = v4;
+                       } else if (!g_strcmp0(key, "c_serving")) {
                                g_variant_get(value, "(uuuuii)", &v0, &v1, &v2, &v3, &v4, &v5);
                                list.serving.cell.cdma.system_id = v0;
                                list.serving.cell.cdma.network_id = v1;
@@ -732,23 +710,21 @@ static void on_response_get_neighboring_cell_info (GObject *source_object,
                                list.serving.cell.cdma.reference_pn = v3;
                                list.serving.cell.cdma.base_station_latitude = v4;
                                list.serving.cell.cdma.base_station_longitude = v5;
-                       }
-                       else if (!g_strcmp0(key, "geran")) {
-                               g_variant_get(value, "(iiiii)", &v0,&v1,&v2,&v3,&v4);
-                               list.geran_list[geran_index].cell_id    = v0;
-                               list.geran_list[geran_index].lac                = v1;
-                               list.geran_list[geran_index].bcch               = v2;
-                               list.geran_list[geran_index].bsic               = v3;
-                               list.geran_list[geran_index].rxlev              = v4;
+                       } else if (!g_strcmp0(key, "geran")) {
+                               g_variant_get(value, "(iiiii)", &v0, &v1, &v2, &v3, &v4);
+                               list.geran_list[geran_index].cell_id = v0;
+                               list.geran_list[geran_index].lac = v1;
+                               list.geran_list[geran_index].bcch = v2;
+                               list.geran_list[geran_index].bsic = v3;
+                               list.geran_list[geran_index].rxlev = v4;
                                geran_index++;
-                       }
-                       else if (!g_strcmp0(key, "umts")) {
-                               g_variant_get(value, "(iiiii)", &v0,&v1,&v2,&v3,&v4);
-                               list.umts_list[umts_index].cell_id      = v0;
-                               list.umts_list[umts_index].lac          = v1;
-                               list.umts_list[umts_index].arfcn        = v2;
-                               list.umts_list[umts_index].psc          = v3;
-                               list.umts_list[umts_index].rscp         = v4;
+                       } else if (!g_strcmp0(key, "umts")) {
+                               g_variant_get(value, "(iiiii)", &v0, &v1, &v2, &v3, &v4);
+                               list.umts_list[umts_index].cell_id = v0;
+                               list.umts_list[umts_index].lac   = v1;
+                               list.umts_list[umts_index].arfcn = v2;
+                               list.umts_list[umts_index].psc = v3;
+                               list.umts_list[umts_index].rscp = v4;
                                umts_index++;
                        }
                }
@@ -760,50 +736,52 @@ static void on_response_get_neighboring_cell_info (GObject *source_object,
        list.umts_list_count = umts_index;
        dbg("act=%d, count(geran:%d, umts:%d)", list.serving.act, geran_index, umts_index);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
-static void on_response_select_network (GObject *source_object, GAsyncResult *res,
-        gpointer user_data)
+static void on_response_select_network(GObject *source_object, GAsyncResult *res,
+       gpointer user_data)
 {
        GError *error = NULL;
        struct tapi_resp_data *evt_cb_data = user_data;
        int result = -1;
        GVariant *dbus_result;
 
-       dbus_result = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source_object), res, &error);
+       dbus_result = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source_object), res, &error);
        CHECK_ERROR(error);
-       g_variant_get (dbus_result, "(i)", &result);
+       g_variant_get(dbus_result, "(i)", &result);
 
        /* Map result received from libtcore to TapiResult_t */
-       if (result == 0)
+       if (result == 0) {
                result = TAPI_API_SUCCESS;
-       else {
+       else {
                switch (result) {
-                       case 0x50000001:
-                               result = TAPI_API_NETWORK_PLMN_NOT_ALLOWED;
-                               break;
-                       case 0x50000002:
-                               result = TAPI_API_NETWORK_ROAMING_NOT_ALLOWED;
-                               break;
-                       default:
-                               /*Do Nothing*/
-                               break;
+               case 0x50000001:
+                       result = TAPI_API_NETWORK_PLMN_NOT_ALLOWED;
+               break;
+
+               case 0x50000002:
+                       result = TAPI_API_NETWORK_ROAMING_NOT_ALLOWED;
+               break;
+
+               default:
+                       /*Do Nothing*/
+               break;
                }
        }
-       if (evt_cb_data->cb_fn) {
+
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
-       }
+
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
-static void on_response_get_network_roaming_preference (GObject *source_object,
+static void on_response_get_network_roaming_preference(GObject *source_object,
                GAsyncResult *res, gpointer user_data)
 {
        GError *error = NULL;
@@ -813,15 +791,13 @@ static void on_response_get_network_roaming_preference (GObject *source_object,
        GVariant *dbus_result;
        TelNetworkPrefNetType_t roam_pref;
 
-       dbus_result = g_dbus_connection_call_finish (
-                       G_DBUS_CONNECTION (source_object), res, &error);
+       dbus_result = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source_object), res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(ii)", &roam_pref, &result);
+       g_variant_get(dbus_result, "(ii)", &roam_pref, &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &roam_pref, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -904,7 +880,7 @@ EXPORT_API int tel_select_network_manual(struct tapi_handle *handle, const char
                        plmn,
                        _convert_systemtype_to_act(type));
 
-       msg("[%s] manual selection requested plmn:[%s] type:[%d]",handle->cp_name, plmn?plmn:"", type);
+       msg("[%s] manual selection requested plmn:[%s] type:[%d]", handle->cp_name, plmn ? plmn : "", type);
 
        g_dbus_connection_call(handle->dbus_connection,
                        DBUS_TELEPHONY_SERVICE , handle->path, DBUS_TELEPHONY_NETWORK_INTERFACE,
@@ -935,29 +911,29 @@ EXPORT_API int tel_set_network_preferred_plmn(
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
        switch (info->SystemType) {
-               case TAPI_NETWORK_SYSTEM_GSM:
-                       act = 1;
-                       break;
+       case TAPI_NETWORK_SYSTEM_GSM:
+               act = 1;
+       break;
 
-               case TAPI_NETWORK_SYSTEM_UMTS:
-                       act = 4;
-                       break;
+       case TAPI_NETWORK_SYSTEM_UMTS:
+               act = 4;
+       break;
 
-               case TAPI_NETWORK_SYSTEM_GPRS:
-                       act = 2;
-                       break;
+       case TAPI_NETWORK_SYSTEM_GPRS:
+               act = 2;
+       break;
 
-               case TAPI_NETWORK_SYSTEM_EGPRS:
-                       act = 3;
-                       break;
+       case TAPI_NETWORK_SYSTEM_EGPRS:
+               act = 3;
+       break;
 
-               case TAPI_NETWORK_SYSTEM_GSM_AND_UMTS:
-                       act = 4;
-                       break;
+       case TAPI_NETWORK_SYSTEM_GSM_AND_UMTS:
+               act = 4;
+       break;
 
-               default:
-                       act = 4;
-                       break;
+       default:
+               act = 4;
+       break;
        }
 
        param = g_variant_new("(iiis)",
index ba22464a066f088d1c74b67ce316c2bf35ebceda..9eae10295c8d467966206e9da430e52d81f83fdf 100644 (file)
 #include "tapi_log.h"
 #include "ITapiPhonebook.h"
 
-static void move_str (char *dest, unsigned int len, gchar *src)
+static void move_str(char *dest, unsigned int len, gchar *src)
 {
        if (!dest || !src)
                return;
 
-       if (strlen (src) == 0)
+       if (strlen(src) == 0)
                return;
 
-       snprintf (dest, len, "%s", src);
+       snprintf(dest, len, "%s", src);
 }
 
 static void on_response_get_sim_pb_count(GObject *source_object, GAsyncResult *res, gpointer user_data)
@@ -55,11 +55,11 @@ static void on_response_get_sim_pb_count(GObject *source_object, GAsyncResult *r
 
        memset(&pb_cnt, 0, sizeof(TelSimPbStorageInfo_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(iiii)",
+       g_variant_get(dbus_result, "(iiii)",
                        &result,
                        &pb_cnt.StorageFileType,
                        &used,
@@ -68,9 +68,8 @@ static void on_response_get_sim_pb_count(GObject *source_object, GAsyncResult *r
        pb_cnt.UsedRecordCount = used;
        pb_cnt.TotalRecordCount = total;
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &pb_cnt, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -90,11 +89,11 @@ static void on_response_get_sim_pb_meta_info(GObject *source_object, GAsyncResul
 
        memset(&pb_entry, 0, sizeof(TelSimPbEntryInfo_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(iiiiiii)",
+       g_variant_get(dbus_result, "(iiiiiii)",
                        &result,
                        &pb_entry.StorageFileType,
                        &imin,
@@ -105,13 +104,12 @@ static void on_response_get_sim_pb_meta_info(GObject *source_object, GAsyncResul
 
        pb_entry.PbIndexMin = imin;
        pb_entry.PbIndexMax = imax;
-       pb_entry.PbNumLenMax =nmax;
+       pb_entry.PbNumLenMax = nmax;
        pb_entry.PbTextLenMax = tmax;
        pb_entry.PbUsedCount = used;
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &pb_entry, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -134,7 +132,7 @@ static void on_response_get_sim_pb_usim_meta_info(GObject *source_object, GAsync
        dbg("Func Entrance");
        memset(&list, 0, sizeof(TelSimPbCapabilityInfo_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
@@ -144,27 +142,22 @@ static void on_response_get_sim_pb_usim_meta_info(GObject *source_object, GAsync
        i = 0;
        while (g_variant_iter_next(iter, "a{sv}", &iter_row)) {
                while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
-                       if (!g_strcmp0(key, "field_type")) {
+                       if (!g_strcmp0(key, "field_type"))
                                list.FileTypeInfo[i].field_type = g_variant_get_int32(value);
-                       }
-                       if (!g_strcmp0(key, "index_max")) {
+                       else if (!g_strcmp0(key, "index_max"))
                                list.FileTypeInfo[i].index_max = g_variant_get_int32(value);
-                       }
-                       if (!g_strcmp0(key, "text_max")) {
+                       else if (!g_strcmp0(key, "text_max"))
                                list.FileTypeInfo[i].text_max = g_variant_get_int32(value);
-                       }
-                       if (!g_strcmp0(key, "used_count")) {
+                       else if (!g_strcmp0(key, "used_count"))
                                list.FileTypeInfo[i].used_count = g_variant_get_int32(value);
-                       }
                }
                i++;
                g_variant_iter_free(iter_row);
        }
        g_variant_iter_free(iter);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -194,11 +187,11 @@ static void on_response_read_sim_pb_record(GObject *source_object, GAsyncResult
 
        memset(&pb_rec, 0, sizeof(TelSimPbRecord_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(iiiisisisisisisissssi)",
+       g_variant_get(dbus_result, "(iiiisisisisisisissssi)",
                        &result,
                        &pb_rec.phonebook_type,
                        &i,
@@ -224,24 +217,24 @@ static void on_response_read_sim_pb_record(GObject *source_object, GAsyncResult
        pb_rec.index = i;
        pb_rec.next_index = ni;
 
-       move_str ((char *)pb_rec.name, TAPI_SIM_PB_RECORD_NAME_MAX_LEN, name);
-       move_str ((char *)pb_rec.number, TAPI_SIM_PB_RECORD_NUMBER_MAX_LEN, number);
-       move_str ((char *)pb_rec.sne, TAPI_SIM_PB_RECORD_NAME_MAX_LEN, sne);
-       move_str ((char *)pb_rec.anr1, TAPI_SIM_PB_RECORD_NUMBER_MAX_LEN, anr1);
-       move_str ((char *)pb_rec.anr2, TAPI_SIM_PB_RECORD_NUMBER_MAX_LEN, anr2);
-       move_str ((char *)pb_rec.anr3, TAPI_SIM_PB_RECORD_NUMBER_MAX_LEN, anr3);
-       move_str ((char *)pb_rec.email1, TAPI_SIM_PB_RECORD_EMAIL_MAX_LEN, email1);
-       move_str ((char *)pb_rec.email2, TAPI_SIM_PB_RECORD_EMAIL_MAX_LEN, email2);
-       move_str ((char *)pb_rec.email3, TAPI_SIM_PB_RECORD_EMAIL_MAX_LEN, email3);
+       move_str((char *)pb_rec.name, TAPI_SIM_PB_RECORD_NAME_MAX_LEN, name);
+       move_str((char *)pb_rec.number, TAPI_SIM_PB_RECORD_NUMBER_MAX_LEN, number);
+       move_str((char *)pb_rec.sne, TAPI_SIM_PB_RECORD_NAME_MAX_LEN, sne);
+       move_str((char *)pb_rec.anr1, TAPI_SIM_PB_RECORD_NUMBER_MAX_LEN, anr1);
+       move_str((char *)pb_rec.anr2, TAPI_SIM_PB_RECORD_NUMBER_MAX_LEN, anr2);
+       move_str((char *)pb_rec.anr3, TAPI_SIM_PB_RECORD_NUMBER_MAX_LEN, anr3);
+       move_str((char *)pb_rec.email1, TAPI_SIM_PB_RECORD_EMAIL_MAX_LEN, email1);
+       move_str((char *)pb_rec.email2, TAPI_SIM_PB_RECORD_EMAIL_MAX_LEN, email2);
+       move_str((char *)pb_rec.email3, TAPI_SIM_PB_RECORD_EMAIL_MAX_LEN, email3);
 
        msg("type[%d], index[%d], next_index[%d]", pb_rec.phonebook_type,
                        pb_rec.index, pb_rec.next_index);
        dbg("name[%s], dcs[%d]", pb_rec.name, pb_rec.dcs);
        dbg("number[%s], ton[%d]", pb_rec.number, pb_rec.ton);
 
-       if (pb_rec.phonebook_type==TAPI_SIM_PB_3GSIM) {
+       if (pb_rec.phonebook_type == TAPI_SIM_PB_3GSIM) {
                dbg("sne[%s], sne_dcs[%d]", pb_rec.sne, pb_rec.sne_dcs);
-               dbg("anr1([%d][%s]),anr2([%d][%s]),anr3([%d][%s])",
+               dbg("anr1([%d][%s]), anr2([%d][%s]), anr3([%d][%s])",
                                pb_rec.anr1_ton, pb_rec.anr1, pb_rec.anr2_ton, pb_rec.anr2,
                                pb_rec.anr3_ton, pb_rec.anr3);
                dbg("email[%s] [%s][%s][%s]", pb_rec.email1, pb_rec.email2,
@@ -250,9 +243,8 @@ static void on_response_read_sim_pb_record(GObject *source_object, GAsyncResult
                                pb_rec.pb_control);
        }
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &pb_rec, evt_cb_data->user_data);
-       }
 
        g_free(name);
        g_free(number);
@@ -278,15 +270,14 @@ static void on_response_update_sim_pb_record(GObject *source_object, GAsyncResul
        struct tapi_resp_data *evt_cb_data = user_data;
        TelSimPbAccessResult_t result = TAPI_SIM_PB_SUCCESS;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(i)", &result);
+       g_variant_get(dbus_result, "(i)", &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -301,15 +292,14 @@ static void on_response_delete_sim_pb_record(GObject *source_object, GAsyncResul
        struct tapi_resp_data *evt_cb_data = user_data;
        TelSimPbAccessResult_t result = TAPI_SIM_PB_SUCCESS;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(i)", &result);
+       g_variant_get(dbus_result, "(i)", &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -340,15 +330,14 @@ EXPORT_API int tel_get_sim_pb_init_info(TapiHandle *handle, int *init_completed,
                                &pb_list->b_gas);
                *init_completed = init_status;
                g_variant_unref(sync_gv);
-       }
-       else {
+       } else {
                err("Operation Failed - Error: (%s)", gerr->message);
-               g_error_free (gerr);
+               g_error_free(gerr);
                return TAPI_API_OPERATION_FAILED;
        }
 
        dbg("b_(fdn[%d] adn[%d] sdn[%d] 3g[%d] aas[%d] gas[%d])",
-               pb_list->b_fdn,pb_list->b_adn,pb_list->b_sdn,pb_list->b_3g,pb_list->b_aas,pb_list->b_gas);
+               pb_list->b_fdn, pb_list->b_adn, pb_list->b_sdn, pb_list->b_3g, pb_list->b_aas, pb_list->b_gas);
 
        return TAPI_API_SUCCESS;
 }
@@ -363,7 +352,7 @@ EXPORT_API int tel_get_sim_pb_count(TapiHandle *handle, TelSimPbType_t pb_type,
        TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR);
        TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR);
 
-       if ( (pb_type != TAPI_SIM_PB_FDN) && (pb_type != TAPI_SIM_PB_ADN) && (pb_type != TAPI_SIM_PB_SDN)
+       if ((pb_type != TAPI_SIM_PB_FDN) && (pb_type != TAPI_SIM_PB_ADN) && (pb_type != TAPI_SIM_PB_SDN)
                        && (pb_type     != TAPI_SIM_PB_3GSIM) && (pb_type != TAPI_SIM_PB_AAS) && (pb_type != TAPI_SIM_PB_GAS))
                return TAPI_API_INVALID_INPUT;
 
@@ -390,7 +379,7 @@ EXPORT_API int tel_get_sim_pb_meta_info(TapiHandle *handle, TelSimPbType_t pb_ty
        TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR);
        TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR);
 
-       if ( (pb_type != TAPI_SIM_PB_FDN) && (pb_type != TAPI_SIM_PB_ADN) && (pb_type != TAPI_SIM_PB_SDN)
+       if ((pb_type != TAPI_SIM_PB_FDN) && (pb_type != TAPI_SIM_PB_ADN) && (pb_type != TAPI_SIM_PB_SDN)
                        && (pb_type     != TAPI_SIM_PB_3GSIM) && (pb_type != TAPI_SIM_PB_AAS) && (pb_type != TAPI_SIM_PB_GAS))
                return TAPI_API_INVALID_INPUT;
 
@@ -441,7 +430,7 @@ EXPORT_API int tel_read_sim_pb_record(TapiHandle *handle, TelSimPbType_t pb_type
        if (pb_index == 0)
                return TAPI_API_INVALID_INPUT;
 
-       if ( (pb_type != TAPI_SIM_PB_FDN) && (pb_type != TAPI_SIM_PB_ADN) && (pb_type != TAPI_SIM_PB_SDN)
+       if ((pb_type != TAPI_SIM_PB_FDN) && (pb_type != TAPI_SIM_PB_ADN) && (pb_type != TAPI_SIM_PB_SDN)
                        && (pb_type     != TAPI_SIM_PB_3GSIM) && (pb_type != TAPI_SIM_PB_AAS) && (pb_type != TAPI_SIM_PB_GAS))
                return TAPI_API_INVALID_INPUT;
 
@@ -468,9 +457,8 @@ EXPORT_API int tel_update_sim_pb_record(TapiHandle *handle, const TelSimPbRecord
        TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR);
        TAPI_RET_ERR_NUM_IF_FAIL((req_data != NULL) , TAPI_API_INVALID_PTR);
 
-       if (req_data->index == 0) {
+       if (req_data->index == 0)
                return TAPI_API_INVALID_INPUT;
-       }
 
        if ((req_data->phonebook_type != TAPI_SIM_PB_FDN)
                        && (req_data->phonebook_type != TAPI_SIM_PB_ADN) && (req_data->phonebook_type != TAPI_SIM_PB_SDN)
@@ -481,16 +469,16 @@ EXPORT_API int tel_update_sim_pb_record(TapiHandle *handle, const TelSimPbRecord
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
-       msg("type[%d], index[%d], next_index[%d]",req_data->phonebook_type, req_data->index, req_data->next_index);
-       dbg("name[%s], dcs[%d]",req_data->name, req_data->dcs);
-       dbg("number[%s], ton[%d]",req_data->number, req_data->ton);
+       msg("type[%d], index[%d], next_index[%d]", req_data->phonebook_type, req_data->index, req_data->next_index);
+       dbg("name[%s], dcs[%d]", req_data->name, req_data->dcs);
+       dbg("number[%s], ton[%d]", req_data->number, req_data->ton);
 
-       if(req_data->phonebook_type == TAPI_SIM_PB_3GSIM) {
-               dbg("sne[%s] sne_dcs[%d]",req_data->sne, req_data->sne_dcs);
-               dbg("anr1([%d][%s]),anr2([%d][%s]),anr3([%d][%s])",
-                       req_data->anr1_ton,req_data->anr1,req_data->anr2_ton,req_data->anr2,req_data->anr3_ton,req_data->anr3);
-               dbg("email[%s] [%s][%s][%s]",req_data->email1,req_data->email2,req_data->email3,req_data->email4);
-               dbg("group_index[%d], pb_control[%d]",req_data->group_index,req_data->pb_control);
+       if (req_data->phonebook_type == TAPI_SIM_PB_3GSIM) {
+               dbg("sne[%s] sne_dcs[%d]", req_data->sne, req_data->sne_dcs);
+               dbg("anr1([%d][%s]), anr2([%d][%s]), anr3([%d][%s])",
+                       req_data->anr1_ton, req_data->anr1, req_data->anr2_ton, req_data->anr2, req_data->anr3_ton, req_data->anr3);
+               dbg("email[%s] [%s][%s][%s]", req_data->email1, req_data->email2, req_data->email3, req_data->email4);
+               dbg("group_index[%d], pb_control[%d]", req_data->group_index, req_data->pb_control);
        }
 
        param = g_variant_new("(iisisisisisisissssi)",
@@ -537,7 +525,7 @@ EXPORT_API int tel_delete_sim_pb_record(TapiHandle *handle, TelSimPbType_t pb_ty
        if (pb_index == 0)
                return TAPI_API_INVALID_INPUT;
 
-       if ( (pb_type != TAPI_SIM_PB_FDN) && (pb_type != TAPI_SIM_PB_ADN) && (pb_type != TAPI_SIM_PB_SDN)
+       if ((pb_type != TAPI_SIM_PB_FDN) && (pb_type != TAPI_SIM_PB_ADN) && (pb_type != TAPI_SIM_PB_SDN)
                        && (pb_type     != TAPI_SIM_PB_3GSIM) && (pb_type != TAPI_SIM_PB_AAS) && (pb_type != TAPI_SIM_PB_GAS))
                return TAPI_API_INVALID_INPUT;
 
index 657d8b5c7b2ccdf8a3eb3cdc5804d608ba59c8e5..ba87cd791f2e1e60b1f6724c8020afdd1d1f9414 100644 (file)
@@ -43,15 +43,14 @@ static void on_response_sap_connect(GObject *source_object, GAsyncResult *res, g
 
        dbg("Func Entrance");
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
        g_variant_get(dbus_result, "(ii)", &result, &max_msg_size);
 
-       if (evt_cb_data->cb_fn) {
-               evt_cb_data->cb_fn(evt_cb_data->handle, result, (void*)&max_msg_size, evt_cb_data->user_data);
-       }
+       if (evt_cb_data->cb_fn)
+               evt_cb_data->cb_fn(evt_cb_data->handle, result, (void *)&max_msg_size, evt_cb_data->user_data);
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -62,16 +61,19 @@ EXPORT_API int tel_req_sap_connect(TapiHandle *handle, int max_msg_size, tapi_re
        struct tapi_resp_data *evt_cb_data = NULL;
        GVariant *param = NULL;
 
-       dbg("Func Entrance w/ max_msg_size[%d]",max_msg_size);
+       dbg("Func Entrance w/ max_msg_size[%d]", max_msg_size);
 
        TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR);
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
        param = g_variant_new("(i)", max_msg_size);
-       g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE, handle->path,
-                       DBUS_TELEPHONY_SAP_INTERFACE, "Connect", param, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
-                       handle->ca, on_response_sap_connect, evt_cb_data);
+       g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE,
+               handle->path,
+               DBUS_TELEPHONY_SAP_INTERFACE,
+               "Connect",
+               param, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
+               handle->ca, on_response_sap_connect, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
@@ -87,15 +89,14 @@ static void on_response_sap_disconnect(GObject *source_object, GAsyncResult *res
 
        dbg("Func Entrance");
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
        g_variant_get(dbus_result, "(i)", &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -111,8 +112,11 @@ EXPORT_API int tel_req_sap_disconnect(TapiHandle *handle, tapi_response_cb callb
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
-               g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE, handle->path,
-                       DBUS_TELEPHONY_SAP_INTERFACE, "Disconnect", NULL, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
+               g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE,
+                       handle->path,
+                       DBUS_TELEPHONY_SAP_INTERFACE,
+                       "Disconnect",
+                       NULL, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
                        handle->ca, on_response_sap_disconnect, evt_cb_data);
 
        return TAPI_API_SUCCESS;
@@ -129,15 +133,14 @@ static void on_response_sap_connection_status(GObject *source_object, GAsyncResu
 
        dbg("Func Entrance");
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
        g_variant_get(dbus_result, "(i)", &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -153,9 +156,12 @@ EXPORT_API int tel_req_sap_connection_status(TapiHandle *handle, tapi_response_c
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
-       g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE, handle->path,
-                       DBUS_TELEPHONY_SAP_INTERFACE, "GetStatus", NULL, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
-                       handle->ca, on_response_sap_connection_status, evt_cb_data);
+       g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE,
+               handle->path,
+               DBUS_TELEPHONY_SAP_INTERFACE,
+               "GetStatus",
+               NULL, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
+               handle->ca, on_response_sap_connection_status, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
@@ -179,7 +185,7 @@ static void on_response_sap_transfer_atr(GObject *source_object, GAsyncResult *r
        dbg("Func Entrance");
        memset(&r_atr, 0, sizeof(TelSapAtrInfo_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
@@ -196,12 +202,9 @@ static void on_response_sap_transfer_atr(GObject *source_object, GAsyncResult *r
        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++)
-        dbg("r_atr[%d][0x%02x]",i, r_atr.atr_data[i]);*/
 
-       if (evt_cb_data->cb_fn) {
-               evt_cb_data->cb_fn(evt_cb_data->handle, result, (void*)&r_atr, evt_cb_data->user_data);
-       }
+       if (evt_cb_data->cb_fn)
+               evt_cb_data->cb_fn(evt_cb_data->handle, result, (void *)&r_atr, evt_cb_data->user_data);
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -217,9 +220,12 @@ EXPORT_API int tel_req_sap_transfer_atr(TapiHandle *handle, tapi_response_cb cal
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
-       g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE, handle->path,
-                       DBUS_TELEPHONY_SAP_INTERFACE, "GetATR", NULL, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
-                       handle->ca, on_response_sap_transfer_atr, evt_cb_data);
+       g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE,
+               handle->path,
+               DBUS_TELEPHONY_SAP_INTERFACE,
+               "GetATR",
+               NULL, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
+               handle->ca, on_response_sap_transfer_atr, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
@@ -243,11 +249,10 @@ static void on_response_sap_transfer_apdu(GObject *source_object, GAsyncResult *
        dbg("Func Entrance");
        memset(&r_apdu, 0, sizeof(TelSapApduData_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       /*      dbg("dbus_result type_format(%s)", g_variant_get_type_string(dbus_result));*/
        g_variant_get(dbus_result, "(i@v)", &result, &param_gv);
        inner_gv = g_variant_get_variant(param_gv);
 
@@ -260,12 +265,9 @@ static void on_response_sap_transfer_apdu(GObject *source_object, GAsyncResult *
        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++)
-        dbg("apdu[%d][0x%02x]",i, r_apdu.apdu_data[i]);*/
 
-       if (evt_cb_data->cb_fn) {
-               evt_cb_data->cb_fn(evt_cb_data->handle, result, (void*)&r_apdu, evt_cb_data->user_data);
-       }
+       if (evt_cb_data->cb_fn)
+               evt_cb_data->cb_fn(evt_cb_data->handle, result, (void *)&r_apdu, evt_cb_data->user_data);
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -286,18 +288,20 @@ EXPORT_API int tel_req_sap_transfer_apdu(TapiHandle *handle, TelSapApduData_t *a
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
-       g_variant_builder_init(&builder, G_VARIANT_TYPE ("ay"));
+       g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
        for (i = 0; i < apdu_data->apdu_len; i++) {
-               dbg("apdu_data->apdu_data[%d][0x%02x]", i,apdu_data->apdu_data[i]);
+               dbg("apdu_data->apdu_data[%d][0x%02x]", i, apdu_data->apdu_data[i]);
                g_variant_builder_add(&builder, "y", apdu_data->apdu_data[i]);
        }
        inner_gv = g_variant_builder_end(&builder);
        param = g_variant_new("(v)", inner_gv);
-       /*g_variant_builder_unref (builder);*/
 
-       g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE, handle->path,
-                       DBUS_TELEPHONY_SAP_INTERFACE, "TransferAPDU", param, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
-                       handle->ca, on_response_sap_transfer_apdu, evt_cb_data);
+       g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE,
+               handle->path,
+               DBUS_TELEPHONY_SAP_INTERFACE,
+               "TransferAPDU",
+               param, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
+               handle->ca, on_response_sap_transfer_apdu, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
@@ -313,21 +317,21 @@ static void on_response_sap_transport_protocol(GObject *source_object, GAsyncRes
 
        dbg("Func Entrance");
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
        g_variant_get(dbus_result, "(i)", &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
-EXPORT_API int tel_req_sap_transport_protocol(TapiHandle *handle, TelSimSapProtocol_t protocol, tapi_response_cb callback, void *user_data)
+EXPORT_API int tel_req_sap_transport_protocol(TapiHandle *handle,
+       TelSimSapProtocol_t protocol, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = NULL;
        GVariant *param = NULL;
@@ -339,9 +343,12 @@ EXPORT_API int tel_req_sap_transport_protocol(TapiHandle *handle, TelSimSapProto
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
        param = g_variant_new("(i)", protocol);
-       g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE, handle->path,
-                       DBUS_TELEPHONY_SAP_INTERFACE, "SetProtocol", param, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
-                       handle->ca, on_response_sap_transport_protocol, evt_cb_data);
+       g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE,
+               handle->path,
+               DBUS_TELEPHONY_SAP_INTERFACE,
+               "SetProtocol",
+               param, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
+               handle->ca, on_response_sap_transport_protocol, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
@@ -357,21 +364,21 @@ static void on_response_sap_power_operation(GObject *source_object, GAsyncResult
 
        dbg("Func Entrance");
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
        g_variant_get(dbus_result, "(i)", &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
-EXPORT_API int tel_req_sap_power_operation(TapiHandle *handle, TelSimSapPowerMode_t power_mode, tapi_response_cb callback, void *user_data)
+EXPORT_API int tel_req_sap_power_operation(TapiHandle *handle,
+       TelSimSapPowerMode_t power_mode, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = NULL;
        GVariant *param = NULL;
@@ -383,24 +390,30 @@ EXPORT_API int tel_req_sap_power_operation(TapiHandle *handle, TelSimSapPowerMod
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
        switch (power_mode) {
-               case TAPI_SIM_SAP_POWER_SIM_ON_REQ:
-                       mode = 0;
-                       break;
-               case TAPI_SIM_SAP_POWER_SIM_OFF_REQ:
-                       mode =1;
-                       break;
-               case TAPI_SIM_SAP_RESET_SIM_REQ:
-                       mode = 2;
-                       break;
-               default:
-                       dbg("not handed value[%d]", power_mode);
-                       break;
+       case TAPI_SIM_SAP_POWER_SIM_ON_REQ:
+               mode = 0;
+       break;
+
+       case TAPI_SIM_SAP_POWER_SIM_OFF_REQ:
+               mode = 1;
+       break;
+
+       case TAPI_SIM_SAP_RESET_SIM_REQ:
+               mode = 2;
+       break;
+
+       default:
+               dbg("not handed value[%d]", power_mode);
+       break;
        }
 
        param = g_variant_new("(i)", mode);
-       g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE, handle->path,
-                       DBUS_TELEPHONY_SAP_INTERFACE, "SetPower", param, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
-                       handle->ca, on_response_sap_power_operation, evt_cb_data);
+       g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE,
+               handle->path,
+               DBUS_TELEPHONY_SAP_INTERFACE,
+               "SetPower",
+               param, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
+               handle->ca, on_response_sap_power_operation, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
@@ -417,15 +430,14 @@ static void on_response_sap_cardreader_status(GObject *source_object, GAsyncResu
 
        dbg("Func Entrance");
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
        g_variant_get(dbus_result, "(ii)", &result, &reader_status);
 
-       if (evt_cb_data->cb_fn) {
-               evt_cb_data->cb_fn(evt_cb_data->handle, result, (void*)&reader_status, evt_cb_data->user_data);
-       }
+       if (evt_cb_data->cb_fn)
+               evt_cb_data->cb_fn(evt_cb_data->handle, result, (void *)&reader_status, evt_cb_data->user_data);
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -441,9 +453,12 @@ EXPORT_API int tel_req_sap_cardreader_status(TapiHandle *handle, tapi_response_c
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
-       g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE, handle->path,
-                       DBUS_TELEPHONY_SAP_INTERFACE, "GetCardReaderStatus", NULL, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
-                       handle->ca, on_response_sap_cardreader_status, evt_cb_data);
+       g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE,
+               handle->path,
+               DBUS_TELEPHONY_SAP_INTERFACE,
+               "GetCardReaderStatus",
+               NULL, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
+               handle->ca, on_response_sap_cardreader_status, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
index b15fce9a58a43b7da46891020f2a77801d93718a..ba4835d5ff4e40aa4e43c4a6044dd3f97d37e4c2 100644 (file)
 
 extern TelSatEventDownloadType_t g_event_list[TAPI_SAT_EVENT_LIST_MAX_COUNT];
 
-static GVariant_tapi_sat_gen_app_exec_result_data(TelSatAppsRetInfo_t *result_info)
+static GVariant *_tapi_sat_gen_app_exec_result_data(TelSatAppsRetInfo_t *result_info)
 {
        GVariant *result = NULL;
 
-       switch(result_info->commandType)
-       {
-               case TAPI_SAT_CMD_TYPE_SETUP_MENU:{
-                       gint exec_result;
-                       dbg("setup menu : result format (i)");
-
-                       exec_result = result_info->appsRet.setupMenu.resp;
-                       result = g_variant_new("(i)", exec_result);
-               } break;
-               case TAPI_SAT_CMD_TYPE_REFRESH:{
-                       gint app_type, exec_result;
-                       dbg("refresh : result format (ii)");
-
-                       app_type = result_info->appsRet.refresh.appType;
-                       exec_result = result_info->appsRet.refresh.resp;
-                       result = g_variant_new("(ii)", app_type, exec_result);
-               } break;
-               case TAPI_SAT_CMD_TYPE_SETUP_CALL:{
-                       gint exec_result, me_problem, call_ctrl_problem, call_cause;
-                       dbg("setup call : result format (iiii)");
-
-                       exec_result = result_info->appsRet.setupCall.resp;
-                       me_problem = result_info->appsRet.setupCall.meProblem;
-                       call_ctrl_problem = result_info->appsRet.setupCall.permanentCallCtrlProblem;
-                       call_cause = result_info->appsRet.setupCall.tapiCause;
-                       result = g_variant_new("(iiii)", exec_result, me_problem, call_ctrl_problem, call_cause);
-               } break;
-               case TAPI_SAT_CMD_TYPE_SEND_SS:{
-                       int ss_index;
-                       gint exec_result, me_problem, ss_cause, call_ctrl_problem, ss_str_len;
-                       GVariantBuilder builder;
-                       GVariant *ss_str = NULL;
-                       dbg("send ss : result format (iiivii)");
-
-                       exec_result = result_info->appsRet.sendSs.resp;
-                       me_problem = result_info->appsRet.sendSs.meProblem;
-                       ss_cause = result_info->appsRet.sendSs.ssCause;
-                       call_ctrl_problem = result_info->appsRet.sendSs.additionalCallCtrlProblemInfo;
-                       ss_str_len = result_info->appsRet.sendSs.ssString.stringLen;
-
-                       g_variant_builder_init(&builder, G_VARIANT_TYPE ("ay"));
-                       for (ss_index = 0; ss_index < ss_str_len; ss_index++) {
-                               dbg("index(%d) data(%d)", ss_index, result_info->appsRet.sendSs.ssString.string[ss_index]);
-                               g_variant_builder_add(&builder, "y", result_info->appsRet.sendSs.ssString.string[ss_index]);
-                       }
-                       ss_str = g_variant_builder_end(&builder);
-
-                       result = g_variant_new("(iiivii)", exec_result, me_problem, ss_cause, ss_str, ss_str_len, call_ctrl_problem);
-               } break;
-               case TAPI_SAT_CMD_TYPE_SEND_USSD:{
-                       int ussd_index;
-                       gint exec_result, me_problem, ss_cause, ussd_str_len;
-                       GVariantBuilder builder;
-                       GVariant *ussd_str = NULL;
-
-                       dbg("send ussd : result format (iiivi)");
-
-                       exec_result = result_info->appsRet.sendUssd.resp;
-                       me_problem = result_info->appsRet.sendUssd.meProblem;
-                       ss_cause = result_info->appsRet.sendUssd.ssCause;
-                       ussd_str_len = result_info->appsRet.sendUssd.ussdString.stringLen;
-
-                       g_variant_builder_init(&builder, G_VARIANT_TYPE ("ay"));
-                       for (ussd_index = 0; ussd_index < ussd_str_len; ussd_index++) {
-                               dbg("index(%d) data(%d)", ussd_index, result_info->appsRet.sendUssd.ussdString.string[ussd_index]);
-                               g_variant_builder_add(&builder, "y", result_info->appsRet.sendUssd.ussdString.string[ussd_index]);
-                       }
-                       ussd_str = g_variant_builder_end(&builder);
-
-                       result = g_variant_new("(iiivi)", exec_result, me_problem, ss_cause, ussd_str, ussd_str_len);
-               } break;
-               case TAPI_SAT_CMD_TYPE_SEND_SMS:{
-                       gint exec_result;
-                       dbg("send sms: result format (i)");
-
-                       exec_result = result_info->appsRet.sendSms.resp;
-                       result = g_variant_new("(i)", exec_result);
-               } break;
-               case TAPI_SAT_CMD_TYPE_SEND_DTMF:{
-                       gint exec_result;
-                       dbg("send DTMF: result format (i)");
-
-                       exec_result = result_info->appsRet.sendDtmf.resp;
-                       result = g_variant_new("(i)", exec_result);
-               } break;
-               case TAPI_SAT_CMD_TYPE_LAUNCH_BROWSER:{
-                       gint exec_result, browser_problem;
-                       dbg("launch browser: result format (ii)");
-
-                       exec_result = result_info->appsRet.launchBrowser.resp;
-                       browser_problem = result_info->appsRet.launchBrowser.browserProblem;
-                       result = g_variant_new("(ii)", exec_result, browser_problem);
-               } break;
-               case TAPI_SAT_CMD_TYPE_SETUP_IDLE_MODE_TEXT:{
-                       gint exec_result;
-                       dbg("setup idle mode text: result format (i)");
-
-                       exec_result = result_info->appsRet.setupIdleModeText.resp;
-                       result = g_variant_new("(i)", exec_result);
-               } break;
-               case TAPI_SAT_CMD_TYPE_LANGUAGE_NOTIFICATION:{
-                       gint exec_result;
-                       dbg("language notification: result format (i)");
-
-                       exec_result = result_info->appsRet.languageNoti.resp;
-                       result = g_variant_new("(i)", exec_result);
-               } break;
-               case TAPI_SAT_CMD_TYPE_PROVIDE_LOCAL_INFO:{
-                       gint exec_result;
-                       dbg("provide local info: result format (i)");
-
-                       exec_result = result_info->appsRet.provideLocalInfo.resp;
-                       result = g_variant_new("(i)", exec_result);
-               } break;
-               case TAPI_SAT_CMD_TYPE_PLAY_TONE:{
-                       gint exec_result;
-                       dbg("play tone: result format (i)");
-
-                       exec_result = result_info->appsRet.playTone.resp;
-                       result = g_variant_new("(i)", exec_result);
-               } break;
-               case TAPI_SAT_CMD_TYPE_DISPLAY_TEXT:{
-                       gint exec_result, me_problem;
-                       dbg("display text: result format (ii)");
-
-                       exec_result = result_info->appsRet.displayText.resp;
-                       me_problem = result_info->appsRet.displayText.meProblem;
-                       result = g_variant_new("(ii)", exec_result, me_problem);
-               } break;
-               default:
-                       dbg("unhandled command type(0x%x", result_info->commandType);
-                       result = g_variant_new("()");
-                       break;
+       switch (result_info->commandType) {
+       case TAPI_SAT_CMD_TYPE_SETUP_MENU: {
+               gint exec_result;
+               dbg("setup menu : result format (i)");
+
+               exec_result = result_info->appsRet.setupMenu.resp;
+               result = g_variant_new("(i)", exec_result);
+       }
+       break;
+
+       case TAPI_SAT_CMD_TYPE_REFRESH: {
+               gint app_type, exec_result;
+               dbg("refresh : result format (ii)");
+
+               app_type = result_info->appsRet.refresh.appType;
+               exec_result = result_info->appsRet.refresh.resp;
+               result = g_variant_new("(ii)", app_type, exec_result);
+       }
+       break;
+
+       case TAPI_SAT_CMD_TYPE_SETUP_CALL: {
+               gint exec_result, me_problem, call_ctrl_problem, call_cause;
+               dbg("setup call : result format (iiii)");
+
+               exec_result = result_info->appsRet.setupCall.resp;
+               me_problem = result_info->appsRet.setupCall.meProblem;
+               call_ctrl_problem = result_info->appsRet.setupCall.permanentCallCtrlProblem;
+               call_cause = result_info->appsRet.setupCall.tapiCause;
+               result = g_variant_new("(iiii)", exec_result, me_problem, call_ctrl_problem, call_cause);
+       }
+       break;
+
+       case TAPI_SAT_CMD_TYPE_SEND_SS: {
+               int ss_index;
+               gint exec_result, me_problem, ss_cause, call_ctrl_problem, ss_str_len;
+               GVariantBuilder builder;
+               GVariant *ss_str = NULL;
+               dbg("send ss : result format (iiivii)");
+
+               exec_result = result_info->appsRet.sendSs.resp;
+               me_problem = result_info->appsRet.sendSs.meProblem;
+               ss_cause = result_info->appsRet.sendSs.ssCause;
+               call_ctrl_problem = result_info->appsRet.sendSs.additionalCallCtrlProblemInfo;
+               ss_str_len = result_info->appsRet.sendSs.ssString.stringLen;
+
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
+               for (ss_index = 0; ss_index < ss_str_len; ss_index++) {
+                       dbg("index(%d) data(%d)", ss_index, result_info->appsRet.sendSs.ssString.string[ss_index]);
+                       g_variant_builder_add(&builder, "y", result_info->appsRet.sendSs.ssString.string[ss_index]);
+               }
+               ss_str = g_variant_builder_end(&builder);
+
+               result = g_variant_new("(iiivii)", exec_result, me_problem, ss_cause, ss_str, ss_str_len, call_ctrl_problem);
+       }
+       break;
+
+       case TAPI_SAT_CMD_TYPE_SEND_USSD: {
+               int ussd_index;
+               gint exec_result, me_problem, ss_cause, ussd_str_len;
+               GVariantBuilder builder;
+               GVariant *ussd_str = NULL;
+
+               dbg("send ussd : result format (iiivi)");
+
+               exec_result = result_info->appsRet.sendUssd.resp;
+               me_problem = result_info->appsRet.sendUssd.meProblem;
+               ss_cause = result_info->appsRet.sendUssd.ssCause;
+               ussd_str_len = result_info->appsRet.sendUssd.ussdString.stringLen;
+
+               g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
+               for (ussd_index = 0; ussd_index < ussd_str_len; ussd_index++) {
+                       dbg("index(%d) data(%d)", ussd_index, result_info->appsRet.sendUssd.ussdString.string[ussd_index]);
+                       g_variant_builder_add(&builder, "y", result_info->appsRet.sendUssd.ussdString.string[ussd_index]);
+               }
+               ussd_str = g_variant_builder_end(&builder);
+
+               result = g_variant_new("(iiivi)", exec_result, me_problem, ss_cause, ussd_str, ussd_str_len);
+       }
+       break;
+
+       case TAPI_SAT_CMD_TYPE_SEND_SMS: {
+               gint exec_result;
+               dbg("send sms: result format (i)");
+
+               exec_result = result_info->appsRet.sendSms.resp;
+               result = g_variant_new("(i)", exec_result);
+       }
+       break;
+
+       case TAPI_SAT_CMD_TYPE_SEND_DTMF: {
+               gint exec_result;
+               dbg("send DTMF: result format (i)");
+
+               exec_result = result_info->appsRet.sendDtmf.resp;
+               result = g_variant_new("(i)", exec_result);
+       }
+       break;
+
+       case TAPI_SAT_CMD_TYPE_LAUNCH_BROWSER: {
+               gint exec_result, browser_problem;
+               dbg("launch browser: result format (ii)");
+
+               exec_result = result_info->appsRet.launchBrowser.resp;
+               browser_problem = result_info->appsRet.launchBrowser.browserProblem;
+               result = g_variant_new("(ii)", exec_result, browser_problem);
+       }
+       break;
+
+       case TAPI_SAT_CMD_TYPE_SETUP_IDLE_MODE_TEXT: {
+               gint exec_result;
+               dbg("setup idle mode text: result format (i)");
+
+               exec_result = result_info->appsRet.setupIdleModeText.resp;
+               result = g_variant_new("(i)", exec_result);
+       } break;
+       case TAPI_SAT_CMD_TYPE_LANGUAGE_NOTIFICATION: {
+               gint exec_result;
+               dbg("language notification: result format (i)");
+
+               exec_result = result_info->appsRet.languageNoti.resp;
+               result = g_variant_new("(i)", exec_result);
+       }
+       break;
+
+       case TAPI_SAT_CMD_TYPE_PROVIDE_LOCAL_INFO: {
+               gint exec_result;
+               dbg("provide local info: result format (i)");
+
+               exec_result = result_info->appsRet.provideLocalInfo.resp;
+               result = g_variant_new("(i)", exec_result);
+       }
+       break;
+
+       case TAPI_SAT_CMD_TYPE_PLAY_TONE: {
+               gint exec_result;
+               dbg("play tone: result format (i)");
+
+               exec_result = result_info->appsRet.playTone.resp;
+               result = g_variant_new("(i)", exec_result);
+       }
+       break;
+
+       case TAPI_SAT_CMD_TYPE_DISPLAY_TEXT: {
+               gint exec_result, me_problem;
+               dbg("display text: result format (ii)");
+
+               exec_result = result_info->appsRet.displayText.resp;
+               me_problem = result_info->appsRet.displayText.meProblem;
+               result = g_variant_new("(ii)", exec_result, me_problem);
+       }
+       break;
+
+       default:
+               dbg("unhandled command type(0x%x", result_info->commandType);
+               result = g_variant_new("()");
+       break;
        }
 
        return result;
 }
 
-static GVariant_tapi_sat_gen_event_download_data(const TelSatEventDownloadReqInfo_t *pEventData)
+static GVariant *_tapi_sat_gen_event_download_data(const TelSatEventDownloadReqInfo_t *pEventData)
 {
        GVariant *result = NULL;
 
-       switch(pEventData->eventDownloadType)
-       {
-               case TAPI_EVENT_SAT_DW_TYPE_IDLE_SCREEN_AVAILABLE:{
-                       gboolean idle_screen;
-                       dbg("idle screen available (%d)", pEventData->u.bIdleScreenAvailable);
-
-                       idle_screen = pEventData->u.bIdleScreenAvailable;
-                       result = g_variant_new("(b)", idle_screen);
-               } break;
-               case TAPI_EVENT_SAT_DW_TYPE_LANGUAGE_SELECTION:{
-                       gint selected_language;
-                       dbg("selected language (%d)", pEventData->u.languageSelectionEventReqInfo.language);
-
-                       selected_language = pEventData->u.languageSelectionEventReqInfo.language;
-                       result = g_variant_new("(i)", selected_language);
-               } break;
-               case TAPI_EVENT_SAT_DW_TYPE_BROWSER_TERMINATION:{
-                       gint browser_termination_cause;
-                       dbg("Cause of browser termination (%d)", pEventData->u.browserTerminationEventReqInfo.browserTerminationCause);
-
-                       browser_termination_cause = pEventData->u.browserTerminationEventReqInfo.browserTerminationCause;
-                       result = g_variant_new("(i)", browser_termination_cause);
-               } break;
-               case TAPI_EVENT_SAT_DW_TYPE_DATA_AVAILABLE:
-               case TAPI_EVENT_SAT_DW_TYPE_CHANNEL_STATUS:
-               default :
-                       dbg("not support download event (%d)", pEventData->eventDownloadType);
-                       result = g_variant_new("()");
-                       break;
+       switch (pEventData->eventDownloadType) {
+       case TAPI_EVENT_SAT_DW_TYPE_IDLE_SCREEN_AVAILABLE: {
+               gboolean idle_screen;
+               dbg("idle screen available (%d)", pEventData->u.bIdleScreenAvailable);
+
+               idle_screen = pEventData->u.bIdleScreenAvailable;
+               result = g_variant_new("(b)", idle_screen);
+       }
+       break;
+
+       case TAPI_EVENT_SAT_DW_TYPE_LANGUAGE_SELECTION: {
+               gint selected_language;
+               dbg("selected language (%d)", pEventData->u.languageSelectionEventReqInfo.language);
+
+               selected_language = pEventData->u.languageSelectionEventReqInfo.language;
+               result = g_variant_new("(i)", selected_language);
+       }
+       break;
+
+       case TAPI_EVENT_SAT_DW_TYPE_BROWSER_TERMINATION: {
+               gint browser_termination_cause;
+               dbg("Cause of browser termination (%d)", pEventData->u.browserTerminationEventReqInfo.browserTerminationCause);
+
+               browser_termination_cause = pEventData->u.browserTerminationEventReqInfo.browserTerminationCause;
+               result = g_variant_new("(i)", browser_termination_cause);
+       }
+       break;
+
+       case TAPI_EVENT_SAT_DW_TYPE_DATA_AVAILABLE:
+       case TAPI_EVENT_SAT_DW_TYPE_CHANNEL_STATUS:
+       default:
+               dbg("not support download event (%d)", pEventData->eventDownloadType);
+               result = g_variant_new("()");
+       break;
        }
 
        return result;
@@ -223,16 +251,15 @@ static void on_response_menu_selection_envelop(GObject *source_object, GAsyncRes
        int result = -1;
        int envelop_rsp = 0;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(ii)", &result, &envelop_rsp);
+       g_variant_get(dbus_result, "(ii)", &result, &envelop_rsp);
        dbg("menu selection envelop result(%d) envelop response(%d)", result, envelop_rsp);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &envelop_rsp, evt_cb_data->user_data);
-       }
 
        g_variant_unref(dbus_result);
        g_free(evt_cb_data);
@@ -249,16 +276,15 @@ static void on_response_download_event_envelop(GObject *source_object, GAsyncRes
        int result = -1;
        int envelop_rsp = 0;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(ii)", &result, &envelop_rsp);
+       g_variant_get(dbus_result, "(ii)", &result, &envelop_rsp);
        dbg("download event envelop result(%d) envelop response(%d)", result, envelop_rsp);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &envelop_rsp, evt_cb_data->user_data);
-       }
 
        g_variant_unref(dbus_result);
        g_free(evt_cb_data);
@@ -291,7 +317,7 @@ EXPORT_API int tel_select_sat_menu(TapiHandle *handle, const TelSatMenuSelection
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
        item_id = pMenuSelect->itemIdentifier;
-       help_req = ( (pMenuSelect->bIsHelpRequested != 0) ? TRUE : FALSE);
+       help_req = ((pMenuSelect->bIsHelpRequested != 0) ? TRUE : FALSE);
        dbg("item id(%d) help request(%d)", item_id, help_req);
        inparam = g_variant_new("(ib)", item_id, help_req);
 
@@ -330,14 +356,15 @@ EXPORT_API int tel_download_sat_event(TapiHandle *handle, const TelSatEventDownl
        TAPI_RET_ERR_NUM_IF_FAIL(handle->dbus_connection, TAPI_API_INVALID_PTR);
        TAPI_RET_ERR_NUM_IF_FAIL(pEventData, TAPI_API_INVALID_PTR);
 
-       for(g_index = 0; g_event_list[g_index] > 0; g_index++){
-               if(pEventData->eventDownloadType == TAPI_EVENT_SAT_DW_TYPE_BROWSER_TERMINATION || g_event_list[g_index] == pEventData->eventDownloadType ){
+       for (g_index = 0; g_event_list[g_index] > 0; g_index++) {
+               if (pEventData->eventDownloadType == TAPI_EVENT_SAT_DW_TYPE_BROWSER_TERMINATION
+                               || g_event_list[g_index] == pEventData->eventDownloadType) {
                        dbg("event (%d) shoud be passed to sim");
                        evt_check = TRUE;
                }
        }
 
-       if(!evt_check){
+       if (!evt_check) {
                dbg("sim does not request event(%d)", pEventData->eventDownloadType);
                return TAPI_API_SAT_EVENT_NOT_REQUIRED_BY_USIM;
        }
@@ -412,9 +439,9 @@ EXPORT_API int tel_get_sat_main_menu_info(TapiHandle *handle, TelSatSetupMenuInf
        rst = g_dbus_connection_call_sync(handle->dbus_connection, DBUS_TELEPHONY_SERVICE , handle->path,
                        DBUS_TELEPHONY_SAT_INTERFACE, "GetMainMenuInfo", NULL, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca, &error);
 
-       if(!rst){
-               dbg( "error to get main menu(%s)", error->message);
-               g_error_free (error);
+       if (!rst) {
+               dbg("error to get main menu(%s)", error->message);
+               g_error_free(error);
                return TAPI_API_OPERATION_FAILED;
        }
 
@@ -432,16 +459,15 @@ EXPORT_API int tel_get_sat_main_menu_info(TapiHandle *handle, TelSatSetupMenuInf
        pMainMenu->commandId = command_id;
        pMainMenu->bIsMainMenuPresent = (b_present ? 1 : 0);
 
-       if(strlen(title) > TAPI_SAT_DEF_TITLE_LEN_MAX+1){
+       if (strlen(title) > TAPI_SAT_DEF_TITLE_LEN_MAX+1)
                memcpy(pMainMenu->satMainTitle, title, TAPI_SAT_DEF_TITLE_LEN_MAX+1);
-       }
-       else{
+       else
                memcpy(pMainMenu->satMainTitle, title, strlen(title));
-       }
+
        g_free(title);
 
        pMainMenu->satMainMenuNum = item_cnt;
-       if(items && item_cnt > 0){
+       if (items && item_cnt > 0) {
                GVariant *unbox;
                GVariantIter *iter;
 
@@ -451,18 +477,15 @@ EXPORT_API int tel_get_sat_main_menu_info(TapiHandle *handle, TelSatSetupMenuInf
                dbg("items(%p) items type_format(%s)", items, g_variant_get_type_string(unbox));
 
                g_variant_get(unbox, "a(si)", &iter);
-               while(g_variant_iter_loop(iter,"(si)",&item_str, &item_id)){
+               while (g_variant_iter_loop(iter, "(si)", &item_str, &item_id)) {
                        pMainMenu->satMainMenuItem[sat_index].itemId = item_id;
 
-                       if(strlen(item_str) > TAPI_SAT_DEF_ITEM_STR_LEN_MAX + 6){
+                       if (strlen(item_str) > TAPI_SAT_DEF_ITEM_STR_LEN_MAX + 6)
                                memcpy(pMainMenu->satMainMenuItem[sat_index].itemString, item_str, TAPI_SAT_DEF_ITEM_STR_LEN_MAX + 6);
-                       }
-                       else{
+                       else
                                memcpy(pMainMenu->satMainMenuItem[sat_index].itemString, item_str, strlen(item_str));
-                       }
 
-                       dbg("item index(%d) id(%d) str(%s)",sat_index, pMainMenu->satMainMenuItem[sat_index].itemId, pMainMenu->satMainMenuItem[sat_index].itemString);
-                       //dbg("item index(%d) id(%d) str(%s)",index, item_id, item_str);
+                       dbg("item index(%d) id(%d) str(%s)", sat_index, pMainMenu->satMainMenuItem[sat_index].itemId, pMainMenu->satMainMenuItem[sat_index].itemString);
                        sat_index++;
                }
                g_variant_iter_free(iter);
@@ -471,12 +494,12 @@ EXPORT_API int tel_get_sat_main_menu_info(TapiHandle *handle, TelSatSetupMenuInf
        pMainMenu->bIsUpdatedSatMainMenu = (b_updated ? 1 : 0);
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-       if(icon_id) {
+       if (icon_id) {
                unbox = g_variant_get_variant(icon_id);
                g_variant_get(unbox, "a(biiiiiis)", &iter);
 
-               while(g_variant_iter_loop(iter,"(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)){
-                       if(!is_exist)
+               while (g_variant_iter_loop(iter, "(biiiiiis)", &is_exist, &icon_quali, &icon_identifier, &width, &height, &ics, &icon_data_len, &icon_data)) {
+                       if (!is_exist)
                                break;
                        pMainMenu->iconId.bIsPresent = is_exist;
                        pMainMenu->iconId.iconQualifier = icon_quali;
@@ -484,7 +507,7 @@ EXPORT_API int tel_get_sat_main_menu_info(TapiHandle *handle, TelSatSetupMenuInf
                        pMainMenu->iconId.iconInfo.width = width;
                        pMainMenu->iconId.iconInfo.height = height;
                        pMainMenu->iconId.iconInfo.ics = ics;
-                       if(icon_data_len > 0) {
+                       if (icon_data_len > 0) {
                                pMainMenu->iconId.iconInfo.iconDataLen = icon_data_len;
                                memcpy(pMainMenu->iconId.iconInfo.iconFile, icon_data, icon_data_len);
                        }
@@ -494,12 +517,12 @@ EXPORT_API int tel_get_sat_main_menu_info(TapiHandle *handle, TelSatSetupMenuInf
                g_variant_iter_free(iter);
        }
 
-       if(icon_list){
+       if (icon_list) {
                unbox_list = g_variant_get_variant(icon_list);
                g_variant_get(unbox_list, "a(biiv)", &iter);
 
-               while(g_variant_iter_loop(iter,"(biiv)", &is_list_exist, &icon_list_quali, &list_cnt, &icon_list_info)){
-                       if(!is_list_exist)
+               while (g_variant_iter_loop(iter, "(biiv)", &is_list_exist, &icon_list_quali, &list_cnt, &icon_list_info)) {
+                       if (!is_list_exist)
                                break;
                        pMainMenu->iconIdList.bIsPresent = is_list_exist;
                        pMainMenu->iconIdList.iconListQualifier = icon_list_quali;
@@ -508,12 +531,12 @@ EXPORT_API int tel_get_sat_main_menu_info(TapiHandle *handle, TelSatSetupMenuInf
                        unbox_list_info = g_variant_get_variant(icon_list_info);
                        g_variant_get(unbox_list_info, "a(iiiiis)", &iter2);
 
-                       while(g_variant_iter_loop(iter2,"(iiiiis)",&icon_list_identifier, &list_width, &list_height, &list_ics, &icon_list_data_len, &icon_list_data)){
-                               pMainMenu->iconIdList.iconIdentifierList[icon_index]= icon_identifier;
+                       while (g_variant_iter_loop(iter2, "(iiiiis)", &icon_list_identifier, &list_width, &list_height, &list_ics, &icon_list_data_len, &icon_list_data)) {
+                               pMainMenu->iconIdList.iconIdentifierList[icon_index] = icon_identifier;
                                pMainMenu->iconIdList.iconInfo[icon_index].width = list_width;
                                pMainMenu->iconIdList.iconInfo[icon_index].height = list_height;
                                pMainMenu->iconIdList.iconInfo[icon_index].ics = list_ics;
-                               if(icon_list_data_len > 0) {
+                               if (icon_list_data_len > 0) {
                                        pMainMenu->iconIdList.iconInfo[icon_index].iconDataLen = icon_list_data_len;
                                        memcpy(pMainMenu->iconIdList.iconInfo[icon_index].iconFile, icon_list_data, icon_list_data_len);
                                }
@@ -561,7 +584,7 @@ EXPORT_API int tel_send_sat_ui_display_status(TapiHandle *handle, int commandId,
        TAPI_RET_ERR_NUM_IF_FAIL(handle->dbus_connection, TAPI_API_INVALID_PTR);
 
        command_id = commandId;
-       display_status = ( (status == TAPI_SAT_DISPLAY_SUCCESS) ? TRUE : FALSE);
+       display_status = ((status == TAPI_SAT_DISPLAY_SUCCESS) ? TRUE : FALSE);
        dbg("command id(%d) display status(%d)", command_id, display_status);
        inparam = g_variant_new("(ib)", command_id, display_status);
 
@@ -569,21 +592,20 @@ EXPORT_API int tel_send_sat_ui_display_status(TapiHandle *handle, int commandId,
        rst = g_dbus_connection_call_sync(handle->dbus_connection, DBUS_TELEPHONY_SERVICE , handle->path,
                        DBUS_TELEPHONY_SAT_INTERFACE, "SendUiDisplayStatus", inparam, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca, &error);
 
-       if(!rst){
-               dbg( "error to send ui display status(%s)", error->message);
-               g_error_free (error);
+       if (!rst) {
+               dbg("error to send ui display status(%s)", error->message);
+               g_error_free(error);
                return TAPI_API_OPERATION_FAILED;
        }
 
        dbg("send ui display status format(%s)", g_variant_get_type_string(rst));
 
        g_variant_get(rst, "(i)", &result);
-       if(result){
+       if (result)
                result = TAPI_API_SUCCESS;
-       }
-       else{
+       else
                result = TAPI_API_OPERATION_FAILED;
-       }
+
        g_variant_unref(rst);
        dbg("result (%d)", result);
 
@@ -628,7 +650,7 @@ EXPORT_API int tel_send_sat_ui_user_confirm(TapiHandle *handle, TelSatUiUserConf
        data = (gchar *)pUserConfirmData->pAdditionalData;
        data_len = pUserConfirmData->dataLen;
 
-       g_variant_builder_init(&builder, G_VARIANT_TYPE ("ay"));
+       g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
        for (sat_index = 0; sat_index < data_len; sat_index++) {
                dbg("index(%d) data(%d)", sat_index, data[sat_index]);
                g_variant_builder_add(&builder, "y", data[sat_index]);
@@ -643,21 +665,20 @@ EXPORT_API int tel_send_sat_ui_user_confirm(TapiHandle *handle, TelSatUiUserConf
        rst = g_dbus_connection_call_sync(handle->dbus_connection, DBUS_TELEPHONY_SERVICE , handle->path,
                        DBUS_TELEPHONY_SAT_INTERFACE, "SendUserConfirm", inparam, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca, &error);
 
-       if(!rst){
-               dbg( "error to send ui user confirm(%s)", error->message);
-               g_error_free (error);
+       if (!rst) {
+               dbg("error to send ui user confirm(%s)", error->message);
+               g_error_free(error);
                return TAPI_API_OPERATION_FAILED;
        }
 
        dbg("send ui user confirm format(%s)", g_variant_get_type_string(rst));
 
        g_variant_get(rst, "(i)", &result);
-       if(result){
+       if (result)
                result = TAPI_API_SUCCESS;
-       }
-       else{
+       else
                result = TAPI_API_OPERATION_FAILED;
-       }
+
        g_variant_unref(rst);
        dbg("result (%d)", result);
 
@@ -702,21 +723,20 @@ EXPORT_API int tel_send_sat_app_exec_result(TapiHandle *handle, TelSatAppsRetInf
        rst = g_dbus_connection_call_sync(handle->dbus_connection, DBUS_TELEPHONY_SERVICE , handle->path,
                        DBUS_TELEPHONY_SAT_INTERFACE, "SendAppExecResult", inparam, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca, &error);
 
-       if(!rst){
-               dbg( "error to send app execution result(%s)", error->message);
-               g_error_free (error);
+       if (!rst) {
+               dbg("error to send app execution result(%s)", error->message);
+               g_error_free(error);
                return TAPI_API_OPERATION_FAILED;
        }
 
        dbg("send app execution result format(%s)", g_variant_get_type_string(rst));
 
        g_variant_get(rst, "(i)", &result);
-       if(result){
+       if (result)
                result = TAPI_API_SUCCESS;
-       }
-       else{
+       else
                result = TAPI_API_OPERATION_FAILED;
-       }
+
        g_variant_unref(rst);
        dbg("result (%d)", result);
 
index 0e5f293ecf5b468104c1164d42d0f40a23ef91a2..0f65b2008e3ced0ad448cfa986635b07fef33d77 100644 (file)
@@ -75,7 +75,7 @@
                } \
 }
 
-#define TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evtcbdata) { \
+#define TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evtcbdata) do { \
                TapiResult_t ret = TAPI_API_OPERATION_FAILED; \
                if (error) { \
                        ret = __check_err_msg(error->message); \
@@ -84,7 +84,7 @@
                TAPI_SIM_CALL_CBFUNC(evtcbdata, ret, NULL); \
                g_free(evtcbdata); \
                return; \
-}
+} while (0)
 
 #define SIM_CHECK_ERROR(error, evt_cb_data) \
        if (error) { \
@@ -117,39 +117,38 @@ struct tapi_sim_resp_data {
        TapiHandle *handle;
 };
 
-static TapiResult_t __check_err_msg(gcharerr_msg)
+static TapiResult_t __check_err_msg(gchar *err_msg)
 {
        TapiResult_t ret = TAPI_API_OPERATION_FAILED;
        if (err_msg == NULL)
                return ret;
 
-       err( "error from dbus layer. (%s)", err_msg);
+       err("error from dbus layer. (%s)", err_msg);
 
-       if( strstr(err_msg, DBUS_SIM_NOT_FOUND) ) {
+       if (strstr(err_msg, DBUS_SIM_NOT_FOUND))
                ret = TAPI_API_SIM_NOT_FOUND;
-       } else if( strstr(err_msg, DBUS_SIM_PERM_BLOCKED) ) {
+       else if (strstr(err_msg, DBUS_SIM_PERM_BLOCKED))
                ret = TAPI_API_SIM_PERM_BLOCKED;
-       } else if( strstr(err_msg, DBUS_SIM_CARD_ERROR) ) {
+       else if (strstr(err_msg, DBUS_SIM_CARD_ERROR))
                ret = TAPI_API_SIM_CARD_ERROR;
-       } else if( strstr(err_msg, DBUS_SIM_NOT_INITIALIZED) ) {
+       else if (strstr(err_msg, DBUS_SIM_NOT_INITIALIZED))
                ret = TAPI_API_SIM_NOT_INITIALIZED;
-       } else if( strstr(err_msg, DBUS_SIM_INIT_COMPLETED) ) {
+       else if (strstr(err_msg, DBUS_SIM_INIT_COMPLETED))
                ret = TAPI_API_SUCCESS;
-       } else if( strstr(err_msg, DBUS_SIM_LOCKED) ) {
+       else if (strstr(err_msg, DBUS_SIM_LOCKED))
                ret = TAPI_API_SIM_LOCKED;
-       } else if( strstr(err_msg, DBUS_SIM_NOT_READY) ) {
+       else if (strstr(err_msg, DBUS_SIM_NOT_READY))
                ret = TAPI_API_SERVICE_NOT_READY;
-       } else if( strstr(err_msg, DBUS_SIM_RESPONSE_DATA_ERROR) ) {
+       else if (strstr(err_msg, DBUS_SIM_RESPONSE_DATA_ERROR))
                ret = TAPI_API_OPERATION_FAILED;
-       } else if( strstr(err_msg, DBUS_SIM_SERVICE_IS_DISABLED) ) {
+       else if (strstr(err_msg, DBUS_SIM_SERVICE_IS_DISABLED))
                ret = TAPI_API_SIM_SERVICE_IS_DISABLED;
-       } else if (strstr(err_msg, DBUS_SIM_ACCESS_DENIED)) {
+       else if (strstr(err_msg, DBUS_SIM_ACCESS_DENIED))
                ret = TAPI_API_ACCESS_DENIED;
-       } else if( strstr(err_msg, DBUS_SIM_SERVICE_NOT_SUPPORTED_FOR_NVSIM) ){
+       else if (strstr(err_msg, DBUS_SIM_SERVICE_NOT_SUPPORTED_FOR_NVSIM))
                ret = TAPI_API_NOT_SUPPORTED;
-       }else {
+       else
                ret = TAPI_API_OPERATION_FAILED;
-       }
 
        return ret;
 }
@@ -173,17 +172,16 @@ static void on_response_get_sim_iccid(GObject *source_object, GAsyncResult *res,
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&iccid_info, 0, sizeof(TelSimIccIdInfo_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(is)", &result, &iccid);
-       iccid_info.icc_length = strlen((const char*)iccid);
-       if(iccid_info.icc_length > TAPI_SIM_ICCID_LEN_MAX){
+       iccid_info.icc_length = strlen((const char *)iccid);
+       if (iccid_info.icc_length > TAPI_SIM_ICCID_LEN_MAX) {
                dbg("current tapi support 20 byte but received length[%d] so changed");
                iccid_info.icc_length = TAPI_SIM_ICCID_LEN_MAX;
        }
@@ -196,7 +194,7 @@ static void on_response_get_sim_iccid(GObject *source_object, GAsyncResult *res,
 }
 
 static void on_response_get_sim_language(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -207,26 +205,24 @@ static void on_response_get_sim_language(GObject *source_object, GAsyncResult *r
        TelSimAccessResult_t result = TAPI_SIM_ACCESS_SUCCESS;
 
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(ii)", &result, &lang);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &lang, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
 static void on_response_set_sim_language(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -236,26 +232,24 @@ static void on_response_set_sim_language(GObject *source_object, GAsyncResult *r
        TelSimAccessResult_t result = TAPI_SIM_ACCESS_SUCCESS;
 
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(i)", &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
 static void on_response_get_sim_callforwarding_info(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -269,35 +263,31 @@ static void on_response_get_sim_callforwarding_info(GObject *source_object, GAsy
        struct tapi_resp_data *evt_cb_data = user_data;
        TelSimAccessResult_t result = TAPI_SIM_ACCESS_SUCCESS;
        TelSimCallForwardingResp_t cf;
-       int i =0;
+       int i = 0;
 
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&cf, 0, sizeof(TelSimCallForwardingResp_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
+
        dbg("dbus_result format(%s)", g_variant_get_type_string(dbus_result));
        g_variant_get(dbus_result, "(ibaa{sv}a{sv})", &result, &cf.b_cphs, &iter, &cphs_iter);
 
-       if( cf.b_cphs ) {
+       if (cf.b_cphs) {
                while (g_variant_iter_loop(cphs_iter, "{sv}", &key, &value)) {
-                       if (!g_strcmp0(key, "b_line1")) {
+                       if (!g_strcmp0(key, "b_line1"))
                                cf.cphs_cf.b_line1 = g_variant_get_boolean(value);
-                       }
-                       if (!g_strcmp0(key, "b_line2")) {
+                       else if (!g_strcmp0(key, "b_line2"))
                                cf.cphs_cf.b_line2 = g_variant_get_boolean(value);
-                       }
-                       if (!g_strcmp0(key, "b_fax")) {
+                       else if (!g_strcmp0(key, "b_fax"))
                                cf.cphs_cf.b_fax = g_variant_get_boolean(value);
-                       }
-                       if (!g_strcmp0(key, "b_data")) {
+                       else if (!g_strcmp0(key, "b_data"))
                                cf.cphs_cf.b_data = g_variant_get_boolean(value);
-                       }
                }
        } else {
                cf.cf_list.profile_count = g_variant_iter_n_children(iter);
@@ -306,27 +296,20 @@ static void on_response_get_sim_callforwarding_info(GObject *source_object, GAsy
                        while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
                                if (!g_strcmp0(key, "rec_index")) {
                                        cf.cf_list.cf[i].rec_index = g_variant_get_int32(value);
-                               }
-                               if (!g_strcmp0(key, "msp_num")) {
+                               } else if (!g_strcmp0(key, "msp_num")) {
                                        cf.cf_list.cf[i].msp_num = g_variant_get_byte(value);
-                               }
-                               if (!g_strcmp0(key, "cfu_status")) {
+                               } else if (!g_strcmp0(key, "cfu_status")) {
                                        cf.cf_list.cf[i].cfu_status = g_variant_get_byte(value);
-                               }
-                               if (!g_strcmp0(key, "cfu_num")) {
+                               } else if (!g_strcmp0(key, "cfu_num")) {
                                        str_value = g_variant_get_string(value, NULL);
-                                       snprintf(cf.cf_list.cf[i].cfu_num, strlen((const char*) str_value) + 1, "%s", str_value);
-                               }
-                               if (!g_strcmp0(key, "ton")) {
+                                       snprintf(cf.cf_list.cf[i].cfu_num, strlen((const char *) str_value) + 1, "%s", str_value);
+                               } else if (!g_strcmp0(key, "ton")) {
                                        cf.cf_list.cf[i].ton = g_variant_get_int32(value);
-                               }
-                               if (!g_strcmp0(key, "npi")) {
+                               } else if (!g_strcmp0(key, "npi")) {
                                        cf.cf_list.cf[i].npi = g_variant_get_int32(value);
-                               }
-                               if (!g_strcmp0(key, "cc2_id")) {
+                               } else if (!g_strcmp0(key, "cc2_id")) {
                                        cf.cf_list.cf[i].cc2_id = g_variant_get_byte(value);
-                               }
-                               if (!g_strcmp0(key, "ext7_id")) {
+                               } else if (!g_strcmp0(key, "ext7_id")) {
                                        cf.cf_list.cf[i].ext7_id = g_variant_get_byte(value);
                                }
                        }
@@ -336,16 +319,15 @@ static void on_response_get_sim_callforwarding_info(GObject *source_object, GAsy
                g_variant_iter_free(iter);
        }
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &cf, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
 static void on_response_set_sim_callforwarding_info(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -355,19 +337,17 @@ static void on_response_set_sim_callforwarding_info(GObject *source_object, GAsy
        TelSimAccessResult_t result = TAPI_SIM_ACCESS_SUCCESS;
 
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(i)", &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -375,7 +355,7 @@ static void on_response_set_sim_callforwarding_info(GObject *source_object, GAsy
 
 
 static void on_response_get_sim_messagewaiting_info(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -388,62 +368,50 @@ static void on_response_get_sim_messagewaiting_info(GObject *source_object, GAsy
        struct tapi_resp_data *evt_cb_data = user_data;
        TelSimAccessResult_t result = TAPI_SIM_ACCESS_SUCCESS;
        TelSimMessageWaitingResp_t mw;
-       int i =0;
+       int i = 0;
 
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&mw, 0, sizeof(TelSimMessageWaitingResp_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        dbg("dbus_result format(%s)", g_variant_get_type_string(dbus_result));
        g_variant_get(dbus_result, "(ibaa{sv}a{sv})", &result, &mw.b_cphs, &iter, &cphs_iter);
 
-       if( mw.b_cphs ) {
+       if (mw.b_cphs) {
                while (g_variant_iter_loop(cphs_iter, "{sv}", &key, &value)) {
-                       if (!g_strcmp0(key, "b_voice1")) {
+                       if (!g_strcmp0(key, "b_voice1"))
                                mw.cphs_mw.b_voice1 = g_variant_get_boolean(value);
-                       }
-                       if (!g_strcmp0(key, "b_voice2")) {
+                       else if (!g_strcmp0(key, "b_voice2"))
                                mw.cphs_mw.b_voice2 = g_variant_get_boolean(value);
-                       }
-                       if (!g_strcmp0(key, "b_fax")) {
+                       else if (!g_strcmp0(key, "b_fax"))
                                mw.cphs_mw.b_fax = g_variant_get_boolean(value);
-                       }
-                       if (!g_strcmp0(key, "b_data")) {
+                       else if (!g_strcmp0(key, "b_data"))
                                mw.cphs_mw.b_data = g_variant_get_boolean(value);
-                       }
                }
                g_variant_iter_free(cphs_iter);
        } else {
                while (g_variant_iter_next(iter, "a{sv}", &iter_row)) {
                        while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
-                               if (!g_strcmp0(key, "rec_index")) {
+                               if (!g_strcmp0(key, "rec_index"))
                                        mw.mw_list.mw[i].rec_index = g_variant_get_int32(value);
-                               }
-                               if (!g_strcmp0(key, "indicator_status")) {
+                               else if (!g_strcmp0(key, "indicator_status"))
                                        mw.mw_list.mw[i].indicator_status = g_variant_get_byte(value);
-                               }
-                               if (!g_strcmp0(key, "voice_count")) {
+                               else if (!g_strcmp0(key, "voice_count"))
                                        mw.mw_list.mw[i].voice_count = g_variant_get_int32(value);
-                               }
-                               if (!g_strcmp0(key, "fax_count")) {
+                               else if (!g_strcmp0(key, "fax_count"))
                                        mw.mw_list.mw[i].fax_count = g_variant_get_int32(value);
-                               }
-                               if (!g_strcmp0(key, "email_count")) {
+                               else if (!g_strcmp0(key, "email_count"))
                                        mw.mw_list.mw[i].email_count = g_variant_get_int32(value);
-                               }
-                               if (!g_strcmp0(key, "other_count")) {
+                               else if (!g_strcmp0(key, "other_count"))
                                        mw.mw_list.mw[i].other_count = g_variant_get_int32(value);
-                               }
-                               if (!g_strcmp0(key, "video_count")) {
+                               else if (!g_strcmp0(key, "video_count"))
                                        mw.mw_list.mw[i].video_count = g_variant_get_int32(value);
-                               }
                        }
                        i++;
                        g_variant_iter_free(iter_row);
@@ -456,16 +424,15 @@ static void on_response_get_sim_messagewaiting_info(GObject *source_object, GAsy
                g_variant_iter_free(iter);
        }
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &mw, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
 static void on_response_set_sim_messagewaiting_info(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -475,26 +442,24 @@ static void on_response_set_sim_messagewaiting_info(GObject *source_object, GAsy
        TelSimAccessResult_t result = TAPI_SIM_ACCESS_SUCCESS;
 
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(i)", &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
 static void on_response_get_sim_mailbox_info(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -513,13 +478,12 @@ static void on_response_get_sim_mailbox_info(GObject *source_object, GAsyncResul
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&list, 0, sizeof(TelSimMailboxList_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(ibaa{sv})", &result, &b_cphs, &iter);
        list.count = g_variant_iter_n_children(iter);
@@ -532,34 +496,25 @@ static void on_response_get_sim_mailbox_info(GObject *source_object, GAsyncResul
 
                        if (!g_strcmp0(key, "rec_index")) {
                                list.list[i].rec_index = g_variant_get_int32(value);
-                       }
-                       if (!g_strcmp0(key, "profile_num")) {
+                       } else if (!g_strcmp0(key, "profile_num")) {
                                list.list[i].profile_num = g_variant_get_int32(value);
-                       }
-                       if (!g_strcmp0(key, "mb_type")) {
+                       } else if (!g_strcmp0(key, "mb_type")) {
                                list.list[i].mb_type = g_variant_get_int32(value);
-                       }
-                       if (!g_strcmp0(key, "alpha_id_max_len")) {
+                       } else if (!g_strcmp0(key, "alpha_id_max_len")) {
                                list.list[i].alpha_id_max_len = g_variant_get_int32(value);
-                       }
-                       if (!g_strcmp0(key, "alpha_id")) {
+                       } else if (!g_strcmp0(key, "alpha_id")) {
                                str_value = g_variant_get_string(value, NULL);
-                               snprintf(list.list[i].alpha_id, strlen((const char*)str_value) + 1, "%s", str_value);
-                       }
-                       if (!g_strcmp0(key, "ton")) {
+                               snprintf(list.list[i].alpha_id, strlen((const char *)str_value) + 1, "%s", str_value);
+                       } else if (!g_strcmp0(key, "ton")) {
                                list.list[i].ton = g_variant_get_int32(value);
-                       }
-                       if (!g_strcmp0(key, "npi")) {
+                       } else if (!g_strcmp0(key, "npi")) {
                                list.list[i].npi = g_variant_get_int32(value);
-                       }
-                       if (!g_strcmp0(key, "num")) {
+                       } else if (!g_strcmp0(key, "num")) {
                                str_value = g_variant_get_string(value, NULL);
-                               snprintf(list.list[i].num, strlen((const char*)str_value) + 1, "%s", str_value);
-                       }
-                       if (!g_strcmp0(key, "cc_id")) {
+                               snprintf(list.list[i].num, strlen((const char *)str_value) + 1, "%s", str_value);
+                       } else if (!g_strcmp0(key, "cc_id")) {
                                list.list[i].cc_id = g_variant_get_byte(value);
-                       }
-                       if (!g_strcmp0(key, "ext1_id")) {
+                       } else if (!g_strcmp0(key, "ext1_id")) {
                                list.list[i].ext1_id = g_variant_get_byte(value);
                        }
                }
@@ -568,16 +523,15 @@ static void on_response_get_sim_mailbox_info(GObject *source_object, GAsyncResul
        }
        g_variant_iter_free(iter);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
 static void on_response_set_sim_mailbox_info(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -587,26 +541,24 @@ static void on_response_set_sim_mailbox_info(GObject *source_object, GAsyncResul
        TelSimAccessResult_t result = TAPI_SIM_ACCESS_SUCCESS;
 
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(i)", &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
 static void on_response_get_sim_cphs_info(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -619,30 +571,29 @@ static void on_response_get_sim_cphs_info(GObject *source_object, GAsyncResult *
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&cphs, 0, sizeof(TelSimCphsInfo_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(iibbbbb)", &result, &cphs.CphsPhase,
-                       &cphs.CphsServiceTable.bOperatorNameShortForm, &cphs.CphsServiceTable.bMailBoxNumbers,
-                       &cphs.CphsServiceTable.bServiceStringTable,
-                       &cphs.CphsServiceTable.bCustomerServiceProfile,
-                       &cphs.CphsServiceTable.bInformationNumbers);
+               &cphs.CphsServiceTable.bOperatorNameShortForm,
+               &cphs.CphsServiceTable.bMailBoxNumbers,
+               &cphs.CphsServiceTable.bServiceStringTable,
+               &cphs.CphsServiceTable.bCustomerServiceProfile,
+               &cphs.CphsServiceTable.bInformationNumbers);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &cphs, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
 static void on_response_get_sim_service_table(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -661,13 +612,12 @@ static void on_response_get_sim_service_table(GObject *source_object, GAsyncResu
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&svct, 0, sizeof(TelSimServiceTable_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(ii@v)", &result, &svct.sim_type, &param_gv);
        inner_gv = g_variant_get_variant(param_gv);
@@ -679,23 +629,23 @@ static void on_response_get_sim_service_table(GObject *source_object, GAsyncResu
                        svct.table.sst.service[i] = value;
                        i++;
                }
-       } else if(TAPI_SIM_CARD_TYPE_USIM == svct.sim_type) {
+       } else if (TAPI_SIM_CARD_TYPE_USIM == svct.sim_type) {
                while (g_variant_iter_loop(iter, "y", &value)) {
                        svct.table.ust.service[i] = value;
                        i++;
                }
-       } else if(TAPI_SIM_CARD_TYPE_RUIM == svct.sim_type) {
+       } else if (TAPI_SIM_CARD_TYPE_RUIM == svct.sim_type) {
                g_variant_get(dbus_result, "(ii@v)", &result, &svct.table.cst.cdma_svc_table, &param_gv);
                inner_gv = g_variant_get_variant(param_gv);
 
                g_variant_get(inner_gv, "ay", &iter);
 
-               if(TAPI_SIM_CDMA_SVC_TABLE == svct.table.cst.cdma_svc_table) {
+               if (TAPI_SIM_CDMA_SVC_TABLE == svct.table.cst.cdma_svc_table) {
                        while (g_variant_iter_loop(iter, "y", &value)) {
                                svct.table.cst.service.cdma_service[i] = value;
                                i++;
                        }
-               } else if(TAPI_SIM_CSIM_SVC_TABLE == svct.table.cst.cdma_svc_table) {
+               } else if (TAPI_SIM_CSIM_SVC_TABLE == svct.table.cst.cdma_svc_table) {
                        while (g_variant_iter_loop(iter, "y", &value)) {
                                svct.table.cst.service.csim_service[i] = value;
                                i++;
@@ -711,16 +661,15 @@ static void on_response_get_sim_service_table(GObject *source_object, GAsyncResu
        g_variant_unref(inner_gv);
        g_variant_unref(param_gv);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &svct, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
 static void on_response_get_sim_msisdn(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -738,19 +687,18 @@ static void on_response_get_sim_msisdn(GObject *source_object, GAsyncResult *res
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&list, 0, sizeof(TelSimMsisdnList_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(iaa{sv})", &result, &iter);
        list.count = g_variant_iter_n_children(iter);
 
        /*this can be changed regarding concept*/
-       if(list.count > 3){
+       if (list.count > 3) {
                dbg("current list.count[%d] but we fixed maximum with 3", list.count);
                list.count = 3;
        }
@@ -761,26 +709,26 @@ static void on_response_get_sim_msisdn(GObject *source_object, GAsyncResult *res
                while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
                        if (!g_strcmp0(key, "name")) {
                                str_value = g_variant_get_string(value, NULL);
-                               snprintf(list.list[i].name, strlen((const char*)str_value) + 1, "%s", str_value);
-                       }
-                       if (!g_strcmp0(key, "number")) {
+                               snprintf(list.list[i].name, strlen((const char *)str_value) + 1, "%s", str_value);
+                       } else if (!g_strcmp0(key, "number")) {
                                str_value = g_variant_get_string(value, NULL);
-                               snprintf(list.list[i].num, strlen((const char*)str_value) + 1, "%s", str_value);
+                               snprintf(list.list[i].num, strlen((const char *)str_value) + 1, "%s", str_value);
                        }
                }
                i++;
                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_free(iter);
 
        msg("msisdn count[%d]", list.count);
-       for(i =0; i < list.count; i++){
-               dbg("msisdn[%d]-name[%s]number[%s]",i,list.list[i].name, list.list[i].num);
-       }
+       for (i = 0; i < list.count; i++)
+               dbg("msisdn[%d]-name[%s]number[%s]", i, list.list[i].name, list.list[i].num);
 
        TAPI_SIM_CALL_CBFUNC(evt_cb_data, result, &list);
        g_free(evt_cb_data);
@@ -788,7 +736,7 @@ static void on_response_get_sim_msisdn(GObject *source_object, GAsyncResult *res
 }
 
 static void on_response_get_sim_oplmnwact(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -806,13 +754,12 @@ static void on_response_get_sim_oplmnwact(GObject *source_object, GAsyncResult *
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&list, 0, sizeof(TelSimOplmnwactList_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(iaa{sv})", &result, &iter);
        list.count = g_variant_iter_n_children(iter);
@@ -822,12 +769,10 @@ static void on_response_get_sim_oplmnwact(GObject *source_object, GAsyncResult *
                while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
                        if (!g_strcmp0(key, "plmn")) {
                                str_value = g_variant_get_string(value, NULL);
-                               snprintf(list.list[i].plmn, strlen((const char*)str_value) + 1, "%s", str_value);
-                       }
-                       if (!g_strcmp0(key, "b_umst")) {
+                               snprintf(list.list[i].plmn, strlen((const char *)str_value) + 1, "%s", str_value);
+                       } else if (!g_strcmp0(key, "b_umst")) {
                                list.list[i].b_umts = g_variant_get_boolean(value);
-                       }
-                       if (!g_strcmp0(key, "b_gsm")) {
+                       } else if (!g_strcmp0(key, "b_gsm")) {
                                list.list[i].b_gsm = g_variant_get_boolean(value);
                        }
                }
@@ -836,16 +781,15 @@ static void on_response_get_sim_oplmnwact(GObject *source_object, GAsyncResult *
        }
        g_variant_iter_free(iter);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &list, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
 static void on_response_get_sim_spn(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -860,21 +804,20 @@ static void on_response_get_sim_spn(GObject *source_object, GAsyncResult *res,
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&spn_info, 0, sizeof(TelSimSpn_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(iys)", &result, &dc, &spn);
 
        dbg("result[%d]", result);
-       if ( result == TAPI_SIM_ACCESS_SUCCESS) {
+       if (result == TAPI_SIM_ACCESS_SUCCESS) {
                msg("spn[%s], display condition[0x%x]", spn, dc);
                spn_info.display_condition = dc;
-               snprintf((char *)spn_info.spn, strlen((const char*)spn)+1, "%s", spn);
+               snprintf((char *)spn_info.spn, strlen((const char *)spn) + 1, "%s", spn);
        }
        g_free(spn);
 
@@ -884,7 +827,7 @@ static void on_response_get_sim_spn(GObject *source_object, GAsyncResult *res,
 }
 
 static void on_response_get_sim_cphs_netname(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -899,35 +842,33 @@ static void on_response_get_sim_cphs_netname(GObject *source_object, GAsyncResul
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&cphs_net, 0, sizeof(TelSimCphsNetName_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(iss)", &result, &full_name, &short_name);
 
        dbg("result[%d]", result);
-       if ( result == TAPI_SIM_ACCESS_SUCCESS) {
+       if (result == TAPI_SIM_ACCESS_SUCCESS) {
                msg("full name[%s], short name[%s]", full_name, short_name);
-               snprintf((char *)cphs_net.full_name, strlen((const char*)full_name)+1, "%s", full_name);
-               snprintf((char *)cphs_net.short_name, strlen((const char*)short_name)+1, "%s", short_name);
+               snprintf((char *)cphs_net.full_name, strlen((const char *)full_name) + 1, "%s", full_name);
+               snprintf((char *)cphs_net.short_name, strlen((const char *)short_name) + 1, "%s", short_name);
        }
        g_free(full_name);
        g_free(short_name);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &cphs_net, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
 static void on_response_req_sim_authentication(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -952,17 +893,16 @@ static void on_response_req_sim_authentication(GObject *source_object, GAsyncRes
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&auth_resp, 0, sizeof(TelSimAuthenticationResponse_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        dbg("dbus_result type_format(%s)", g_variant_get_type_string(dbus_result));
        g_variant_get(dbus_result, "(iii@v@v@v@v)", &result, &auth_resp.auth_type,
-                       &auth_resp.auth_result, &ak_gv, &cp_gv, &it_gv, &resp_gv);
+               &auth_resp.auth_result, &ak_gv, &cp_gv, &it_gv, &resp_gv);
 
        ak = g_variant_get_variant(ak_gv);
        g_variant_get(ak, "ay", &iter);
@@ -1004,16 +944,15 @@ static void on_response_req_sim_authentication(GObject *source_object, GAsyncRes
        g_variant_iter_free(iter);
        i = 0;
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &auth_resp, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
 static void on_response_verify_sim_pins(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -1026,26 +965,24 @@ static void on_response_verify_sim_pins(GObject *source_object, GAsyncResult *re
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&sec_rt, 0, sizeof(TelSimSecResult_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(iii)", &result, &sec_rt.type, &sec_rt.retry_count);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &sec_rt, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
 static void on_response_verify_sim_puks(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -1058,26 +995,24 @@ static void on_response_verify_sim_puks(GObject *source_object, GAsyncResult *re
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&sec_rt, 0, sizeof(TelSimSecResult_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(iii)", &result, &sec_rt.type, &sec_rt.retry_count);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &sec_rt, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
 static void on_response_change_sim_pins(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -1090,26 +1025,24 @@ static void on_response_change_sim_pins(GObject *source_object, GAsyncResult *re
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&sec_rt, 0, sizeof(TelSimSecResult_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(iii)", &result, &sec_rt.type, &sec_rt.retry_count);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &sec_rt, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
 static void on_response_disable_sim_facility(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -1122,13 +1055,12 @@ static void on_response_disable_sim_facility(GObject *source_object, GAsyncResul
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&f_rt, 0, sizeof(TelSimFacilityResult_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(iii)", &result, &f_rt.type, &f_rt.retry_count);
 
@@ -1138,7 +1070,7 @@ static void on_response_disable_sim_facility(GObject *source_object, GAsyncResul
 }
 
 static void on_response_enable_sim_facility(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -1151,13 +1083,12 @@ static void on_response_enable_sim_facility(GObject *source_object, GAsyncResult
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&f_rt, 0, sizeof(TelSimFacilityResult_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(iii)", &result, &f_rt.type, &f_rt.retry_count);
 
@@ -1167,7 +1098,7 @@ static void on_response_enable_sim_facility(GObject *source_object, GAsyncResult
 }
 
 static void on_response_get_sim_facility(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -1180,13 +1111,12 @@ static void on_response_get_sim_facility(GObject *source_object, GAsyncResult *r
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&fi, 0, sizeof(TelSimFacilityInfo_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(iii)", &result, &fi.type, &fi.f_status);
 
@@ -1209,26 +1139,25 @@ static void on_response_get_sim_lock_info(GObject *source_object, GAsyncResult *
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&lock, 0, sizeof(TelSimLockInfo_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(iiii)", &result, &lock.lock_type, &lock.lock_status,
                        &lock.retry_count);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &lock, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
-static void on_response_req_sim_apdu(GObject *source_object, GAsyncResult *res, gpointer user_data)
+static void on_response_req_sim_apdu(GObject *source_object, GAsyncResult *res,
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -1247,13 +1176,12 @@ static void on_response_req_sim_apdu(GObject *source_object, GAsyncResult *res,
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&r_apdu, 0, sizeof(TelSimApduResp_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        /*      dbg("dbus_result type_format(%s)", g_variant_get_type_string(dbus_result));*/
        g_variant_get(dbus_result, "(i@v)", &result, &param_gv);
@@ -1272,15 +1200,15 @@ static void on_response_req_sim_apdu(GObject *source_object, GAsyncResult *res,
        g_variant_unref(inner_gv);
        g_variant_unref(param_gv);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &r_apdu, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
-static void on_response_req_sim_atr(GObject *source_object, GAsyncResult *res, gpointer user_data)
+static void on_response_req_sim_atr(GObject *source_object, GAsyncResult *res,
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -1299,13 +1227,12 @@ static void on_response_req_sim_atr(GObject *source_object, GAsyncResult *res, g
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
        memset(&r_atr, 0, sizeof(TelSimAtrResp_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        dbg("dbus_result type_format(%s)", g_variant_get_type_string(dbus_result));
        g_variant_get(dbus_result, "(i@v)", &result, &param_gv);
@@ -1322,16 +1249,15 @@ static void on_response_req_sim_atr(GObject *source_object, GAsyncResult *res, g
        g_variant_unref(inner_gv);
        g_variant_unref(param_gv);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &r_atr, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
 static void on_response_set_sim_power_state(GObject *source_object, GAsyncResult *res,
-               gpointer user_data)
+       gpointer user_data)
 {
        GError *error = NULL;
        GDBusConnection *conn = NULL;
@@ -1341,26 +1267,24 @@ static void on_response_set_sim_power_state(GObject *source_object, GAsyncResult
        TelSimPowerSetResult_t result = TAPI_SIM_POWER_SET_SUCCESS;
 
        TAPI_SIM_RESP_CB_ENTER(evt_cb_data);
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        SIM_CHECK_ERROR(error, evt_cb_data);
 
-       if (!dbus_result) {
+       if (!dbus_result)
                TAPI_SIM_CHECK_ERR_MSG_AND_CALL_NULL_CBFUNC(error, evt_cb_data);
-       }
 
        g_variant_get(dbus_result, "(i)", &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
 }
 
-EXPORT_API int tel_get_sim_init_info(TapiHandle *handle, TelSimCardStatus_t *sim_status,
-               int *card_changed)
+EXPORT_API int tel_get_sim_init_info(TapiHandle *handle,
+       TelSimCardStatus_t *sim_status, int *card_changed)
 {
        GError *gerr = NULL;
        GVariant *sync_gv = NULL;
@@ -1435,15 +1359,15 @@ EXPORT_API int tel_get_sim_imsi(TapiHandle *handle, TelSimImsiInfo_t *imsi)
 
                g_variant_get(sync_gv, "(ss)", &gplmn, &gmsin);
 
-               gplmn_len = strlen((const char*)gplmn);
-               gmsin_len = strlen((const char*)gmsin);
+               gplmn_len = strlen((const char *)gplmn);
+               gmsin_len = strlen((const char *)gmsin);
 
                if (gplmn_len >= 5 && gmsin_len >= 9) {
                        snprintf(imsi->szMcc, 3 + 1, "%s", gplmn);
                        snprintf(imsi->szMnc, gplmn_len - 3 + 1, "%s", &gplmn[3]);
                        snprintf(imsi->szMsin, gmsin_len + 1, "%s", gmsin);
                } else {
-                       msg("invalid length.(plmn_len=%d, msin_len=%d)", gplmn_len,gmsin_len);
+                       msg("invalid length.(plmn_len=%d, msin_len=%d)", gplmn_len, gmsin_len);
                        memset(imsi, 0, sizeof(TelSimImsiInfo_t));
                }
                g_free(gplmn);
@@ -1483,19 +1407,17 @@ EXPORT_API int tel_get_sim_ecc(TapiHandle *handle, TelSimEccList_t *ecc)
 /*             dbg("ecc type_format(%s)", g_variant_get_type_string(sync_gv));*/
                g_variant_get(sync_gv, "(aa{sv})", &iter);
                ecc->ecc_count = g_variant_iter_n_children(iter);
-               msg("ecc->ecc_count[%d]",ecc->ecc_count);
+               msg("ecc->ecc_count[%d]", ecc->ecc_count);
                i = 0;
                while (g_variant_iter_next(iter, "a{sv}", &iter_row)) {
                        while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
                                if (!g_strcmp0(key, "name")) {
                                        str_value = g_variant_get_string(value, NULL);
-                                       snprintf(ecc->list[i].name, strlen((const char*)str_value) + 1, "%s", str_value);
-                               }
-                               if (!g_strcmp0(key, "number")) {
+                                       snprintf(ecc->list[i].name, strlen((const char *)str_value) + 1, "%s", str_value);
+                               } else if (!g_strcmp0(key, "number")) {
                                        str_value = g_variant_get_string(value, NULL);
-                                       snprintf(ecc->list[i].number, strlen((const char*)str_value) + 1, "%s", str_value);
-                               }
-                               if (!g_strcmp0(key, "category")) {
+                                       snprintf(ecc->list[i].number, strlen((const char *)str_value) + 1, "%s", str_value);
+                               } else if (!g_strcmp0(key, "category")) {
                                        ecc->list[i].category = g_variant_get_int32(value);
                                }
                        }
@@ -1505,10 +1427,10 @@ EXPORT_API int tel_get_sim_ecc(TapiHandle *handle, TelSimEccList_t *ecc)
                g_variant_iter_free(iter);
 
                g_variant_unref(sync_gv);
-       }
-       else {
+       } else {
                TAPI_SIM_CHECK_ERR_MSG(gerr);
        }
+
        return TAPI_API_SUCCESS;
 }
 
@@ -1599,13 +1521,13 @@ EXPORT_API int tel_set_sim_callforwarding_info(TapiHandle *handle, TelSimCallFor
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
-       g_number = calloc(1, strlen((const char*)&req_cf->cf_data_u.cf.cfu_num)+1);
+       g_number = calloc(1, strlen((const char *)&req_cf->cf_data_u.cf.cfu_num)+1);
        if (!g_number) {
                g_free(evt_cb_data);
                return TAPI_API_SYSTEM_OUT_OF_MEM;
        }
 
-       memcpy((void*)g_number, (const void*)&req_cf->cf_data_u.cf.cfu_num, strlen((const char*)&req_cf->cf_data_u.cf.cfu_num));
+       memcpy((void *)g_number, (const void *)&req_cf->cf_data_u.cf.cfu_num, strlen((const char *)&req_cf->cf_data_u.cf.cfu_num));
 
        param = g_variant_new("(biiyiisiibbbb)",
                        req_cf->b_cphs,
@@ -1663,33 +1585,34 @@ EXPORT_API int tel_set_sim_messagewaiting_info(TapiHandle *handle, TelSimMessage
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
-       dbg("b_cphs[%d], rec_index[%d], indicator_status[0x%x], voice_count[%d], fax_count[%d], email_count[%d], other_count[%d], video_count[%d], b_voice1[%d],b_voice2[%d],b_fax[%d], b_data[%d]",
-                       req_mw->b_cphs,
-                       req_mw->mw_data_u.mw.rec_index,
-                       req_mw->mw_data_u.mw.indicator_status,
-                       req_mw->mw_data_u.mw.voice_count,
-                       req_mw->mw_data_u.mw.fax_count,
-                       req_mw->mw_data_u.mw.email_count,
-                       req_mw->mw_data_u.mw.other_count,
-                       req_mw->mw_data_u.mw.video_count,
-                       req_mw->mw_data_u.cphs_mw.b_voice1,
-                       req_mw->mw_data_u.cphs_mw.b_voice2,
-                       req_mw->mw_data_u.cphs_mw.b_fax,
-                       req_mw->mw_data_u.cphs_mw.b_data);
+       dbg("b_cphs[%d], rec_index[%d], indicator_status[0x%x], voice_count[%d], fax_count[%d], " \
+               "email_count[%d], other_count[%d], video_count[%d], b_voice1[%d], b_voice2[%d], b_fax[%d], b_data[%d]",
+               req_mw->b_cphs,
+               req_mw->mw_data_u.mw.rec_index,
+               req_mw->mw_data_u.mw.indicator_status,
+               req_mw->mw_data_u.mw.voice_count,
+               req_mw->mw_data_u.mw.fax_count,
+               req_mw->mw_data_u.mw.email_count,
+               req_mw->mw_data_u.mw.other_count,
+               req_mw->mw_data_u.mw.video_count,
+               req_mw->mw_data_u.cphs_mw.b_voice1,
+               req_mw->mw_data_u.cphs_mw.b_voice2,
+               req_mw->mw_data_u.cphs_mw.b_fax,
+               req_mw->mw_data_u.cphs_mw.b_data);
 
        param = g_variant_new("(biyiiiiibbbb)",
-                       req_mw->b_cphs,
-                       req_mw->mw_data_u.mw.rec_index,
-                       req_mw->mw_data_u.mw.indicator_status,
-                       req_mw->mw_data_u.mw.voice_count,
-                       req_mw->mw_data_u.mw.fax_count,
-                       req_mw->mw_data_u.mw.email_count,
-                       req_mw->mw_data_u.mw.other_count,
-                       req_mw->mw_data_u.mw.video_count,
-                       req_mw->mw_data_u.cphs_mw.b_voice1,
-                       req_mw->mw_data_u.cphs_mw.b_voice2,
-                       req_mw->mw_data_u.cphs_mw.b_fax,
-                       req_mw->mw_data_u.cphs_mw.b_data);
+               req_mw->b_cphs,
+               req_mw->mw_data_u.mw.rec_index,
+               req_mw->mw_data_u.mw.indicator_status,
+               req_mw->mw_data_u.mw.voice_count,
+               req_mw->mw_data_u.mw.fax_count,
+               req_mw->mw_data_u.mw.email_count,
+               req_mw->mw_data_u.mw.other_count,
+               req_mw->mw_data_u.mw.video_count,
+               req_mw->mw_data_u.cphs_mw.b_voice1,
+               req_mw->mw_data_u.cphs_mw.b_voice2,
+               req_mw->mw_data_u.cphs_mw.b_fax,
+               req_mw->mw_data_u.cphs_mw.b_data);
 
        g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE, handle->path,
                        DBUS_TELEPHONY_SIM_INTERFACE, "SetMessageWaiting", param, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
@@ -1731,24 +1654,24 @@ EXPORT_API int tel_set_sim_mailbox_info(TapiHandle *handle, TelSimMailBoxNumber_
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
-       g_alpha = calloc(1, strlen((const char*)&req_mb->alpha_id)+1);
+       g_alpha = calloc(1, strlen((const char *)&req_mb->alpha_id)+1);
        if (!g_alpha) {
                g_free(evt_cb_data);
                return TAPI_API_SYSTEM_OUT_OF_MEM;
        }
 
-       memcpy((void*)g_alpha, (const void*)&req_mb->alpha_id, strlen((const char*)&req_mb->alpha_id));
+       memcpy((void *)g_alpha, (const void *)&req_mb->alpha_id, strlen((const char *)&req_mb->alpha_id));
 
-       g_number = calloc(1, strlen((const char*)&req_mb->num)+1);
+       g_number = calloc(1, strlen((const char *)&req_mb->num)+1);
        if (!g_number) {
                free(g_alpha);
                g_free(evt_cb_data);
                return TAPI_API_SYSTEM_OUT_OF_MEM;
        }
 
-       memcpy((void*)g_number, (const void*)&req_mb->num, strlen((const char*)&req_mb->num));
+       memcpy((void *)g_number, (const void *)&req_mb->num, strlen((const char *)&req_mb->num));
 
-       dbg("req_mb->b_cphs[%d], req_mb->rec_index[%d], req_mb->profile_num[%d], req_mb->mb_type[%d], req_mb->alpha_id_max_len[%d],req_mb->alpha_id[%s]",
+       dbg("req_mb->b_cphs[%d], req_mb->rec_index[%d], req_mb->profile_num[%d], req_mb->mb_type[%d], req_mb->alpha_id_max_len[%d], req_mb->alpha_id[%s]",
                        req_mb->b_cphs,
                        req_mb->rec_index,
                        req_mb->profile_num,
@@ -1756,7 +1679,7 @@ EXPORT_API int tel_set_sim_mailbox_info(TapiHandle *handle, TelSimMailBoxNumber_
                        req_mb->alpha_id_max_len,
                        g_alpha);
 
-       dbg("req_mb->ton[%d],req_mb->npi[%d],g_number[%s],req_mb->cc_id[%d],req_mb->ext1_id[%d]",
+       dbg("req_mb->ton[%d], req_mb->npi[%d], g_number[%s], req_mb->cc_id[%d], req_mb->ext1_id[%d]",
                        req_mb->ton,
                        req_mb->npi,
                        g_number,
@@ -1904,7 +1827,7 @@ EXPORT_API int tel_req_sim_authentication(TapiHandle *handle,
        GVariant *param = NULL;
        GVariant *rand_gv = NULL;
        GVariant *autn_gv = NULL;
-       int i =0;
+       int i = 0;
 
        TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR);
        TAPI_RET_ERR_NUM_IF_FAIL(authentication_data, TAPI_API_INVALID_PTR);
@@ -1923,16 +1846,16 @@ EXPORT_API int tel_req_sim_authentication(TapiHandle *handle,
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
-       g_variant_builder_init(&builder, G_VARIANT_TYPE ("ay"));
+       g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
        for (i = 0; i < authentication_data->rand_length; i++) {
-               dbg("authentication_data->rand_data[%d][0x%02x]", i,authentication_data->rand_data[i]);
+               dbg("authentication_data->rand_data[%d][0x%02x]", i, authentication_data->rand_data[i]);
                g_variant_builder_add(&builder, "y", authentication_data->rand_data[i]);
        }
        rand_gv = g_variant_builder_end(&builder);
 
-       g_variant_builder_init(&builder, G_VARIANT_TYPE ("ay"));
+       g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
                for (i = 0; i < authentication_data->autn_length; i++) {
-                       dbg("authentication_data->autn_data[%d][0x%02x]", i,authentication_data->autn_data[i]);
+                       dbg("authentication_data->autn_data[%d][0x%02x]", i, authentication_data->autn_data[i]);
                        g_variant_builder_add(&builder, "y", authentication_data->autn_data[i]);
                }
        autn_gv = g_variant_builder_end(&builder);
@@ -1975,7 +1898,7 @@ EXPORT_API int tel_verifiy_sim_pins(TapiHandle *handle, const TelSimSecPw_t *pin
                return TAPI_API_SYSTEM_OUT_OF_MEM;
        }
 
-       memcpy((void*)gpw, (const void*)pin_data->pw, pin_data->pw_len);
+       memcpy((void *)gpw, (const void *)pin_data->pw, pin_data->pw_len);
 
        param = g_variant_new("(is)", pin_data->type, gpw);
 
@@ -1999,7 +1922,7 @@ EXPORT_API int tel_verify_sim_puks(TapiHandle *handle, const TelSimSecPw_t *puk_
 
        TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR);
        TAPI_RET_ERR_NUM_IF_FAIL((puk_data != NULL && new_pin_data != NULL), TAPI_API_INVALID_PTR);
-       TAPI_RET_ERR_NUM_IF_FAIL((puk_data->pw != NULL && new_pin_data->pw != NULL),    TAPI_API_INVALID_PTR);
+       TAPI_RET_ERR_NUM_IF_FAIL((puk_data->pw != NULL && new_pin_data->pw != NULL), TAPI_API_INVALID_PTR);
 
        TAPI_SIM_CHECK_TAPI_STATE();
 
@@ -2031,8 +1954,8 @@ EXPORT_API int tel_verify_sim_puks(TapiHandle *handle, const TelSimSecPw_t *puk_
                return TAPI_API_SYSTEM_OUT_OF_MEM;
        }
 
-       memcpy((void*)gpin, (const void*)new_pin_data->pw, new_pin_data->pw_len);
-       memcpy((void*)gpuk, (const void*)puk_data->pw, puk_data->pw_len);
+       memcpy((void *)gpin, (const void *)new_pin_data->pw, new_pin_data->pw_len);
+       memcpy((void *)gpuk, (const void *)puk_data->pw, puk_data->pw_len);
 
        param = g_variant_new("(iss)", puk_data->type, gpuk, gpin);
 
@@ -2063,7 +1986,7 @@ EXPORT_API int tel_change_sim_pins(TapiHandle *handle, const TelSimSecPw_t *old_
 
        TAPI_SIM_CHECK_TAPI_STATE();
 
-       msg("old_pin type[%d],new_pin type[%d]", old_pin->type, new_pin->type);
+       msg("old_pin type[%d], new_pin type[%d]", old_pin->type, new_pin->type);
        if ((old_pin->type != TAPI_SIM_PTYPE_PIN1) && (old_pin->type != TAPI_SIM_PTYPE_PIN2)
                        && (new_pin->type != TAPI_SIM_PTYPE_PIN1) && (new_pin->type != TAPI_SIM_PTYPE_PIN2))
                return TAPI_API_INVALID_INPUT;
@@ -2092,11 +2015,11 @@ EXPORT_API int tel_change_sim_pins(TapiHandle *handle, const TelSimSecPw_t *old_
                return TAPI_API_SYSTEM_OUT_OF_MEM;
        }
 
-       memcpy((void*)gpin_o, (const void*)old_pin->pw, old_pin->pw_len);
-       memcpy((void*)gpin_n, (const void*)new_pin->pw, new_pin->pw_len);
+       memcpy((void *)gpin_o, (const void *)old_pin->pw, old_pin->pw_len);
+       memcpy((void *)gpin_n, (const void *)new_pin->pw, new_pin->pw_len);
 
        param = g_variant_new("(iss)", old_pin->type, gpin_o, gpin_n);
-       msg("old_pin len[%d],new_pin len[%d]", old_pin->pw_len, new_pin->pw_len);
+       msg("old_pin len[%d], new_pin len[%d]", old_pin->pw_len, new_pin->pw_len);
 
        g_dbus_connection_call(handle->dbus_connection, DBUS_TELEPHONY_SERVICE, handle->path,
                        DBUS_TELEPHONY_SIM_INTERFACE, "ChangePIN", param, NULL, G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT,
@@ -2125,11 +2048,11 @@ EXPORT_API int tel_disable_sim_facility(TapiHandle *handle, TelSimFacilityPw_t *
        TAPI_SIM_CHECK_TAPI_STATE();
 
        dbg("facility type[%d]", pw->lock_type);
-       if(pw->lock_type < TAPI_SIM_LOCK_PS || pw->lock_type >TAPI_SIM_LOCK_PC)
+       if (pw->lock_type < TAPI_SIM_LOCK_PS || pw->lock_type > TAPI_SIM_LOCK_PC)
                return TAPI_API_INVALID_INPUT;
-       if ((pw->lock_type < TAPI_SIM_LOCK_PN) && ((pw->pw_len < 4) || (pw->pw_len > 8)) )
+       if ((pw->lock_type < TAPI_SIM_LOCK_PN) && ((pw->pw_len < 4) || (pw->pw_len > 8)))
                return TAPI_API_INVALID_INPUT;
-       if ((pw->lock_type > TAPI_SIM_LOCK_FD) && (pw->pw_len < 6) )
+       if ((pw->lock_type > TAPI_SIM_LOCK_FD) && (pw->pw_len < 6))
                return TAPI_API_INVALID_INPUT;
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
@@ -2140,7 +2063,7 @@ EXPORT_API int tel_disable_sim_facility(TapiHandle *handle, TelSimFacilityPw_t *
                return TAPI_API_SYSTEM_OUT_OF_MEM;
        }
 
-       memcpy((void*)gpw, (const void*)pw->pw, pw->pw_len);
+       memcpy((void *)gpw, (const void *)pw->pw, pw->pw_len);
 
        param = g_variant_new("(is)", pw->lock_type, gpw);
 
@@ -2168,11 +2091,11 @@ EXPORT_API int tel_enable_sim_facility(TapiHandle *handle, TelSimFacilityPw_t *p
        TAPI_SIM_CHECK_TAPI_STATE();
 
        msg("facility type[%d]", pw->lock_type);
-       if(pw->lock_type < TAPI_SIM_LOCK_PS || pw->lock_type >TAPI_SIM_LOCK_PC)
+       if (pw->lock_type < TAPI_SIM_LOCK_PS || pw->lock_type > TAPI_SIM_LOCK_PC)
                return TAPI_API_INVALID_INPUT;
-       if ((pw->lock_type < TAPI_SIM_LOCK_PN) && ((pw->pw_len < 4) || (pw->pw_len > 8)) )
+       if ((pw->lock_type < TAPI_SIM_LOCK_PN) && ((pw->pw_len < 4) || (pw->pw_len > 8)))
                return TAPI_API_INVALID_INPUT;
-       if ((pw->lock_type > TAPI_SIM_LOCK_FD) && (pw->pw_len < 6) )
+       if ((pw->lock_type > TAPI_SIM_LOCK_FD) && (pw->pw_len < 6))
                return TAPI_API_INVALID_INPUT;
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
@@ -2183,7 +2106,7 @@ EXPORT_API int tel_enable_sim_facility(TapiHandle *handle, TelSimFacilityPw_t *p
                return TAPI_API_SYSTEM_OUT_OF_MEM;
        }
 
-       memcpy((void*)gpw, (const void*)pw->pw, pw->pw_len);
+       memcpy((void *)gpw, (const void *)pw->pw, pw->pw_len);
 
        param = g_variant_new("(is)", pw->lock_type, gpw);
 
@@ -2208,7 +2131,7 @@ EXPORT_API int tel_get_sim_facility(TapiHandle *handle, TelSimLockType_t type,
        TAPI_SIM_CHECK_TAPI_STATE();
 
        msg("facility type[%d]", type);
-       if(type < TAPI_SIM_LOCK_PS || type >TAPI_SIM_LOCK_PC)
+       if (type < TAPI_SIM_LOCK_PS || type > TAPI_SIM_LOCK_PC)
                return TAPI_API_INVALID_INPUT;
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
@@ -2233,7 +2156,7 @@ EXPORT_API int tel_get_sim_lock_info(TapiHandle *handle, TelSimLockType_t type,
        TAPI_SIM_CHECK_TAPI_STATE();
 
        msg("lock type[%d]", type);
-       if(type < TAPI_SIM_LOCK_PS || type >TAPI_SIM_LOCK_PC)
+       if (type < TAPI_SIM_LOCK_PS || type > TAPI_SIM_LOCK_PC)
                return TAPI_API_INVALID_INPUT;
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
@@ -2256,11 +2179,9 @@ EXPORT_API int tel_set_sim_power_state(TapiHandle *handle, TelSimPowerState_t st
        TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR);
 
        dbg("Func Enterance. cp_name[%s], state[%d]", handle->cp_name, state);
-       //TAPI_SIM_CHECK_TAPI_STATE(); -- TO be decided later
 
-       if (state >= TAPI_SIM_POWER_UNSPECIFIED){
+       if (state >= TAPI_SIM_POWER_UNSPECIFIED)
                return TAPI_API_INVALID_INPUT;
-       }
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
@@ -2290,10 +2211,9 @@ EXPORT_API int tel_req_sim_apdu(TapiHandle *handle, TelSimApdu_t* apdu_data,
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
-       g_variant_builder_init(&builder, G_VARIANT_TYPE ("ay"));
-       for (i = 0; i < apdu_data->apdu_len; i++) {
+       g_variant_builder_init(&builder, G_VARIANT_TYPE("ay"));
+       for (i = 0; i < apdu_data->apdu_len; i++)
                g_variant_builder_add(&builder, "y", apdu_data->apdu[i]);
-       }
        inner_gv = g_variant_builder_end(&builder);
        param = g_variant_new("(v)", inner_gv);
 
index f21706459f0a8dad6af88b59b9d81a7d8f41ff6e..bf8bc93e8c393f9874084331bb20e0d281c357e7 100644 (file)
@@ -40,18 +40,17 @@ static void on_response_default(GObject *source_object, GAsyncResult *res, gpoin
        GVariant *dbus_result = NULL;
        int data = 0;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
        dbg("on_response_default type_format(%s)", g_variant_get_type_string(dbus_result));
 
-       g_variant_get (dbus_result, "(i)", &result);
+       g_variant_get(dbus_result, "(i)", &result);
 
        if (evt_cb_data) {
-               if (evt_cb_data->cb_fn) {
+               if (evt_cb_data->cb_fn)
                        evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data);
-               }
 
                g_free(evt_cb_data);
        }
@@ -65,7 +64,7 @@ static void on_response_read_msg(GObject *source_object, GAsyncResult *res, gpoi
        struct tapi_resp_data *evt_cb_data = user_data;
        int result = -1;
 
-       TelSmsData_t    readMsg = {0,};
+       TelSmsData_t readMsg = {0,};
        GVariant *dbus_result = NULL;
 
        GVariant *sca = 0, *tpdu = 0;
@@ -73,14 +72,13 @@ static void on_response_read_msg(GObject *source_object, GAsyncResult *res, gpoi
        GVariantIter *iter = 0;
        GVariant *inner_gv = 0;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
        dbg("on_response_read_msg type_format(%s)", g_variant_get_type_string(dbus_result));
 
-//     readMsg.SimIndex = 0xFFFFFFFF;
-       g_variant_get (dbus_result, "(iiii@vi@v)", &result,
+       g_variant_get(dbus_result, "(iiii@vi@v)", &result,
                        &readMsg.SimIndex,
                        &readMsg.MsgStatus,
                        &readMsg.SmsData.format,
@@ -88,22 +86,22 @@ static void on_response_read_msg(GObject *source_object, GAsyncResult *res, gpoi
                        &readMsg.SmsData.MsgLength,
                        &tpdu);
 
-       inner_gv = g_variant_get_variant( sca );
+       inner_gv = g_variant_get_variant(sca);
        g_variant_get(inner_gv, "ay", &iter);
-       while( g_variant_iter_loop(iter, "y", &readMsg.SmsData.Sca[i] ) ) {
+       while (g_variant_iter_loop(iter, "y", &readMsg.SmsData.Sca[i])) {
                i++;
-               if( i >= TAPI_SIM_SMSP_ADDRESS_LEN )
+               if (i >= TAPI_SIM_SMSP_ADDRESS_LEN)
                        break;
        }
 
        g_variant_iter_free(iter);
 
-       inner_gv = g_variant_get_variant( tpdu );
+       inner_gv = g_variant_get_variant(tpdu);
        g_variant_get(inner_gv, "ay", &iter);
-       i= 0;
-       while( g_variant_iter_loop(iter, "y", &readMsg.SmsData.szData[i]) ) {
+       i = 0;
+       while (g_variant_iter_loop(iter, "y", &readMsg.SmsData.szData[i])) {
                i++;
-               if( i >= TAPI_NETTEXT_SMDATA_SIZE_MAX + 1 )
+               if (i >= TAPI_NETTEXT_SMDATA_SIZE_MAX + 1)
                        break;
        }
        g_variant_iter_free(iter);
@@ -112,9 +110,8 @@ static void on_response_read_msg(GObject *source_object, GAsyncResult *res, gpoi
        g_variant_unref(inner_gv);
 
        if (evt_cb_data) {
-               if (evt_cb_data->cb_fn) {
+               if (evt_cb_data->cb_fn)
                        evt_cb_data->cb_fn(evt_cb_data->handle, result, &readMsg, evt_cb_data->user_data);
-               }
 
                g_free(evt_cb_data);
        }
@@ -131,18 +128,17 @@ static void on_response_write_msg(GObject *source_object, GAsyncResult *res, gpo
 
        GVariant *dbus_result = NULL;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
        dbg("on_response_write_msg type_format(%s)", g_variant_get_type_string(dbus_result));
 
-       g_variant_get (dbus_result, "(ii)", &result, &sms_index);
+       g_variant_get(dbus_result, "(ii)", &result, &sms_index);
 
        if (evt_cb_data) {
-               if (evt_cb_data->cb_fn) {
+               if (evt_cb_data->cb_fn)
                        evt_cb_data->cb_fn(evt_cb_data->handle, result, &sms_index, evt_cb_data->user_data);
-               }
 
                g_free(evt_cb_data);
        }
@@ -159,18 +155,17 @@ static void on_response_delete_msg(GObject *source_object, GAsyncResult *res, gp
 
        GVariant *dbus_result = NULL;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
        dbg("on_response_delete_msg type_format(%s)", g_variant_get_type_string(dbus_result));
 
-       g_variant_get (dbus_result, "(ii)", &result, &del_index);
+       g_variant_get(dbus_result, "(ii)", &result, &del_index);
 
        if (evt_cb_data) {
-               if (evt_cb_data->cb_fn) {
+               if (evt_cb_data->cb_fn)
                        evt_cb_data->cb_fn(evt_cb_data->handle, result, &del_index, evt_cb_data->user_data);
-               }
 
                g_free(evt_cb_data);
        }
@@ -190,16 +185,16 @@ static void on_response_get_msg_count(GObject *source_object, GAsyncResult *res,
        int idx = 0;
        GVariantIter *iter = NULL;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
        dbg("on_response_get_msg_count type_format(%s)", g_variant_get_type_string(dbus_result));
 
-       g_variant_get (dbus_result, "(iiiai)", &result,
-                                                               &storedMsgCnt.TotalCount,
-                                                               &storedMsgCnt.UsedCount,
-                                                               &iter);
+       g_variant_get(dbus_result, "(iiiai)", &result,
+               &storedMsgCnt.TotalCount,
+               &storedMsgCnt.UsedCount,
+               &iter);
 
        i = 0;
        while (g_variant_iter_loop(iter, "i", &idx)) {
@@ -212,9 +207,8 @@ static void on_response_get_msg_count(GObject *source_object, GAsyncResult *res,
        g_variant_iter_free(iter);
 
        if (evt_cb_data) {
-               if (evt_cb_data->cb_fn) {
+               if (evt_cb_data->cb_fn)
                        evt_cb_data->cb_fn(evt_cb_data->handle, result, &storedMsgCnt, evt_cb_data->user_data);
-               }
 
                g_free(evt_cb_data);
        }
@@ -237,23 +231,23 @@ static void on_response_get_sca(GObject *source_object, GAsyncResult *res, gpoin
        GVariant *inner_gv = 0;
 
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
        dbg("on_response_get_sca type_format(%s)", g_variant_get_type_string(dbus_result));
 
-       g_variant_get (dbus_result, "(iiii@v)", &result,
-                                       &scaInfo.Ton,
-                                       &scaInfo.Npi,
-                                       &scaInfo.DialNumLen,
-                                       &num);
+       g_variant_get(dbus_result, "(iiii@v)", &result,
+               &scaInfo.Ton,
+               &scaInfo.Npi,
+               &scaInfo.DialNumLen,
+               &num);
 
-       inner_gv = g_variant_get_variant( num );
+       inner_gv = g_variant_get_variant(num);
        g_variant_get(inner_gv, "ay", &iter);
-       while( g_variant_iter_loop(iter, "y", &scaInfo.szDiallingNum[i] ) ) {
+       while (g_variant_iter_loop(iter, "y", &scaInfo.szDiallingNum[i])) {
                i++;
-               if( i >= TAPI_SIM_SMSP_ADDRESS_LEN + 1 )
+               if (i >= TAPI_SIM_SMSP_ADDRESS_LEN + 1)
                        break;
        }
        g_variant_iter_free(iter);
@@ -261,9 +255,8 @@ static void on_response_get_sca(GObject *source_object, GAsyncResult *res, gpoin
        g_variant_unref(inner_gv);
 
        if (evt_cb_data) {
-               if (evt_cb_data->cb_fn) {
+               if (evt_cb_data->cb_fn)
                        evt_cb_data->cb_fn(evt_cb_data->handle, result, &scaInfo, evt_cb_data->user_data);
-               }
 
                g_free(evt_cb_data);
        }
@@ -285,37 +278,32 @@ static void on_response_get_cb_config(GObject *source_object, GAsyncResult *res,
        GVariantIter *iter_row = NULL;
        const gchar *key = NULL;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
        dbg("on_response_get_cb_config type_format(%s)", g_variant_get_type_string(dbus_result));
 
-       g_variant_get (dbus_result, "(iiiiiaa{sv})", &result,
-                                       &cbConfig.Net3gppType,
-                                       &cbConfig.CBEnabled,
-                                       &cbConfig.MsgIdMaxCount,
-                                       &cbConfig.MsgIdRangeCount,
-                                       &iter);
+       g_variant_get(dbus_result, "(iiiiiaa{sv})", &result,
+                       &cbConfig.Net3gppType,
+                       &cbConfig.CBEnabled,
+                       &cbConfig.MsgIdMaxCount,
+                       &cbConfig.MsgIdRangeCount,
+                       &iter);
 
        i = 0;
        while (g_variant_iter_next(iter, "a{sv}", &iter_row)) {
                while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
-                       if (!g_strcmp0(key, "FromMsgId")) {
+                       if (!g_strcmp0(key, "FromMsgId"))
                                cbConfig.MsgIDs[i].Net3gpp.FromMsgId = g_variant_get_uint16(value);
-                       }
-                       if (!g_strcmp0(key, "ToMsgId")) {
+                       else if (!g_strcmp0(key, "ToMsgId"))
                                cbConfig.MsgIDs[i].Net3gpp.ToMsgId = g_variant_get_uint16(value);
-                       }
-                       if (!g_strcmp0(key, "CBCategory")) {
+                       else if (!g_strcmp0(key, "CBCategory"))
                                cbConfig.MsgIDs[i].Net3gpp2.CBCategory = g_variant_get_uint16(value);
-                       }
-                       if (!g_strcmp0(key, "CBLanguage")) {
+                       else if (!g_strcmp0(key, "CBLanguage"))
                                cbConfig.MsgIDs[i].Net3gpp2.CBLanguage = g_variant_get_uint16(value);
-                       }
-                       if (!g_strcmp0(key, "Selected")) {
+                       else if (!g_strcmp0(key, "Selected"))
                                cbConfig.MsgIDs[i].Net3gpp.Selected = g_variant_get_byte(value);
-                       }
                }
                i++;
                g_variant_iter_free(iter_row);
@@ -323,9 +311,8 @@ static void on_response_get_cb_config(GObject *source_object, GAsyncResult *res,
        g_variant_iter_free(iter);
 
        if (evt_cb_data) {
-               if (evt_cb_data->cb_fn) {
+               if (evt_cb_data->cb_fn)
                        evt_cb_data->cb_fn(evt_cb_data->handle, result, &cbConfig, evt_cb_data->user_data);
-               }
 
                g_free(evt_cb_data);
        }
@@ -347,13 +334,13 @@ static void on_response_get_sms_params(GObject *source_object, GAsyncResult *res
        GVariantIter *iter = 0;
        GVariant *inner_gv = 0;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
        dbg("on_response_get_sms_params type_format(%s)", g_variant_get_type_string(dbus_result));
 
-       g_variant_get (dbus_result, "(iiii@viiii@viii@viii)", &result,
+       g_variant_get(dbus_result, "(iiii@viiii@viii@viii)", &result,
                                                                &paramInfo.RecordIndex,
                                                                &paramInfo.RecordLen,
                                                                &paramInfo.AlphaIdLen,
@@ -371,33 +358,33 @@ static void on_response_get_sms_params(GObject *source_object, GAsyncResult *res
                                                                &paramInfo.TpDataCodingScheme,
                                                                &paramInfo.TpValidityPeriod);
 
-       inner_gv = g_variant_get_variant( alphaId );
+       inner_gv = g_variant_get_variant(alphaId);
        g_variant_get(inner_gv, "ay", &iter);
-       while( g_variant_iter_loop(iter, "y", &paramInfo.szAlphaId[i] ) ) {
+       while (g_variant_iter_loop(iter, "y", &paramInfo.szAlphaId[i])) {
                i++;
-               if( i >= TAPI_SIM_SMSP_ALPHA_ID_LEN_MAX + 1 )
+               if (i >= TAPI_SIM_SMSP_ALPHA_ID_LEN_MAX + 1)
                        break;
        }
 
        g_variant_iter_free(iter);
 
-       inner_gv = g_variant_get_variant( destDialNum );
+       inner_gv = g_variant_get_variant(destDialNum);
        g_variant_get(inner_gv, "ay", &iter);
        i = 0;
-       while( g_variant_iter_loop(iter, "y", &paramInfo.TpDestAddr.szDiallingNum[i] ) ) {
+       while (g_variant_iter_loop(iter, "y", &paramInfo.TpDestAddr.szDiallingNum[i])) {
                i++;
-               if( i >= TAPI_SIM_SMSP_ADDRESS_LEN + 1 )
+               if (i >= TAPI_SIM_SMSP_ADDRESS_LEN + 1)
                        break;
        }
 
        g_variant_iter_free(iter);
 
-       inner_gv = g_variant_get_variant( scaDialNum );
+       inner_gv = g_variant_get_variant(scaDialNum);
        g_variant_get(inner_gv, "ay", &iter);
        i = 0;
-       while( g_variant_iter_loop(iter, "y", &paramInfo.TpSvcCntrAddr.szDiallingNum[i] ) ) {
+       while (g_variant_iter_loop(iter, "y", &paramInfo.TpSvcCntrAddr.szDiallingNum[i])) {
                i++;
-               if( i >= TAPI_SIM_SMSP_ADDRESS_LEN + 1 )
+               if (i >= TAPI_SIM_SMSP_ADDRESS_LEN + 1)
                        break;
        }
 
@@ -408,9 +395,8 @@ static void on_response_get_sms_params(GObject *source_object, GAsyncResult *res
        g_variant_unref(inner_gv);
 
        if (evt_cb_data) {
-               if (evt_cb_data->cb_fn) {
+               if (evt_cb_data->cb_fn)
                        evt_cb_data->cb_fn(evt_cb_data->handle, result, &paramInfo, evt_cb_data->user_data);
-               }
 
                g_free(evt_cb_data);
        }
@@ -427,19 +413,18 @@ static void on_response_get_sms_param_cnt(GObject *source_object, GAsyncResult *
 
        GVariant *dbus_result = NULL;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
        dbg("on_response_get_sms_param_cnt type_format(%s)", g_variant_get_type_string(dbus_result));
 
-       g_variant_get (dbus_result, "(ii)", &result,
+       g_variant_get(dbus_result, "(ii)", &result,
                        &recordCount);
 
        if (evt_cb_data) {
-               if (evt_cb_data->cb_fn) {
+               if (evt_cb_data->cb_fn)
                        evt_cb_data->cb_fn(evt_cb_data->handle, result, &recordCount, evt_cb_data->user_data);
-               }
 
                g_free(evt_cb_data);
        }
@@ -449,7 +434,7 @@ static void on_response_get_sms_param_cnt(GObject *source_object, GAsyncResult *
 EXPORT_API int tel_send_sms(struct tapi_handle *handle,
                const TelSmsDatapackageInfo_t *pDataPackage,
                int bMoreMsgToSend,
-               tapi_response_cb callback, voiduser_data)
+               tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = NULL;
        GVariant *param;
@@ -471,24 +456,20 @@ EXPORT_API int tel_send_sms(struct tapi_handle *handle,
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
-       g_variant_builder_init(&b, G_VARIANT_TYPE("ay") );
-       for( i=0; i<TAPI_SIM_SMSP_ADDRESS_LEN; i++) {
-               g_variant_builder_add(&b, "y", pDataPackage->Sca[i] );
-       }
+       g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
+       for (i = 0; i < TAPI_SIM_SMSP_ADDRESS_LEN; i++)
+               g_variant_builder_add(&b, "y", pDataPackage->Sca[i]);
        sca = g_variant_builder_end(&b);
        packet_sca = g_variant_new("v", sca);
 
-       g_variant_builder_init(&b, G_VARIANT_TYPE("ay") );
-       for( i=0; i<TAPI_NETTEXT_SMDATA_SIZE_MAX + 1; i++) {
-               g_variant_builder_add(&b, "y", pDataPackage->szData[i] );
-       }
+       g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
+       for (i = 0; i < TAPI_NETTEXT_SMDATA_SIZE_MAX + 1; i++)
+               g_variant_builder_add(&b, "y", pDataPackage->szData[i]);
        tpdu = g_variant_builder_end(&b);
        packet_tpdu = g_variant_new("v", tpdu);
 
        param = g_variant_new("(i@vi@vi)", pDataPackage->format, packet_sca,
-                                                       pDataPackage->MsgLength,
-                                                       packet_tpdu,
-                                                       bMoreMsgToSend);
+               pDataPackage->MsgLength, packet_tpdu, bMoreMsgToSend);
 
        g_dbus_connection_call(handle->dbus_connection,
                DBUS_TELEPHONY_SERVICE , handle->path, DBUS_TELEPHONY_SMS_INTERFACE,
@@ -499,7 +480,7 @@ EXPORT_API int tel_send_sms(struct tapi_handle *handle,
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_read_sms_in_sim(struct tapi_handle *handle, int read_index, tapi_response_cb callback, voiduser_data)
+EXPORT_API int tel_read_sms_in_sim(struct tapi_handle *handle, int read_index, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = NULL;
        GVariant *param;
@@ -509,8 +490,8 @@ EXPORT_API int tel_read_sms_in_sim(struct tapi_handle *handle, int read_index, t
        TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR);
        TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR);
 
-       if( (read_index < 0) || (read_index > TAPI_NETTEXT_MAX_INDEX) ) {
-               err("Invalid Input -Read SMS %d",read_index);
+       if ((read_index < 0) || (read_index > TAPI_NETTEXT_MAX_INDEX)) {
+               err("Invalid Input -Read SMS %d", read_index);
 
                return TAPI_API_INVALID_INPUT;
        }
@@ -528,7 +509,7 @@ EXPORT_API int tel_read_sms_in_sim(struct tapi_handle *handle, int read_index, t
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_write_sms_in_sim(struct tapi_handle *handle, const TelSmsData_t *pWriteData, tapi_response_cb callback, voiduser_data)
+EXPORT_API int tel_write_sms_in_sim(struct tapi_handle *handle, const TelSmsData_t *pWriteData, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = NULL;
        GVariant *param;
@@ -545,24 +526,23 @@ EXPORT_API int tel_write_sms_in_sim(struct tapi_handle *handle, const TelSmsData
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
-        g_variant_builder_init(&b, G_VARIANT_TYPE("ay") );
-       for( i=0; i<TAPI_SIM_SMSP_ADDRESS_LEN; i++) {
-               g_variant_builder_add(&b, "y", pWriteData->SmsData.Sca[i] );
-       }
+        g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
+       for (i = 0; i < TAPI_SIM_SMSP_ADDRESS_LEN; i++)
+               g_variant_builder_add(&b, "y", pWriteData->SmsData.Sca[i]);
        sca = g_variant_builder_end(&b);
        packet_sca = g_variant_new("v", sca);
 
-        g_variant_builder_init(&b, G_VARIANT_TYPE("ay") );
-       for( i=0; i<TAPI_NETTEXT_SMDATA_SIZE_MAX + 1; i++) {
-               g_variant_builder_add(&b, "y", pWriteData->SmsData.szData[i] );
-       }
+        g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
+       for (i = 0; i < TAPI_NETTEXT_SMDATA_SIZE_MAX + 1; i++)
+               g_variant_builder_add(&b, "y", pWriteData->SmsData.szData[i]);
        tpdu = g_variant_builder_end(&b);
        packet_tpdu = g_variant_new("v", tpdu);
 
-       param = g_variant_new("(ii@vi@v)", pWriteData->SmsData.format,pWriteData->MsgStatus,
-                                                       packet_sca,
-                                                       pWriteData->SmsData.MsgLength,
-                                                       packet_tpdu);
+       param = g_variant_new("(ii@vi@v)", pWriteData->SmsData.format,
+               pWriteData->MsgStatus,
+               packet_sca,
+               pWriteData->SmsData.MsgLength,
+               packet_tpdu);
 
        g_dbus_connection_call(handle->dbus_connection,
                DBUS_TELEPHONY_SERVICE , handle->path, DBUS_TELEPHONY_SMS_INTERFACE,
@@ -573,7 +553,7 @@ EXPORT_API int tel_write_sms_in_sim(struct tapi_handle *handle, const TelSmsData
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_delete_sms_in_sim(struct tapi_handle *handle, int del_index, tapi_response_cb callback, voiduser_data)
+EXPORT_API int tel_delete_sms_in_sim(struct tapi_handle *handle, int del_index, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = NULL;
        GVariant *param;
@@ -601,7 +581,7 @@ EXPORT_API int tel_delete_sms_in_sim(struct tapi_handle *handle, int del_index,
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_get_sms_count(struct tapi_handle *handle, tapi_response_cb callback, voiduser_data)
+EXPORT_API int tel_get_sms_count(struct tapi_handle *handle, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = NULL;
 
@@ -621,7 +601,7 @@ EXPORT_API int tel_get_sms_count(struct tapi_handle *handle, tapi_response_cb ca
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_get_sms_sca(struct tapi_handle *handle, int sca_index, tapi_response_cb callback, voiduser_data)
+EXPORT_API int tel_get_sms_sca(struct tapi_handle *handle, int sca_index, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = NULL;
        GVariant *param;
@@ -649,7 +629,7 @@ EXPORT_API int tel_get_sms_sca(struct tapi_handle *handle, int sca_index, tapi_r
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_set_sms_sca(struct tapi_handle *handle, const TelSmsAddressInfo_t *pSCA, int sca_index, tapi_response_cb callback, voiduser_data)
+EXPORT_API int tel_set_sms_sca(struct tapi_handle *handle, const TelSmsAddressInfo_t *pSCA, int sca_index, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = NULL;
        GVariant *param;
@@ -669,10 +649,9 @@ EXPORT_API int tel_set_sms_sca(struct tapi_handle *handle, const TelSmsAddressIn
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
-        g_variant_builder_init(&b, G_VARIANT_TYPE("ay") );
-       for( i=0; i<TAPI_SIM_SMSP_ADDRESS_LEN + 1; i++) {
-               g_variant_builder_add(&b, "y", pSCA->szDiallingNum[i] );
-       }
+        g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
+       for (i = 0; i < TAPI_SIM_SMSP_ADDRESS_LEN + 1; i++)
+               g_variant_builder_add(&b, "y", pSCA->szDiallingNum[i]);
        sca = g_variant_builder_end(&b);
        packet_sca = g_variant_new("v", sca);
 
@@ -691,7 +670,7 @@ EXPORT_API int tel_set_sms_sca(struct tapi_handle *handle, const TelSmsAddressIn
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_get_sms_cb_config(struct tapi_handle *handle, tapi_response_cb callback, voiduser_data)
+EXPORT_API int tel_get_sms_cb_config(struct tapi_handle *handle, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = NULL;
 
@@ -711,7 +690,7 @@ EXPORT_API int tel_get_sms_cb_config(struct tapi_handle *handle, tapi_response_c
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_set_sms_cb_config(struct tapi_handle *handle, const TelSmsCbConfig_t *pCBConfig, tapi_response_cb callback, voiduser_data)
+EXPORT_API int tel_set_sms_cb_config(struct tapi_handle *handle, const TelSmsCbConfig_t *pCBConfig, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = NULL;
        GVariant *param;
@@ -725,22 +704,22 @@ EXPORT_API int tel_set_sms_cb_config(struct tapi_handle *handle, const TelSmsCbC
        TAPI_RET_ERR_NUM_IF_FAIL(pCBConfig, TAPI_API_INVALID_PTR);
 
        if ((pCBConfig->Net3gppType > 2) || (pCBConfig->MsgIdRangeCount < 0)) {
-               err("Invalid Input -3gppType(%d)",pCBConfig->Net3gppType);
-               err("Invalid Input -MsgIdRangeCount(%d)",pCBConfig->MsgIdRangeCount);
+               err("Invalid Input -3gppType(%d)", pCBConfig->Net3gppType);
+               err("Invalid Input -MsgIdRangeCount(%d)", pCBConfig->MsgIdRangeCount);
 
                return TAPI_API_INVALID_INPUT;
        }
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
-       g_variant_builder_init( &b, G_VARIANT_TYPE("aa{sv}") );
+       g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}"));
 
        for (i = 0; i < pCBConfig->MsgIdRangeCount; i++) {
                g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
-               if( pCBConfig->Net3gppType == TAPI_NETTEXT_CB_MSG_GSM ) {
+               if (pCBConfig->Net3gppType == TAPI_NETTEXT_CB_MSG_GSM) {
                        g_variant_builder_add(&b, "{sv}", "FromMsgId", g_variant_new_uint16(pCBConfig->MsgIDs[i].Net3gpp.FromMsgId));
                        g_variant_builder_add(&b, "{sv}", "ToMsgId", g_variant_new_uint16(pCBConfig->MsgIDs[i].Net3gpp.ToMsgId));
-               } else ifpCBConfig->Net3gppType == TAPI_NETTEXT_CB_MSG_UMTS) {
+               } else if (pCBConfig->Net3gppType == TAPI_NETTEXT_CB_MSG_UMTS) {
                        g_variant_builder_add(&b, "{sv}", "CBCategory", g_variant_new_uint16(pCBConfig->MsgIDs[i].Net3gpp2.CBCategory));
                        g_variant_builder_add(&b, "{sv}", "CBLanguage", g_variant_new_uint16(pCBConfig->MsgIDs[i].Net3gpp2.CBLanguage));
                } else {
@@ -769,7 +748,7 @@ EXPORT_API int tel_set_sms_cb_config(struct tapi_handle *handle, const TelSmsCbC
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_set_sms_memory_status(struct tapi_handle *handle, int memoryStatus, tapi_response_cb callback, voiduser_data)
+EXPORT_API int tel_set_sms_memory_status(struct tapi_handle *handle, int memoryStatus, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = NULL;
        GVariant *param;
@@ -799,7 +778,7 @@ EXPORT_API int tel_set_sms_memory_status(struct tapi_handle *handle, int memoryS
 EXPORT_API int tel_send_sms_deliver_report(struct tapi_handle *handle,
                const TelSmsDatapackageInfo_t *pDataPackage,
                TelSmsResponse_t RPCause,
-               tapi_response_cb callback, voiduser_data)
+               tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = NULL;
        GVariant *param;
@@ -846,7 +825,7 @@ EXPORT_API int tel_send_sms_deliver_report(struct tapi_handle *handle,
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_set_sms_message_status(struct tapi_handle *handle, int set_index, TelSmsMsgStatus_t msgStatus, tapi_response_cb callback, voiduser_data)
+EXPORT_API int tel_set_sms_message_status(struct tapi_handle *handle, int set_index, TelSmsMsgStatus_t msgStatus, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = NULL;
        GVariant *param;
@@ -874,7 +853,7 @@ EXPORT_API int tel_set_sms_message_status(struct tapi_handle *handle, int set_in
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_get_sms_parameters(struct tapi_handle *handle, int get_index, tapi_response_cb callback, voiduser_data)
+EXPORT_API int tel_get_sms_parameters(struct tapi_handle *handle, int get_index, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = NULL;
        GVariant *param;
@@ -902,7 +881,7 @@ EXPORT_API int tel_get_sms_parameters(struct tapi_handle *handle, int get_index,
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_set_sms_parameters(struct tapi_handle *handle, const TelSmsParams_t *pSmsSetParameters, tapi_response_cb callback, voiduser_data)
+EXPORT_API int tel_set_sms_parameters(struct tapi_handle *handle, const TelSmsParams_t *pSmsSetParameters, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = NULL;
        GVariant *param;
@@ -919,43 +898,40 @@ EXPORT_API int tel_set_sms_parameters(struct tapi_handle *handle, const TelSmsPa
 
        MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data);
 
-        g_variant_builder_init(&b, G_VARIANT_TYPE("ay") );
-       for( i=0; i<TAPI_SIM_SMSP_ALPHA_ID_LEN_MAX + 1; i++) {
-               g_variant_builder_add(&b, "y", pSmsSetParameters->szAlphaId[i] );
-       }
+        g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
+       for (i = 0; i < TAPI_SIM_SMSP_ALPHA_ID_LEN_MAX + 1; i++)
+               g_variant_builder_add(&b, "y", pSmsSetParameters->szAlphaId[i]);
        alphaId = g_variant_builder_end(&b);
        packet_alphaId = g_variant_new("v", alphaId);
 
-        g_variant_builder_init(&b, G_VARIANT_TYPE("ay") );
-       for( i=0; i<TAPI_SIM_SMSP_ADDRESS_LEN + 1; i++) {
-               g_variant_builder_add(&b, "y", pSmsSetParameters->TpDestAddr.szDiallingNum[i] );
-       }
+        g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
+       for (i = 0; i < TAPI_SIM_SMSP_ADDRESS_LEN + 1; i++)
+               g_variant_builder_add(&b, "y", pSmsSetParameters->TpDestAddr.szDiallingNum[i]);
        destDialNum = g_variant_builder_end(&b);
        packet_destDialNum = g_variant_new("v", destDialNum);
 
-        g_variant_builder_init(&b, G_VARIANT_TYPE("ay") );
-       for( i=0; i<TAPI_SIM_SMSP_ADDRESS_LEN + 1; i++) {
-               g_variant_builder_add(&b, "y", pSmsSetParameters->TpSvcCntrAddr.szDiallingNum[i] );
-       }
+        g_variant_builder_init(&b, G_VARIANT_TYPE("ay"));
+       for (i = 0; i < TAPI_SIM_SMSP_ADDRESS_LEN + 1; i++)
+               g_variant_builder_add(&b, "y", pSmsSetParameters->TpSvcCntrAddr.szDiallingNum[i]);
        scaDialNum = g_variant_builder_end(&b);
        packet_scaDialNum = g_variant_new("v", scaDialNum);
 
        param = g_variant_new("(iii@viiii@viii@viii)", pSmsSetParameters->RecordIndex,
-                                                                       pSmsSetParameters->RecordLen,
-                                                                       pSmsSetParameters->AlphaIdLen,
-                                                                       packet_alphaId,
-                                                                       pSmsSetParameters->ParamIndicator,
-                                                                       pSmsSetParameters->TpDestAddr.DialNumLen,
-                                                                       pSmsSetParameters->TpDestAddr.Ton,
-                                                                       pSmsSetParameters->TpDestAddr.Npi,
-                                                                       packet_destDialNum,
-                                                                       pSmsSetParameters->TpSvcCntrAddr.DialNumLen,
-                                                                       pSmsSetParameters->TpSvcCntrAddr.Ton,
-                                                                       pSmsSetParameters->TpSvcCntrAddr.Npi,
-                                                                       packet_scaDialNum,
-                                                                       pSmsSetParameters->TpProtocolId,
-                                                                       pSmsSetParameters->TpDataCodingScheme,
-                                                                       pSmsSetParameters->TpValidityPeriod);
+                       pSmsSetParameters->RecordLen,
+                       pSmsSetParameters->AlphaIdLen,
+                       packet_alphaId,
+                       pSmsSetParameters->ParamIndicator,
+                       pSmsSetParameters->TpDestAddr.DialNumLen,
+                       pSmsSetParameters->TpDestAddr.Ton,
+                       pSmsSetParameters->TpDestAddr.Npi,
+                       packet_destDialNum,
+                       pSmsSetParameters->TpSvcCntrAddr.DialNumLen,
+                       pSmsSetParameters->TpSvcCntrAddr.Ton,
+                       pSmsSetParameters->TpSvcCntrAddr.Npi,
+                       packet_scaDialNum,
+                       pSmsSetParameters->TpProtocolId,
+                       pSmsSetParameters->TpDataCodingScheme,
+                       pSmsSetParameters->TpValidityPeriod);
 
        g_dbus_connection_call(handle->dbus_connection,
                DBUS_TELEPHONY_SERVICE , handle->path, DBUS_TELEPHONY_SMS_INTERFACE,
@@ -966,7 +942,7 @@ EXPORT_API int tel_set_sms_parameters(struct tapi_handle *handle, const TelSmsPa
        return TAPI_API_SUCCESS;
 }
 
-EXPORT_API int tel_get_sms_parameter_count(struct tapi_handle *handle, tapi_response_cb callback, voiduser_data)
+EXPORT_API int tel_get_sms_parameter_count(struct tapi_handle *handle, tapi_response_cb callback, void *user_data)
 {
        struct tapi_resp_data *evt_cb_data = NULL;
 
@@ -1004,8 +980,8 @@ EXPORT_API int tel_check_sms_device_status(struct tapi_handle *handle, int *pRea
                "GetSmsReadyStatus", NULL, NULL, G_DBUS_CALL_FLAGS_NONE,
                TAPI_DEFAULT_TIMEOUT, NULL, &error);
        if (!smsReady) {
-               dbg( "error to get SMS ready_status(%s)", error->message);
-               g_error_free (error);
+               dbg("error to get SMS ready_status(%s)", error->message);
+               g_error_free(error);
                return TAPI_API_OPERATION_FAILED;
        }
 
index e40519c158cc7bb4ab66fcef3ad304a881d84e5d..6c9c4184abdd66c61560696ad1ed0b2a574713f5 100644 (file)
@@ -46,42 +46,33 @@ static void on_response_get_ss_barring_status(GObject *source_object, GAsyncResu
 
        memset(&resp, '\0', sizeof(TelSsBarringResp_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(aa{sv}i)", &iter, &result);
+       g_variant_get(dbus_result, "(aa{sv}i)", &iter, &result);
 
        resp.record_num = g_variant_iter_n_children(iter);
 
-       if (TAPI_SS_RECORD_NUM_MAX < resp.record_num) {
+       if (TAPI_SS_RECORD_NUM_MAX < resp.record_num)
                resp.record_num = TAPI_SS_RECORD_NUM_MAX;
-       }
-
-       while ( g_variant_iter_next(iter, "a{sv}", &iter_row ) && (i < resp.record_num)) {
-               while ( g_variant_iter_loop( iter_row, "{sv}", &key, &value ) ) {
 
-                       if ( !g_strcmp0(key, "ss_class") ) {
+       while (g_variant_iter_next(iter, "a{sv}", &iter_row) && (i < resp.record_num)) {
+               while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
+                       if (!g_strcmp0(key, "ss_class"))
                                resp.record[i].Class = g_variant_get_int32(value);
-                       }
-
-                       if ( !g_strcmp0(key, "ss_status") ) {
+                       else if (!g_strcmp0(key, "ss_status"))
                                resp.record[i].Status = g_variant_get_int32(value);
-                       }
-
-                       if ( !g_strcmp0(key, "barring_mode") ) {
+                       else if (!g_strcmp0(key, "barring_mode"))
                                resp.record[i].Flavour = g_variant_get_int32(value);
-                       }
-
                }
                i++;
                g_variant_iter_free(iter_row);
        }
        g_variant_iter_free(iter);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -96,15 +87,14 @@ static void on_response_change_ss_barring_password(GObject *source_object, GAsyn
 
        GVariant *dbus_result = 0;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(i)",  &result);
+       g_variant_get(dbus_result, "(i)",  &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, NULL, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -126,62 +116,44 @@ static void on_response_get_ss_forward_status(GObject *source_object, GAsyncResu
 
        memset(&resp, '\0', sizeof(TelSsForwardResp_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(aa{sv}i)", &iter, &result);
+       g_variant_get(dbus_result, "(aa{sv}i)", &iter, &result);
 
        resp.record_num = g_variant_iter_n_children(iter);
 
-       if (TAPI_SS_RECORD_NUM_MAX < resp.record_num) {
+       if (TAPI_SS_RECORD_NUM_MAX < resp.record_num)
                resp.record_num = TAPI_SS_RECORD_NUM_MAX;
-       }
-
-       while ( g_variant_iter_next(iter, "a{sv}", &iter_row ) && (i < resp.record_num)) {
-               while ( g_variant_iter_loop( iter_row, "{sv}", &key, &value ) ) {
 
-                       if ( !g_strcmp0(key, "ss_class") ) {
+       while (g_variant_iter_next(iter, "a{sv}", &iter_row) && (i < resp.record_num)) {
+               while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
+                       if (!g_strcmp0(key, "ss_class"))
                                resp.record[i].Class = g_variant_get_int32(value);
-                       }
-
-                       if ( !g_strcmp0(key, "ss_status") ) {
+                       else if (!g_strcmp0(key, "ss_status"))
                                resp.record[i].Status = g_variant_get_int32(value);
-                       }
-
-                       if ( !g_strcmp0(key, "forwarding_mode") ) {
+                       else if (!g_strcmp0(key, "forwarding_mode"))
                                resp.record[i].ForwardCondition = g_variant_get_int32(value);
-                       }
-
-                       if ( !g_strcmp0(key, "number_present") ) {
+                       else if (!g_strcmp0(key, "number_present"))
                                resp.record[i].bCallForwardingNumberPresent = g_variant_get_int32(value);
-                       }
-
-                       if ( !g_strcmp0(key, "no_reply_time") ) {
+                       else if (!g_strcmp0(key, "no_reply_time"))
                                resp.record[i].NoReplyWaitTime = g_variant_get_int32(value);
-                       }
-
-                       if ( !g_strcmp0(key, "type_of_number") ) {
+                       else if (!g_strcmp0(key, "type_of_number"))
                                resp.record[i].Ton = g_variant_get_int32(value);
-                       }
-
-                       if ( !g_strcmp0(key, "number_plan_identity") ) {
+                       else if (!g_strcmp0(key, "number_plan_identity"))
                                resp.record[i].Npi = g_variant_get_int32(value);
-                       }
-
-                       if ( !g_strcmp0(key, "forwarding_number") ) {
-                               strncpy((char *)resp.record[i].szCallForwardingNumber, g_variant_get_string(value, 0), TAPI_CALL_DIALDIGIT_LEN_MAX );
-                       }
-
+                       else if (!g_strcmp0(key, "forwarding_number"))
+                               strncpy((char *)resp.record[i].szCallForwardingNumber,
+                                       g_variant_get_string(value, 0), TAPI_CALL_DIALDIGIT_LEN_MAX);
                }
                i++;
                g_variant_iter_free(iter_row);
        }
        g_variant_iter_free(iter);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -203,37 +175,31 @@ static void on_response_get_ss_waiting_status(GObject *source_object, GAsyncResu
 
        memset(&resp, '\0', sizeof(TelSsWaitingResp_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(aa{sv}i)", &iter, &result);
+       g_variant_get(dbus_result, "(aa{sv}i)", &iter, &result);
 
        resp.record_num = g_variant_iter_n_children(iter);
 
-       if (TAPI_SS_RECORD_NUM_MAX < resp.record_num) {
+       if (TAPI_SS_RECORD_NUM_MAX < resp.record_num)
                resp.record_num = TAPI_SS_RECORD_NUM_MAX;
-       }
 
-       while ( g_variant_iter_next(iter, "a{sv}", &iter_row ) && (i < resp.record_num) ) {
-               while ( g_variant_iter_loop( iter_row, "{sv}", &key, &value ) ) {
-
-                       if ( !g_strcmp0(key, "ss_class") ) {
+       while (g_variant_iter_next(iter, "a{sv}", &iter_row) && (i < resp.record_num)) {
+               while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
+                       if (!g_strcmp0(key, "ss_class"))
                                resp.record[i].Class = g_variant_get_int32(value);
-                       }
-
-                       if ( !g_strcmp0(key, "ss_status") ) {
+                       else if (!g_strcmp0(key, "ss_status"))
                                resp.record[i].Status = g_variant_get_int32(value);
-                       }
                }
                i++;
                g_variant_iter_free(iter_row);
        }
        g_variant_iter_free(iter);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -249,15 +215,14 @@ static void on_response_set_ss_cli_status(GObject *source_object, GAsyncResult *
 
        GVariant *dbus_result = 0;
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(i)",  &result);
+       g_variant_get(dbus_result, "(i)",  &result);
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &data, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -275,16 +240,15 @@ static void on_response_get_ss_cli_status(GObject *source_object, GAsyncResult *
 
        memset(&resp, '\0', sizeof(TelSsCliResp_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(iii)",  &result, &resp.Type, &resp.Status);
+       g_variant_get(dbus_result, "(iii)",  &result, &resp.Type, &resp.Status);
 
        msg("Type(%d), Status(%d)", resp.Type, resp.Status);
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -303,20 +267,19 @@ static void on_response_send_ss_ussd_request(GObject *source_object, GAsyncResul
 
        memset(&resp, '\0', sizeof(TelSsUssdResp_t));
 
-       conn = G_DBUS_CONNECTION (source_object);
+       conn = G_DBUS_CONNECTION(source_object);
        dbus_result = g_dbus_connection_call_finish(conn, res, &error);
        CHECK_ERROR(error);
 
-       g_variant_get (dbus_result, "(iiiiis)",  &result, &resp.Type, &resp.Status, &resp.Dcs, &resp.Length, &tmp_str);
+       g_variant_get(dbus_result, "(iiiiis)",  &result, &resp.Type, &resp.Status, &resp.Dcs, &resp.Length, &tmp_str);
 
        if (!result) {
-               memcpy( resp.szString, tmp_str, resp.Length );
+               memcpy(resp.szString, tmp_str, resp.Length);
                g_free(tmp_str);
        }
 
-       if (evt_cb_data->cb_fn) {
+       if (evt_cb_data->cb_fn)
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &resp, evt_cb_data->user_data);
-       }
 
        g_free(evt_cb_data);
        g_variant_unref(dbus_result);
@@ -337,7 +300,7 @@ EXPORT_API int tel_set_ss_barring(TapiHandle *handle, TelSsBarringInfo_t *info,
 
        param = g_variant_new("(iis)", info->Class, info->Type, info->szPassword);
 
-       if ( info->Mode == TAPI_SS_CB_MODE_ACTIVATE ) {
+       if (info->Mode == TAPI_SS_CB_MODE_ACTIVATE) {
                msg("[ check ] barring activate");
                method = "ActivateBarring";
 
@@ -351,7 +314,7 @@ EXPORT_API int tel_set_ss_barring(TapiHandle *handle, TelSsBarringInfo_t *info,
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_SS_INTERFACE,
                        method, param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_get_ss_barring_status, evt_cb_data );
+                       on_response_get_ss_barring_status, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
@@ -374,7 +337,7 @@ EXPORT_API int tel_get_ss_barring_status(TapiHandle *handle, TelSsClass_t class,
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_SS_INTERFACE,
                        "GetBarringStatus", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_get_ss_barring_status, evt_cb_data );
+                       on_response_get_ss_barring_status, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
@@ -414,7 +377,7 @@ EXPORT_API int tel_change_ss_barring_password(TapiHandle *handle,
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_SS_INTERFACE,
                        "ChangeBarringPassword", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_change_ss_barring_password, evt_cb_data );
+                       on_response_change_ss_barring_password, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
@@ -444,37 +407,41 @@ EXPORT_API int tel_set_ss_forward(TapiHandle *handle, const TelSsForwardInfo_t *
        param = g_variant_new("(iiiiis)", info->Class, info->Condition,
                        info->NoReplyConditionTimer, info->Ton, info->Npi, info->szPhoneNumber);
 
-       switch ( info->Mode ) {
-               case TAPI_SS_CF_MODE_DISABLE_EV: {
-                       msg("[ check ] forwarding deactivate");
-                       method = "DeactivateForwarding";
-               } break;
-
-               case TAPI_SS_CF_MODE_ENABLE_EV: {
-                       msg("[ check ] forwarding activate");
-                       method = "ActivateForwarding";
-               } break;
-
-               case TAPI_SS_CF_MODE_REGISTRATION_EV: {
-                       msg("[ check ] forwarding registration");
-                       method = "RegisterForwarding";
-               } break;
-
-               case TAPI_SS_CF_MODE_ERASURE_EV: {
-                       msg("[ check ] forwarding deregistration");
-                       method = "DeregisterForwarding";
-               } break;
-
-               default:
-                       err("[ error ] invalid input : (0x%x)", info->Mode);
-                       return TAPI_API_INVALID_INPUT;
+       switch (info->Mode) {
+       case TAPI_SS_CF_MODE_DISABLE_EV: {
+               msg("[ check ] forwarding deactivate");
+               method = "DeactivateForwarding";
+       }
+       break;
+
+       case TAPI_SS_CF_MODE_ENABLE_EV: {
+               msg("[ check ] forwarding activate");
+               method = "ActivateForwarding";
+       }
+       break;
+
+       case TAPI_SS_CF_MODE_REGISTRATION_EV: {
+               msg("[ check ] forwarding registration");
+               method = "RegisterForwarding";
+       }
+       break;
+
+       case TAPI_SS_CF_MODE_ERASURE_EV: {
+               msg("[ check ] forwarding deregistration");
+               method = "DeregisterForwarding";
+       }
+       break;
+
+       default:
+               err("[ error ] invalid input : (0x%x)", info->Mode);
+               return TAPI_API_INVALID_INPUT;
        }
 
        g_dbus_connection_call(handle->dbus_connection,
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_SS_INTERFACE,
                        method, param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_get_ss_forward_status, evt_cb_data );
+                       on_response_get_ss_forward_status, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
@@ -507,7 +474,7 @@ EXPORT_API int tel_get_ss_forward_status(TapiHandle *handle, TelSsClass_t class,
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_SS_INTERFACE,
                        "GetForwardingStatus", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_get_ss_forward_status, evt_cb_data );
+                       on_response_get_ss_forward_status, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
@@ -536,7 +503,7 @@ EXPORT_API int tel_set_ss_waiting(TapiHandle *handle, const TelSsWaitingInfo_t *
 
        param = g_variant_new("(i)", info->Class);
 
-       if ( info->Mode == TAPI_SS_CW_MODE_ACTIVATE ) {
+       if (info->Mode == TAPI_SS_CW_MODE_ACTIVATE) {
                msg("[ check ] waiting activate");
                method = "ActivateWaiting";
        } else {
@@ -548,7 +515,7 @@ EXPORT_API int tel_set_ss_waiting(TapiHandle *handle, const TelSsWaitingInfo_t *
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_SS_INTERFACE,
                        method, param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_get_ss_waiting_status, evt_cb_data );
+                       on_response_get_ss_waiting_status, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
@@ -581,7 +548,7 @@ EXPORT_API int tel_get_ss_waiting_status(TapiHandle *handle, const TelSsClass_t
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_SS_INTERFACE,
                        "GetWaitingStatus", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_get_ss_waiting_status, evt_cb_data );
+                       on_response_get_ss_waiting_status, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
@@ -613,7 +580,7 @@ EXPORT_API int tel_set_ss_cli_status(TapiHandle *handle, TelSsCliType_t type, Te
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_SS_INTERFACE,
                        "SetCLIStatus", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_set_ss_cli_status, evt_cb_data );
+                       on_response_set_ss_cli_status, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
@@ -645,7 +612,7 @@ EXPORT_API int tel_get_ss_cli_status(TapiHandle *handle, TelSsCliType_t type, ta
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_SS_INTERFACE,
                        "GetCLIStatus", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, TAPI_DEFAULT_TIMEOUT, handle->ca,
-                       on_response_get_ss_cli_status, evt_cb_data );
+                       on_response_get_ss_cli_status, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
@@ -676,7 +643,7 @@ EXPORT_API int tel_send_ss_ussd_request(TapiHandle *handle, const TelSsUssdMsgIn
                        DBUS_TELEPHONY_SERVICE, handle->path, DBUS_TELEPHONY_SS_INTERFACE,
                        "SendUSSD", param, 0,
                        G_DBUS_CALL_FLAGS_NONE, G_MAXINT, handle->ca,
-                       on_response_send_ss_ussd_request, evt_cb_data );
+                       on_response_send_ss_ussd_request, evt_cb_data);
 
        return TAPI_API_SUCCESS;
 }
index c488c70e93a7b824d00612bcc3ac617b09432439..3ae087d1eeb4f008ec74b6a2d0c8733f2f2dadf5 100644 (file)
@@ -16,6 +16,10 @@ SET(tapitest
        call.c
 )
 
+##Address-Space Layout Randomization
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE")
+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
+
 ADD_EXECUTABLE(tapitest ${tapitest})
 TARGET_LINK_LIBRARIES(tapitest ${pkgs_LDFLAGS} "-L${CMAKE_BINARY_DIR} -lSLP-tapi")
 INSTALL(TARGETS tapitest RUNTIME DESTINATION bin/)
index ca35ec74a43492048483743c29a08e31088efe9a..eb7e7de5a9914118698a6661840d6de53806ed6c 100644 (file)
@@ -55,7 +55,7 @@ static char data_preferred_voice_subscription[MENU_DATA_SIZE + 1] = "0";
 
 static void on_noti_call_status_idle(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       TelCallStatusIdleNoti_t *noti_data = (TelCallStatusIdleNoti_t*)data;
+       TelCallStatusIdleNoti_t *noti_data = (TelCallStatusIdleNoti_t *)data;
 
        msg("");
        msgb("event(%s) receive !!", TAPI_NOTI_VOICE_CALL_STATUS_IDLE);
@@ -69,7 +69,7 @@ static void on_noti_call_status_idle(TapiHandle *handle, const char *noti_id, vo
 
 static void on_noti_call_status_active(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       TelCallStatusActiveNoti_t *noti_data = (TelCallStatusActiveNoti_t*)data;
+       TelCallStatusActiveNoti_t *noti_data = (TelCallStatusActiveNoti_t *)data;
 
        msg("");
        msgb("event(%s) receive !!", TAPI_NOTI_VOICE_CALL_STATUS_ACTIVE);
@@ -82,7 +82,7 @@ static void on_noti_call_status_active(TapiHandle *handle, const char *noti_id,
 
 static void on_noti_call_status_held(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       TelCallStatusHeldNoti_t *noti_data = (TelCallStatusHeldNoti_t*)data;
+       TelCallStatusHeldNoti_t *noti_data = (TelCallStatusHeldNoti_t *)data;
 
        msg("");
        msgb("event(%s) receive !!", TAPI_NOTI_VOICE_CALL_STATUS_HELD);
@@ -95,7 +95,7 @@ static void on_noti_call_status_held(TapiHandle *handle, const char *noti_id, vo
 
 static void on_noti_call_status_dialing(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       TelCallStatusDialingNoti_t *noti_data = (TelCallStatusDialingNoti_t*)data;
+       TelCallStatusDialingNoti_t *noti_data = (TelCallStatusDialingNoti_t *)data;
 
        msg("");
        msgb("event(%s) receive !!", TAPI_NOTI_VOICE_CALL_STATUS_DIALING);
@@ -108,7 +108,7 @@ static void on_noti_call_status_dialing(TapiHandle *handle, const char *noti_id,
 
 static void on_noti_call_status_alert(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       TelCallStatusAlertNoti_t *noti_data = (TelCallStatusAlertNoti_t*)data;
+       TelCallStatusAlertNoti_t *noti_data = (TelCallStatusAlertNoti_t *)data;
 
        msg("");
        msgb("event(%s) receive !!", TAPI_NOTI_VOICE_CALL_STATUS_ALERT);
@@ -121,7 +121,7 @@ static void on_noti_call_status_alert(TapiHandle *handle, const char *noti_id, v
 
 static void on_noti_call_status_incoming(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       TelCallStatusIncomingNoti_t *noti_data = (TelCallStatusIncomingNoti_t*)data;
+       TelCallStatusIncomingNoti_t *noti_data = (TelCallStatusIncomingNoti_t *)data;
 
        msg("");
        msgb("event(%s) receive !!", TAPI_NOTI_VOICE_CALL_STATUS_INCOMING);
@@ -134,7 +134,7 @@ static void on_noti_call_status_incoming(TapiHandle *handle, const char *noti_id
 
 static void on_noti_call_sound_ringback_tone(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       TelCallSoundRingbackToneNoti_t *noti_data = (TelCallSoundRingbackToneNoti_t*)data;
+       TelCallSoundRingbackToneNoti_t *noti_data = (TelCallSoundRingbackToneNoti_t *)data;
 
        msg("");
        msgb("event(%s) receive !!", TAPI_NOTI_CALL_SOUND_RINGBACK_TONE);
@@ -147,7 +147,7 @@ static void on_noti_call_sound_ringback_tone(TapiHandle *handle, const char *not
 
 static void on_noti_call_sound_wbamr(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       gboolean *noti_data = (gboolean*)data;
+       gboolean *noti_data = (gboolean *)data;
 
        msg("");
        msgb("event(%s) receive !!", TAPI_NOTI_CALL_SOUND_WBAMR);
@@ -186,7 +186,7 @@ static void on_noti_call_sound_path(TapiHandle *handle, const char *noti_id, voi
 
 static void on_noti_call_on_hold(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       unsigned int *noti_data = (unsigned int*)data;
+       unsigned int *noti_data = (unsigned int *)data;
 
        msg("");
        msgb("event(%s) receive !!", TAPI_NOTI_CALL_INFO_HELD);
@@ -199,7 +199,7 @@ static void on_noti_call_on_hold(TapiHandle *handle, const char *noti_id, void *
 
 static void on_noti_call_active(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       unsigned int *noti_data = (unsigned int*)data;
+       unsigned int *noti_data = (unsigned int *)data;
 
        msg("");
        msgb("event(%s) receive !!", TAPI_NOTI_CALL_INFO_ACTIVE);
@@ -212,7 +212,7 @@ static void on_noti_call_active(TapiHandle *handle, const char *noti_id, void *d
 
 static void on_noti_call_joined(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       unsigned int *noti_data = (unsigned int*)data;
+       unsigned int *noti_data = (unsigned int *)data;
 
        msg("");
        msgb("event(%s) receive !!", TAPI_NOTI_CALL_INFO_JOINED);
@@ -225,7 +225,7 @@ static void on_noti_call_joined(TapiHandle *handle, const char *noti_id, void *d
 
 static void on_noti_call_privacy_mode(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       TelCallVoicePrivacyNoti_t *noti_data = (TelCallVoicePrivacyNoti_t*)data;
+       TelCallVoicePrivacyNoti_t *noti_data = (TelCallVoicePrivacyNoti_t *)data;
 
        msg("");
        msgb("event(%s) receive !!", TAPI_NOTI_CALL_PRIVACY_MODE);
@@ -238,7 +238,7 @@ static void on_noti_call_privacy_mode(TapiHandle *handle, const char *noti_id, v
 
 static void on_noti_call_otasp_status(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       TelCallOtaspStatusNoti_t *noti_data = (TelCallOtaspStatusNoti_t*)data;
+       TelCallOtaspStatusNoti_t *noti_data = (TelCallOtaspStatusNoti_t *)data;
 
        msg("");
        msgb("event(%s) receive !!", TAPI_NOTI_CALL_OTASP_STATUS);
@@ -251,25 +251,24 @@ static void on_noti_call_otasp_status(TapiHandle *handle, const char *noti_id, v
 
 static void on_noti_call_signal_info(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       TelCallSignalInfoNoti_t *noti_data = (TelCallSignalInfoNoti_t*)data;
+       TelCallSignalInfoNoti_t *noti_data = (TelCallSignalInfoNoti_t *)data;
 
        msg("");
        msgb("event(%s) receive !!", TAPI_NOTI_CALL_SIGNAL_INFO);
 
        if (!noti_data)
                return;
-       if (noti_data->signal_type == TAPI_CALL_SIGNAL_TYPE_TONE) {
+       if (noti_data->signal_type == TAPI_CALL_SIGNAL_TYPE_TONE)
                msg(" Signal type = 0x%x, Pitch Type =0x%x, Signal = %d", noti_data->signal_type, noti_data->pitch_type, noti_data->signal.sig_tone_type);
-       } else if (noti_data->signal_type == TAPI_CALL_SIGNAL_TYPE_ISDN_ALERTING) {
+       else if (noti_data->signal_type == TAPI_CALL_SIGNAL_TYPE_ISDN_ALERTING)
                msg(" Signal type = 0x%x, Pitch Type =0x%x, Signal = %d", noti_data->signal_type, noti_data->pitch_type, noti_data->signal.sig_isdn_alert_type);
-       } else if (noti_data->signal_type == TAPI_CALL_SIGNAL_TYPE_IS54B_ALERTING) {
+       else if (noti_data->signal_type == TAPI_CALL_SIGNAL_TYPE_IS54B_ALERTING)
                msg(" Signal type = 0x%x, Pitch Type =0x%x, Signal = %d", noti_data->signal_type, noti_data->pitch_type, noti_data->signal.sig_is54b_alert_type);
-       }
 }
 
 static void on_noti_call_otapa_status(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       TelCallOtapaStatusNoti_t *noti_data = (TelCallOtapaStatusNoti_t*)data;
+       TelCallOtapaStatusNoti_t *noti_data = (TelCallOtapaStatusNoti_t *)data;
 
        msg("");
        msgb("event(%s) receive !!", TAPI_NOTI_CALL_OTAPA_STATUS);
@@ -287,56 +286,56 @@ static void on_dial_call(TapiHandle *handle, int result, void *data, void *user_
 
 static void on_answer_call(TapiHandle *handle, int result, void *data, void *user_data)
 {
-       TelCallAnswerCnf_t *cnf_data = (TelCallAnswerCnf_t*)data;
+       TelCallAnswerCnf_t *cnf_data = (TelCallAnswerCnf_t *)data;
 
        msg("on_answer_call() - cnf_data->id : %d", cnf_data->id);
 }
 
 static void on_end_call(TapiHandle *handle, int result, void *data, void *user_data)
 {
-       TelCallEndCnf_t *cnf_data = (TelCallEndCnf_t*)data;
+       TelCallEndCnf_t *cnf_data = (TelCallEndCnf_t *)data;
 
        msg("on_end_call() - cnf_data->id : %d result : 0x%x", cnf_data->id, result);
 }
 
 static void on_hold_call(TapiHandle *handle, int result, void *data, void *user_data)
 {
-       TelCallHoldCnf_t *cnf_data = (TelCallHoldCnf_t*)data;
+       TelCallHoldCnf_t *cnf_data = (TelCallHoldCnf_t *)data;
 
        msg("on_hold_call() - cnf_data->id : %d result : 0x%x", cnf_data->id, result);
 }
 
 static void on_active_call(TapiHandle *handle, int result, void *data, void *user_data)
 {
-       TelCallActiveCnf_t *cnf_data = (TelCallActiveCnf_t*)data;
+       TelCallActiveCnf_t *cnf_data = (TelCallActiveCnf_t *)data;
 
        msg("on_active_call() - cnf_data->id : %d result : 0x%x", cnf_data->id, result);
 }
 
 static void on_swap_call(TapiHandle *handle, int result, void *data, void *user_data)
 {
-       TelCallSwapCnf_t *cnf_data = (TelCallSwapCnf_t*)data;
+       TelCallSwapCnf_t *cnf_data = (TelCallSwapCnf_t *)data;
 
        msg("on_swap_call() - cnf_data->id : %d result : 0x%x", cnf_data->id, result);
 }
 
 static void on_join_call(TapiHandle *handle, int result, void *data, void *user_data)
 {
-       TelCallJoinCnf_t *cnf_data = (TelCallJoinCnf_t*)data;
+       TelCallJoinCnf_t *cnf_data = (TelCallJoinCnf_t *)data;
 
        msg("on_join_call() - cnf_data->id : %d result : 0x%x", cnf_data->id, result);
 }
 
 static void on_split_call(TapiHandle *handle, int result, void *data, void *user_data)
 {
-       TelCallSplitCnf_t *cnf_data = (TelCallSplitCnf_t*)data;
+       TelCallSplitCnf_t *cnf_data = (TelCallSplitCnf_t *)data;
 
        msg("on_split_call() - cnf_data->id : %d result : 0x%x", cnf_data->id, result);
 }
 
 static void on_transfer_call(TapiHandle *handle, int result, void *data, void *user_data)
 {
-       TelCallTransferCnf_t *cnf_data = (TelCallTransferCnf_t*)data;
+       TelCallTransferCnf_t *cnf_data = (TelCallTransferCnf_t *)data;
 
        msg("on_transfer_call() - cnf_data->id : %d result : 0x%x", cnf_data->id, result);
 }
@@ -383,7 +382,7 @@ static void on_call_get_volume_info(TapiHandle *handle, int result, void *data,
        msg("on_call_get_volume_info() - result : 0x%x", result);
        msg("on_call_get_volume_info() - record_num : 0x%x", resp->record_num);
 
-       for ( i=0; i<resp->record_num; i++ ) {
+       for (i = 0; i < resp->record_num; i++) {
                msg("on_call_get_volume_info() - record[%d].device : 0x%x", (i+1), resp->record[i].device);
                msg("on_call_get_volume_info() - record[%d].type : 0x%x", (i+1), resp->record[i].device);
                msg("on_call_get_volume_info() - record[%d].volume : 0x%x", (i+1), resp->record[i].volume);
@@ -433,9 +432,8 @@ static int run_call_dial(MManager *mm, struct menu_data *menu)
        msg("call tel_dail_call()");
 
        result = tel_dial_call(handle, &data, on_dial_call, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return result;
 }
@@ -454,9 +452,8 @@ static int run_call_answer(MManager *mm, struct menu_data *menu)
        answer_type = atoi(data_answer_type);
 
        result = tel_answer_call(handle, call_id, answer_type, on_answer_call, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return result;
 }
@@ -474,29 +471,27 @@ static int run_call_end(MManager *mm, struct menu_data *menu)
        end_type = atoi(data_end_type);
 
        result = tel_end_call(handle, call_id, end_type, on_end_call, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return result;
 }
 
 static int run_call_hold(MManager *mm, struct menu_data *menu)
 {
-        TapiHandle *handle = menu_manager_ref_user_data(mm);
-        int result;
-        unsigned int call_id;
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
+       int result;
+       unsigned int call_id;
 
-        msg("call tel_hold_call()");
+       msg("call tel_hold_call()");
 
-        call_id = atoi(data_call_id);
-        result = tel_hold_call(handle, call_id, on_hold_call, NULL);
+       call_id = atoi(data_call_id);
+       result = tel_hold_call(handle, call_id, on_hold_call, NULL);
 
-        if (result != TAPI_API_SUCCESS) {
-                msg("failed. (result = %d)", result);
-        }
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
-        return result;
+       return result;
 }
 
 static int run_call_join(MManager *mm, struct menu_data *menu)
@@ -510,28 +505,26 @@ static int run_call_join(MManager *mm, struct menu_data *menu)
        call_id = atoi(data_call_id);
 
        result = tel_join_call(handle, call_id, 0, on_join_call, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return result;
 }
 
 static int run_call_active(MManager *mm, struct menu_data *menu)
 {
-        TapiHandle *handle = menu_manager_ref_user_data(mm);
-        int result;
-        unsigned int call_id;
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
+       int result;
+       unsigned int call_id;
 
-        msg("call tel_active_call()");
+       msg("call tel_active_call()");
 
-        call_id = atoi(data_call_id);
-        result = tel_active_call(handle, call_id, on_active_call, NULL);
-        if (result != TAPI_API_SUCCESS) {
-                msg("failed. (result = %d)", result);
-        }
+       call_id = atoi(data_call_id);
+       result = tel_active_call(handle, call_id, on_active_call, NULL);
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
-        return result;
+       return result;
 }
 
 
@@ -546,31 +539,29 @@ static int run_call_split(MManager *mm, struct menu_data *menu)
        call_id = atoi(data_call_id);
 
        result = tel_split_call(handle, call_id, on_split_call, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return result;
 }
 
 static int run_call_swap(MManager *mm, struct menu_data *menu)
 {
-        TapiHandle *handle = menu_manager_ref_user_data(mm);
-        int result;
-        unsigned int call_id;
-        unsigned int call_id2;
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
+       int result;
+       unsigned int call_id;
+       unsigned int call_id2;
 
-        msg("call tel_swap_call()");
+       msg("call tel_swap_call()");
 
-        call_id = atoi(data_call_id);
-        call_id2 = atoi(data_call_id2);
-        result = tel_swap_call(handle, call_id, call_id2, on_swap_call, NULL);
+       call_id = atoi(data_call_id);
+       call_id2 = atoi(data_call_id2);
+       result = tel_swap_call(handle, call_id, call_id2, on_swap_call, NULL);
 
-        if (result != TAPI_API_SUCCESS) {
-                msg("failed. (result = %d)", result);
-        }
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
-        return result;
+       return result;
 }
 
 
@@ -586,9 +577,8 @@ static int run_call_transfer(MManager *mm, struct menu_data *menu)
        call_id = atoi(data_call_id);
 
        result = tel_transfer_call(handle, call_id, on_transfer_call, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return result;
 }
@@ -601,9 +591,8 @@ static int run_call_start_cont_dtmf(MManager *mm, struct menu_data *menu)
        msg("call tel_start_call_cont_dtmf()");
 
        result = tel_start_call_cont_dtmf(handle, data_dtmf_digit[0], on_start_cont_dtmf_call, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return result;
 }
@@ -616,9 +605,8 @@ static int run_call_stop_cont_dtmf(MManager *mm, struct menu_data *menu)
        msg("call tel_stop_call_cont_dtmf()");
 
        result = tel_stop_call_cont_dtmf(handle, on_stop_cont_dtmf_call, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return result;
 }
@@ -635,16 +623,15 @@ static int run_call_send_burst_dtmf(MManager *mm, struct menu_data *menu)
 
        msg("call tel_send_call_burst_dtmf()");
 
-       result = tel_send_call_burst_dtmf(handle, &info,on_send_burst_dtmf_call, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       result = tel_send_call_burst_dtmf(handle, &info, on_send_burst_dtmf_call, NULL);
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return result;
 }
 
 
-static void call_status_callback( TelCallStatus_t *status, void *user_data )
+static void call_status_callback(TelCallStatus_t *status, void *user_data)
 {
 
        msg(" - id = %d", status->CallHandle);
@@ -691,9 +678,8 @@ static int run_call_get_status_all(MManager *mm, struct menu_data *menu)
        msg("call tel_get_call_status_all()");
 
        result = tel_get_call_status_all(handle, call_status_callback, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return result;
 }
@@ -714,9 +700,8 @@ static int run_call_set_mute_status(MManager *mm, struct menu_data *menu)
        msg("status : (%d)", status);
 
        result = tel_set_call_mute_status(handle, status, path, on_call_set_mute_status, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return result;
 }
@@ -729,9 +714,8 @@ static int run_call_get_mute_status(MManager *mm, struct menu_data *menu)
        msg("call tel_get_call_mute_status()");
 
        result = tel_get_call_mute_status(handle, on_call_get_mute_status, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return result;
 }
@@ -753,9 +737,8 @@ static int run_call_set_volume_info(MManager *mm, struct menu_data *menu)
        msg("volume : (%d)", data.volume);
 
        result = tel_set_call_volume_info(handle, &data, on_call_set_volume_info, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return result;
 }
@@ -776,9 +759,8 @@ static int run_call_get_volume_info(MManager *mm, struct menu_data *menu)
        msg("type : (%d)", type);
 
        result = tel_get_call_volume_info(handle, device, type, on_call_get_volume_info, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return result;
 }
@@ -798,9 +780,8 @@ static int run_call_set_sound_path(MManager *mm, struct menu_data *menu)
        msg("sound_path.ex_volume : (0x%x)", sound_path.ex_volume);
 
        result = tel_set_call_sound_path(handle, &sound_path, on_call_set_sound_path, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return result;
 }
@@ -818,9 +799,8 @@ static int run_call_set_preferred_voice_subscription(MManager *mm, struct menu_d
        msg("preferred_subscription : (%d)", preferred_subscription);
 
        result = tel_set_call_preferred_voice_subscription(handle, preferred_subscription, on_call_set_preferred_voice_subscription, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return result;
 }
@@ -834,12 +814,10 @@ static int run_call_get_preferred_voice_subscription(MManager *mm, struct menu_d
        msg("call tel_get_call_preferred_voice_subscription()");
 
        result = tel_get_call_preferred_voice_subscription(handle, &preferred_subscription);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
-       else {
+       else
                msg("'preferred' Voice call subscription = (%d)", preferred_subscription);
-       }
 
        return result;
 }
@@ -1012,7 +990,7 @@ static struct menu_data menu_call_get_volume_info[] = {
 
 static struct menu_data menu_call_set_sound_path[] = {
        { "1", "Sound path(1= HANDSET, 2= HEADSET, 3= HANDSFREE, 4=BUETOOTH, 5=STEREO_BLUETOOTH, 6=SPK_PHONE, 7=HEADSET_5_PI, 8=BT_NSCE_OFF, 9=MIC1, 10=MIC2, 11=HEADSET_HAC)", NULL, NULL, data_sound_path},
-       { "2", "Extra Volume Status( 0=OFF, 1=ON)", NULL, NULL, data_extra_volume_status},
+       { "2", "Extra Volume Status(0=OFF, 1=ON)", NULL, NULL, data_extra_volume_status},
        { "3", "run", NULL, run_call_set_sound_path, NULL},
        { NULL, NULL, },
 };
@@ -1059,8 +1037,8 @@ struct menu_data menu_call_3gpp[] = {
        { "17", "tel_set_call_volume_info", menu_call_set_volume_info, NULL, NULL},
        { "18", "tel_get_call_volume_info", menu_call_get_volume_info, NULL, NULL},
        { "19", "tel_set_call_sound_path", menu_call_set_sound_path, NULL, NULL},
-       { "20", "tel_set_call_preferred_voice_subscription", menu_call_set_preferred_voice_subscription, 0, 0},
-       { "21", "tel_get_call_preferred_voice_subscription", menu_call_get_preferred_voice_subscription, 0, 0},
+       { "20", "tel_set_call_preferred_voice_subscription", menu_call_set_preferred_voice_subscription, 0, 0},
+       { "21", "tel_get_call_preferred_voice_subscription", menu_call_get_preferred_voice_subscription, 0, 0},
        { NULL, NULL, },
 };
 
@@ -1096,88 +1074,71 @@ void register_call_event(TapiHandle *handle)
        int ret;
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_VOICE_CALL_STATUS_IDLE, on_noti_call_status_idle, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_VOICE_CALL_STATUS_ACTIVE, on_noti_call_status_active, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_VOICE_CALL_STATUS_HELD, on_noti_call_status_held, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_VOICE_CALL_STATUS_DIALING, on_noti_call_status_dialing, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_VOICE_CALL_STATUS_ALERT, on_noti_call_status_alert, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_VOICE_CALL_STATUS_INCOMING, on_noti_call_status_incoming, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_CALL_INFO_HELD, on_noti_call_on_hold, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_CALL_INFO_ACTIVE, on_noti_call_active, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_CALL_INFO_JOINED, on_noti_call_joined, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_CALL_PRIVACY_MODE, on_noti_call_privacy_mode, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_CALL_OTASP_STATUS, on_noti_call_otasp_status, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_CALL_OTAPA_STATUS, on_noti_call_otapa_status, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_CALL_SIGNAL_INFO, on_noti_call_signal_info, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_CALL_SOUND_RINGBACK_TONE, on_noti_call_sound_ringback_tone, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_CALL_SOUND_WBAMR, on_noti_call_sound_wbamr, 0);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_CALL_SOUND_PATH, on_noti_call_sound_path, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_CALL_PREFERRED_VOICE_SUBSCRIPTION, on_noti_call_preferred_voice_subscription, 0);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 }
 
index eb129fee11eede3bf1646ca840aec9616658dd99..4139463adcdabd5cd44b239a9498be18bae41e0a 100644 (file)
@@ -65,7 +65,7 @@ static int get_modem_info(MManager *mm, struct menu_data *menu)
        int i = 0;
 
        while (cp_list[i]) {
-               msg("[%02d] strlen(%d), '%s'", i, (unsigned int)strlen(cp_list[i]), cp_list[i]);
+               msg("[%02d] strlen(%d), '%s'", i, strlen(cp_list[i]), cp_list[i]);
                i++;
        }
 
@@ -117,9 +117,8 @@ static int get_property_int(MManager *mm, struct menu_data *menu)
        msg("call tel_get_property_int()");
 
        ret = tel_get_property_int(local_handle, data_property_int, &result_int);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("failed. (return = %d)", ret);
-       }
 
        msg(" - result = %d", result_int);
 
@@ -134,15 +133,14 @@ static int get_property_string(MManager *mm, struct menu_data *menu)
 
        msg("call tel_get_property_string()");
 
-       ret = tel_get_property_string (local_handle, data_property_string, &result_str);
-       if (ret != TAPI_API_SUCCESS) {
+       ret = tel_get_property_string(local_handle, data_property_string, &result_str);
+       if (ret != TAPI_API_SUCCESS)
                msg("failed. (return = %d)", ret);
-       }
 
        msg(" - result = %s", result_str);
 
        if (result_str)
-               free (result_str);
+               free(result_str);
 
        return 0;
 }
@@ -155,15 +153,14 @@ static int convert_string(MManager *mm, struct menu_data *menu)
 
        msg("call tel_get_property_string()");
 
-       ret = tel_get_property_string (local_handle, data_property_string, &result_str);
-       if (ret != TAPI_API_SUCCESS) {
+       ret = tel_get_property_string(local_handle, data_property_string, &result_str);
+       if (ret != TAPI_API_SUCCESS)
                msg("failed. (return = %d)", ret);
-       }
 
        msg(" - result = %s", result_str);
 
        if (result_str)
-               free (result_str);
+               free(result_str);
 
        return 0;
 }
@@ -171,7 +168,7 @@ static int convert_string(MManager *mm, struct menu_data *menu)
 static struct menu_data menu_common[] = {
        { "1", "tel_get_modem_info", NULL, get_modem_info, NULL},
        { "2", "tel_init", NULL, init, NULL},
-       { "3", "tel_deinit", NULL,      deinit, NULL},
+       { "3", "tel_deinit", NULL, deinit, NULL},
        { "4", "tel_get_property_int",  NULL, get_property_int, NULL},
        { "4s", " - property", NULL, NULL, data_property_int},
        { "5", "tel_get_property_string", NULL, get_property_string, NULL},
@@ -183,19 +180,19 @@ static struct menu_data menu_common[] = {
 };
 
 static struct menu_data menu_main[] = {
-       { "1", "Common",        menu_common,NULL,               NULL},
-       { "2", "Modem",         menu_modem,     NULL,           NULL},
-       { "3", "Network",       menu_net,       NULL,           NULL},
-       { "4", "SIM",           menu_sim,       NULL,           NULL},
-       { "5", "Phonebook",     menu_phonebook, NULL,   NULL},
-       { "6", "SMS",           menu_sms,       NULL,           NULL},
-       { "7", "SS",            menu_ss,        NULL,           NULL},
-       { "8", "SAT",           menu_sat,       NULL,           NULL},
-       { "9", "Call",          menu_call,      NULL,           NULL},
+       { "1", "Common", menu_common, NULL, NULL},
+       { "2", "Modem", menu_modem, NULL, NULL},
+       { "3", "Network", menu_net, NULL, NULL},
+       { "4", "SIM", menu_sim, NULL, NULL},
+       { "5", "Phonebook", menu_phonebook, NULL,       NULL},
+       { "6", "SMS", menu_sms, NULL, NULL},
+       { "7", "SS", menu_ss, NULL, NULL},
+       { "8", "SAT", menu_sat, NULL, NULL},
+       { "9", "Call", menu_call, NULL, NULL},
        { NULL, NULL, },
 };
 
-static int __select_handle_register_event (MManager *mm, struct menu_data *menu)
+static int __select_handle_register_event(MManager *mm, struct menu_data *menu)
 {
        int subs_type = atoi(data_subscription_type);
 
@@ -268,17 +265,17 @@ static gboolean __create_sim_selection_menu(struct menu_data sim_selection_menu[
         */
        title_len = total_cp_len + (2*cp_count) + (cp_count-1) + 8 + 1;
        sim_selection_menu[0].title = (char *)g_try_malloc0(title_len);
-       index_count += sprintf((char *)&sim_selection_menu[0].title[index_count], "Modems(");
+       index_count += snprintf((char *)&sim_selection_menu[0].title[index_count], title_len, "Modems(");
 
-       i=0;
+       i = 0;
        while (cp_list[i]) {
                if (i != 0)
-//                     sim_selection_menu[0].title[index_count++] = ',';
                        strncat((char *)&sim_selection_menu[0].title[index_count++], ",", sizeof(char));
 
-
-               index_count += sprintf((char *)&sim_selection_menu[0].title[index_count], "%d=", (i+1));
-               index_count += sprintf((char *)&sim_selection_menu[0].title[index_count], "%s", cp_list[i]);
+               index_count += snprintf((char *)&sim_selection_menu[0].title[index_count],
+                       title_len - index_count, "%d=", (i+1));
+               index_count += snprintf((char *)&sim_selection_menu[0].title[index_count],
+                       title_len - index_count, "%s", cp_list[i]);
                i++;
        }
 
@@ -306,12 +303,12 @@ static gboolean __create_sim_selection_menu(struct menu_data sim_selection_menu[
 
 int main(int arg, char **argv)
 {
-       GMainLoop *mainloop;
+       GMainLoop *mainloop = NULL;
        GIOChannel *channel = g_io_channel_unix_new(STDIN_FILENO);
        MManager *manager;
        struct menu_data sim_selection_menu[SIM_SEL_MENU_KEY_COUNT+1] = { {NULL, NULL, }, };
 
-#if !GLIB_CHECK_VERSION(2,35,0)
+#if !GLIB_CHECK_VERSION(2, 35, 0)
        g_type_init();
 #endif
        mainloop = g_main_loop_new(NULL, FALSE);
@@ -324,6 +321,9 @@ int main(int arg, char **argv)
                goto OUT;
 
        manager = menu_manager_new(sim_selection_menu, mainloop);
+       if (!manager)
+               goto OUT;
+
        menu_manager_run(manager);
 
        g_io_add_watch(channel, (G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL),
index aaa33fb99e2fa033efc686977f4962fd1318897b..8f63c1e31325ce18194a86988e8d7b93c200d3f8 100644 (file)
@@ -34,6 +34,7 @@
 #define DEFAULT_MENU_PREV      "p"
 #define DEFAULT_MENU_QUIT      "q"
 #define DEFAULT_MENU_NONE      "-"
+#define TAB_SPACE     "  "
 
 struct menu_manager {
        GQueue *stack;
@@ -52,28 +53,28 @@ char key_buffer[MENU_DATA_SIZE];
 int flag_pid_display = 1;
 
 
-static void _show_prompt (void)
+static void _show_prompt(void)
 {
-       msgn ("(%5d) >> ", get_tid ());
+       msgn("(%5d) >> ", get_tid());
 }
 
-static void _show_reserved_menu (void)
+static void _show_reserved_menu(void)
 {
-       msg (ANSI_COLOR_DARKGRAY HR_SINGLE2 ANSI_COLOR_NORMAL);
-       msg (ANSI_COLOR_DARKGRAY " [ " ANSI_COLOR_NORMAL "%s" ANSI_COLOR_DARKGRAY
+       msg(ANSI_COLOR_DARKGRAY HR_SINGLE2 ANSI_COLOR_NORMAL);
+       msg(ANSI_COLOR_DARKGRAY " [ " ANSI_COLOR_NORMAL "%s" ANSI_COLOR_DARKGRAY
                        " ] " ANSI_COLOR_NORMAL "Previous menu " , DEFAULT_MENU_PREV);
-       msg (ANSI_COLOR_DARKGRAY " [ " ANSI_COLOR_NORMAL "%s" ANSI_COLOR_DARKGRAY
+       msg(ANSI_COLOR_DARKGRAY " [ " ANSI_COLOR_NORMAL "%s" ANSI_COLOR_DARKGRAY
                        " ] " ANSI_COLOR_NORMAL "Show Menu " , DEFAULT_MENU_MENU);
-       msg (ANSI_COLOR_DARKGRAY " [ " ANSI_COLOR_NORMAL "%s" ANSI_COLOR_DARKGRAY
+       msg(ANSI_COLOR_DARKGRAY " [ " ANSI_COLOR_NORMAL "%s" ANSI_COLOR_DARKGRAY
                        " ] " ANSI_COLOR_NORMAL "Quit " , DEFAULT_MENU_QUIT);
 }
 
-static void _show_input_ok (void)
+static void _show_input_ok(void)
 {
-       msg ("OK.");
+       msg("OK.");
 }
 
-static void _show_menu (MManager *m, struct menu_data menu[])
+static void _show_menu(MManager *m, struct menu_data menu[])
 {
        int i = 0;
        int len = 0;
@@ -83,19 +84,19 @@ static void _show_menu (MManager *m, struct menu_data menu[])
        if (!menu)
                return;
 
-       msg ("");
-       msg (HR_DOUBLE);
+       msg("");
+       msg(HR_DOUBLE);
 
-       len = g_queue_get_length (m->title_stack);
-       msgn (ANSI_COLOR_YELLOW " Main");
+       len = g_queue_get_length(m->title_stack);
+       msgn(ANSI_COLOR_YELLOW " Main");
        if (len > 0) {
                for (i = 0; i < len; i++) {
-                       msgn (ANSI_COLOR_NORMAL " >> " ANSI_COLOR_YELLOW "%s",
-                                       (char *) g_queue_peek_nth (m->title_stack, i));
+                       msgn(ANSI_COLOR_NORMAL " >> " ANSI_COLOR_YELLOW "%s",
+                                       (char *)g_queue_peek_nth(m->title_stack, i));
                }
        }
-       msg (ANSI_COLOR_NORMAL);
-       msg (HR_SINGLE);
+       msg(ANSI_COLOR_NORMAL);
+       msg(HR_SINGLE);
 
        hide_pid();
        i = 0;
@@ -105,53 +106,47 @@ static void _show_menu (MManager *m, struct menu_data menu[])
                if (item->key == NULL)
                        break;
 
-               if (!g_strcmp0 (item->key, "-")) {
-                       msgn ("       ");
-               }
-               else if (!g_strcmp0 (item->key, "_")) {
-                       msg (ANSI_COLOR_DARKGRAY HR_SINGLE2 ANSI_COLOR_NORMAL);
+               if (!g_strcmp0(item->key, "-")) {
+                       msgn("       ");
+               } else if (!g_strcmp0(item->key, "_")) {
+                       msg(ANSI_COLOR_DARKGRAY HR_SINGLE2 ANSI_COLOR_NORMAL);
 
                        if (item->callback)
-                               item->callback (m, item);
+                               item->callback(m, item);
 
                        i++;
 
                        continue;
-               }
-               else if (!g_strcmp0 (item->key, "*")) {
-                       msg (" %s", item->title);
+               } else if (!g_strcmp0(item->key, "*")) {
+                       msg(" %s", item->title);
                        if (item->callback)
-                               item->callback (m, item);
-               }
-               else {
-                       msgn (ANSI_COLOR_DARKGRAY " [" ANSI_COLOR_NORMAL "%3s"
+                               item->callback(m, item);
+               } else {
+                       msgn(ANSI_COLOR_DARKGRAY " [" ANSI_COLOR_NORMAL "%3s"
                                        ANSI_COLOR_DARKGRAY "] " ANSI_COLOR_NORMAL,     item->key);
                }
 
-               memset (title_buf, 0, 256);
+               memset(title_buf, 0, 256);
                if (item->title) {
-                       snprintf (title_buf, MAX_TITLE, "%s", item->title);
+                       snprintf(title_buf, MAX_TITLE, "%s", item->title);
 
-                       if (strlen (item->title) >= MAX_TITLE) {
+                       if (strlen(item->title) >= MAX_TITLE) {
                                title_buf[MAX_TITLE - 2] = '.';
                                title_buf[MAX_TITLE - 1] = '.';
                        }
                }
 
                if (item->data) {
-                       msg ("%s " ANSI_COLOR_LIGHTBLUE "(%s)" ANSI_COLOR_NORMAL,
+                       msg("%s " ANSI_COLOR_LIGHTBLUE "(%s)" ANSI_COLOR_NORMAL,
                                        title_buf, item->data);
-               }
-               else if (!g_strcmp0 (item->key, "*")) {
+               } else if (!g_strcmp0(item->key, "*")) {
                        /* none */
-               }
-               else {
-                       msg ("%s", title_buf);
+               } else {
+                       msg("%s", title_buf);
                }
 
-               if (item->sub_menu) {
-                       msg ("\e[1A\e[%dC >", (int)POS_MORE);
-               }
+               if (item->sub_menu)
+                       msg("\e[1A\e[%dC >", POS_MORE);
 
                i++;
        }
@@ -160,22 +155,22 @@ static void _show_menu (MManager *m, struct menu_data menu[])
 
        _show_reserved_menu();
 
-       msg (HR_DOUBLE);
+       msg(HR_DOUBLE);
 
        _show_prompt();
 }
 
-static void _show_item_data_input_msg (struct menu_data *item)
+static void _show_item_data_input_msg(struct menu_data *item)
 {
-       msg ("");
-       msg (HR_DOUBLE);
-       msg (" Input [%s] data ", item->title);
-       msg (HR_SINGLE);
-       msg (" current = [%s]", item->data);
-       msgn (" new >> ");
+       msg("");
+       msg(HR_DOUBLE);
+       msg(" Input [%s] data ", item->title);
+       msg(HR_SINGLE);
+       msg(" current = [%s]", item->data);
+       msgn(" new >> ");
 }
 
-static void _move_menu (MManager *mm, struct menu_data menu[], char *key)
+static void _move_menu(MManager *mm, struct menu_data menu[], char *key)
 {
        struct menu_data *item;
        int i = 0;
@@ -183,26 +178,23 @@ static void _move_menu (MManager *mm, struct menu_data menu[], char *key)
        if (!mm->menu)
                return;
 
-       if (!g_strcmp0 (DEFAULT_MENU_PREV, key)) {
-               if (g_queue_get_length (mm->stack) > 0) {
-                       mm->menu = g_queue_pop_tail (mm->stack);
-                       g_queue_pop_tail (mm->title_stack);
+       if (!g_strcmp0(DEFAULT_MENU_PREV, key)) {
+               if (g_queue_get_length(mm->stack) > 0) {
+                       mm->menu = g_queue_pop_tail(mm->stack);
+                       g_queue_pop_tail(mm->title_stack);
                }
 
-               _show_menu (mm, mm->menu);
+               _show_menu(mm, mm->menu);
                mm->buf = key_buffer;
 
                return;
-       }
-       else if (!g_strcmp0 (DEFAULT_MENU_MENU, key)) {
-               _show_menu (mm, mm->menu);
+       } else if (!g_strcmp0(DEFAULT_MENU_MENU, key)) {
+               _show_menu(mm, mm->menu);
                return;
-       }
-       else if (!g_strcmp0 (DEFAULT_MENU_QUIT, key)) {
-               g_main_loop_quit (mm->mainloop);
+       } else if (!g_strcmp0(DEFAULT_MENU_QUIT, key)) {
+               g_main_loop_quit(mm->mainloop);
                return;
-       }
-       else if (!g_strcmp0 (DEFAULT_MENU_NONE, key)) {
+       } else if (!g_strcmp0(DEFAULT_MENU_NONE, key)) {
                _show_prompt();
                return;
        }
@@ -213,24 +205,24 @@ static void _move_menu (MManager *mm, struct menu_data menu[], char *key)
                if (item->key == NULL)
                        break;
 
-               if (!g_strcmp0 (item->key, key)) {
+               if (!g_strcmp0(item->key, key)) {
                        if (item->callback) {
-                               ret = item->callback (mm, item);
+                               ret = item->callback(mm, item);
                                _show_prompt();
                        }
 
-                       if(RET_SUCCESS == ret) {
+                       if (RET_SUCCESS == ret) {
                                if (item->sub_menu) {
-                                       g_queue_push_tail (mm->stack, mm->menu);
-                                       g_queue_push_tail (mm->title_stack, (gpointer *)item->title);
+                                       g_queue_push_tail(mm->stack, mm->menu);
+                                       g_queue_push_tail(mm->title_stack, (gpointer *)item->title);
 
                                        mm->menu = item->sub_menu;
-                                       _show_menu (mm, mm->menu);
+                                       _show_menu(mm, mm->menu);
                                        mm->buf = key_buffer;
                                }
 
                                if (item->data) {
-                                       _show_item_data_input_msg (item);
+                                       _show_item_data_input_msg(item);
                                        mm->buf = item->data;
                                }
                        }
@@ -244,11 +236,11 @@ static void _move_menu (MManager *mm, struct menu_data menu[], char *key)
        _show_prompt();
 }
 
-MManager *menu_manager_new (struct menu_data items[], GMainLoop *mainloop)
+MManager *menu_manager_new(struct menu_data items[], GMainLoop *mainloop)
 {
        MManager *mm;
 
-       mm = calloc (sizeof (struct menu_manager), 1);
+       mm = calloc(sizeof(struct menu_manager), 1);
        if (!mm)
                return NULL;
 
@@ -260,16 +252,16 @@ MManager *menu_manager_new (struct menu_data items[], GMainLoop *mainloop)
        return mm;
 }
 
-int menu_manager_run (MManager *mm)
+int menu_manager_run(MManager *mm)
 {
-       _show_menu (mm, mm->menu);
+       _show_menu(mm, mm->menu);
 
        mm->buf = key_buffer;
 
        return 0;
 }
 
-int menu_manager_set_user_data (MManager *mm, void *user_data)
+int menu_manager_set_user_data(MManager *mm, void *user_data)
 {
        if (!mm)
                return -1;
@@ -279,7 +271,7 @@ int menu_manager_set_user_data (MManager *mm, void *user_data)
        return 0;
 }
 
-void *menu_manager_ref_user_data (MManager *mm)
+void *menu_manager_ref_user_data(MManager *mm)
 {
        if (!mm)
                return NULL;
@@ -287,57 +279,56 @@ void *menu_manager_ref_user_data (MManager *mm)
        return mm->user_data;
 }
 
-gboolean on_menu_manager_keyboard (GIOChannel *src, GIOCondition con,
+gboolean on_menu_manager_keyboard(GIOChannel *src, GIOCondition con,
                gpointer data)
 {
        MManager *mm = data;
        char local_buf[MENU_DATA_SIZE + 1] = { 0, };
 
-       if (fgets (local_buf, MENU_DATA_SIZE, stdin) == NULL)
+       if (fgets(local_buf, MENU_DATA_SIZE, stdin) == NULL)
                return TRUE;
 
-       if (strlen (local_buf) > 0) {
-               if (local_buf[strlen (local_buf) - 1] == '\n')
-                       local_buf[strlen (local_buf) - 1] = '\0';
+       if (strlen(local_buf) > 0) {
+               if (local_buf[strlen(local_buf) - 1] == '\n')
+                       local_buf[strlen(local_buf) - 1] = '\0';
        }
 
        if (mm->buf == key_buffer) {
-               if (strlen (local_buf) < 1) {
+               if (strlen(local_buf) < 1) {
                        _show_prompt();
                        return TRUE;
                }
 
-               _move_menu (mm, mm->menu, local_buf);
-       }
-       else {
+               _move_menu(mm, mm->menu, local_buf);
+       } else {
                if (mm->buf) {
-                       memset (mm->buf, 0, MENU_DATA_SIZE);
-                       memcpy (mm->buf, local_buf, MENU_DATA_SIZE);
+                       memset(mm->buf, 0, MENU_DATA_SIZE);
+                       memcpy(mm->buf, local_buf, MENU_DATA_SIZE);
                        _show_input_ok();
                }
                mm->buf = key_buffer;
-               _move_menu (mm, mm->menu, (char *)DEFAULT_MENU_MENU);
+               _move_menu(mm, mm->menu, (char *)DEFAULT_MENU_MENU);
        }
 
        return TRUE;
 }
 
-pid_t get_tid ()
+pid_t get_tid()
 {
-       return syscall (__NR_gettid);
+       return syscall(__NR_gettid);
 }
 
-void hide_pid ()
+void hide_pid()
 {
        flag_pid_display = 0;
 }
 
-void show_pid ()
+void show_pid()
 {
        flag_pid_display = 1;
 }
 
-int is_pid_show ()
+int is_pid_show()
 {
        return flag_pid_display;
 }
@@ -356,18 +347,17 @@ static void _hex_dump(const char *pad, int size, const void *data)
        p = (unsigned char *)data;
 
        snprintf(buf, 255, "%s%04X: ", pad, 0);
-       for (i = 0; i<size; i++) {
+       for (i = 0; i < size; i++) {
                snprintf(hex, 4, "%02X ", p[i]);
-               strcat(buf, hex);
+               strncat(buf, hex, strlen(hex));
 
                if ((i + 1) % 8 == 0) {
                        if ((i + 1) % 16 == 0) {
                                msg("%s", buf);
                                memset(buf, 0, 255);
                                snprintf(buf, 255, "%s%04X: ", pad, i + 1);
-                       }
-                       else {
-                               strcat(buf, "  ");
+                       } else {
+                               strncat(buf, TAB_SPACE, strlen(TAB_SPACE));
                        }
                }
        }
@@ -377,7 +367,7 @@ static void _hex_dump(const char *pad, int size, const void *data)
 
 void menu_print_dump(int data_len, void *data)
 {
-       if(!data)
+       if (!data)
                return;
 
        msg("");
index f92d6117b966f0c2ad5434a58ff6e6864621c302..cfb96630b63f398e19e74c35da102f0557f4179d 100644 (file)
@@ -44,36 +44,35 @@ __BEGIN_DECLS
 #define ANSI_COLOR_WHITE               "\e[1;37m"
 
 
-#define msg(fmt,args...)       { fprintf(stdout, fmt "\n", ##args); \
-               fflush(stdout); }
-
-#define msgn(fmt,args...)      { fprintf(stdout, fmt, ##args); \
-               fflush(stdout); }
+#define msg(fmt,args...)       do { fprintf(stdout, fmt "\n", ##args); \
+               fflush(stdout); } while (0)
+#define msgn(fmt,args...)      do { fprintf(stdout, fmt, ##args); \
+               fflush(stdout); } while (0)
 
 /* Bold (green) */
-#define msgb(fmt,args...)  { fprintf(stdout, ANSI_COLOR_LIGHTGREEN fmt \
-               ANSI_COLOR_NORMAL "\n", ##args); fflush(stdout); }
+#define msgb(fmt,args...)  do { fprintf(stdout, ANSI_COLOR_LIGHTGREEN fmt \
+               ANSI_COLOR_NORMAL "\n", ##args); fflush(stdout); } while (0)
 
 /* Property message */
-#define msgp(fmt,args...)  { fprintf(stdout, ANSI_COLOR_LIGHTMAGENTA fmt \
-               ANSI_COLOR_NORMAL "\n", ##args); fflush(stdout); }
+#define msgp(fmt,args...) do { fprintf(stdout, ANSI_COLOR_LIGHTMAGENTA fmt \
+               ANSI_COLOR_NORMAL "\n", ##args); fflush(stdout); } while (0)
 
-#define msgt(n,fmt,args...)    { fprintf(stdout, "\e[%dC" fmt "\n", \
-               3 + ((n) * 2), ##args); fflush(stdout); }
+#define msgt(n,fmt,args...) do { fprintf(stdout, "\e[%dC" fmt "\n", \
+               3 + ((n) * 2), ##args); fflush(stdout); } while (0)
 
-#define pmsg(fmt,args...)      { \
+#define pmsg(fmt,args...) do { \
        if (is_pid_show()) { fprintf(stdout, "(%5d) ", get_tid()); } \
-       fprintf(stdout, fmt "\n", ##args); fflush(stdout); }
+       fprintf(stdout, fmt "\n", ##args); fflush(stdout); } while (0)
 
-#define pmsgb(fmt,args...)     { \
+#define pmsgb(fmt,args...) do { \
        if (is_pid_show()) { fprintf(stdout, "(%5d) ", get_tid()); } \
        fprintf(stdout, ANSI_COLOR_LIGHTGREEN fmt \
-                       ANSI_COLOR_NORMAL "\n", ##args); fflush(stdout); }
+                       ANSI_COLOR_NORMAL "\n", ##args); fflush(stdout); } while (0)
 
-#define pmsgt(n,fmt,args...) { \
+#define pmsgt(n,fmt,args...) do { \
        if (is_pid_show()) { fprintf(stdout, "(%5d) ", get_tid()); } \
        fprintf(stdout, "\e[%dC" fmt "\n", \
-                       3 + ((n) * 2), ##args); fflush(stdout); }
+                       3 + ((n) * 2), ##args); fflush(stdout); } while (0)
 
 #define MENU_DATA_SIZE 255
 
index 4effd3c554094183999d6abe6001afcb441c8f28..fd4ba653b91f6b1cc0c718c2be60db89cd584a0e 100644 (file)
@@ -48,6 +48,30 @@ static void on_noti_modem_power(TapiHandle *handle, const char *noti_id, void *d
        msg(" - status = 0x%x", *status);
 }
 
+static void on_prop_dongle_status(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+{
+       int *status = data;
+
+       msg("");
+       msg("property(%s) receive !!", TAPI_PROP_MODEM_DONGLE_STATUS);
+
+       if (!status)
+               return;
+       msg("status = 0x%x", *status);
+}
+
+static void on_prop_dongle_login(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+{
+       int *status = data;
+
+       msg("");
+       msg("property(%s) receive !!", TAPI_PROP_MODEM_DONGLE_LOGIN);
+
+       if (!status)
+               return;
+       msg("status = 0x%x", *status);
+}
+
 static void on_modem_get_version(TapiHandle *handle, int result, void *data, void *user_data)
 {
        TelMiscVersionInformation *info = data;
@@ -126,6 +150,33 @@ static void on_modem_set_power(TapiHandle *handle, int result, void *data, void
        msg(" - result = 0x%x", result);
 }
 
+static void on_modem_get_device_info(TapiHandle *handle, int result, void *data, void *user_data)
+{
+       TelMiscDeviceInfo_t *device_info = data;
+
+       msg("");
+       msgb("tel_get_device_info() response receive");
+       msg(" - result = 0x%x", result);
+       if (result == TAPI_API_SUCCESS) {
+               msg("Vendor: [%s] / Device: [%s]",
+                       device_info->vendor_name, device_info->device_name);
+       }
+}
+
+static int run_modem_get_device_info(MManager *mm, struct menu_data *menu)
+{
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
+       int result;
+
+       msg("call tel_get_device_info()");
+
+       result = tel_get_device_info(handle, on_modem_get_device_info, NULL);
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
+
+       return 0;
+}
+
 static int run_modem_get_version(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
@@ -134,9 +185,8 @@ static int run_modem_get_version(MManager *mm, struct menu_data *menu)
        msg("call tel_get_misc_me_version()");
 
        result = tel_get_misc_me_version(handle, on_modem_get_version, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return 0;
 }
@@ -175,9 +225,8 @@ static int run_modem_get_serial_number(MManager *mm, struct menu_data *menu)
        msg("call tel_get_misc_me_sn()");
 
        result = tel_get_misc_me_sn(handle, on_modem_get_serial_number, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return 0;
 }
@@ -213,9 +262,8 @@ static int run_modem_get_imei(MManager *mm, struct menu_data *menu)
        msg("call tel_get_misc_me_imei()");
 
        result = tel_get_misc_me_imei(handle, on_modem_get_imei, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return 0;
 }
@@ -251,9 +299,8 @@ static int run_modem_set_power(MManager *mm, struct menu_data *menu)
        mode = atoi(data_modem_set_power_mode);
 
        result = tel_process_power_command(handle, mode, on_modem_set_power, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return 0;
 }
@@ -269,9 +316,8 @@ static int run_modem_set_flight_mode(MManager *mm, struct menu_data *menu)
        mode = atoi(data_modem_set_flight_mode_mode);
 
        result = tel_set_flight_mode(handle, mode, on_modem_set_flight_mode, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return 0;
 }
@@ -284,9 +330,8 @@ static int run_modem_get_flight_mode(MManager *mm, struct menu_data *menu)
        msg("call tel_get_flight_mode()");
 
        result = tel_get_flight_mode(handle, on_modem_get_flight_mode, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return 0;
 }
@@ -363,6 +408,12 @@ static struct menu_data menu_modem_check_power[] = {
        { NULL, NULL, },
 };
 
+static struct menu_data menu_modem_get_device_info[] = {
+       { "1", "run", NULL, run_modem_get_device_info, NULL},
+       { NULL, NULL, },
+};
+
+
 struct menu_data menu_modem[] = {
        { "1", "tel_get_misc_me_version", menu_modem_get_version, NULL, NULL},
        { "1s", "tel_get_misc_me_version_sync", menu_modem_get_version_sync, NULL, NULL},
@@ -374,6 +425,7 @@ struct menu_data menu_modem[] = {
        { "4s", "tel_set_flight_mode", menu_modem_set_flight_mode, NULL, NULL},
        { "5", "tel_process_power_command", menu_modem_set_power, NULL, NULL},
        { "6", "tel_check_modem_power_status", menu_modem_check_power, NULL, NULL},
+       { "7", "tel_get_device_info", menu_modem_get_device_info, NULL, NULL},
        { NULL, NULL, },
 };
 
@@ -382,7 +434,14 @@ void register_modem_event(TapiHandle *handle)
        int ret;
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_MODEM_POWER, on_noti_modem_power, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
+               msg("event register failed(%d)", ret);
+
+       ret = tel_register_noti_event(handle, TAPI_PROP_MODEM_DONGLE_STATUS, on_prop_dongle_status, NULL);
+       if (ret != TAPI_API_SUCCESS)
+               msg("event register failed(%d)", ret);
+
+       ret = tel_register_noti_event(handle, TAPI_PROP_MODEM_DONGLE_LOGIN, on_prop_dongle_login, NULL);
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 }
index 7ea2c7abe5c537002880042af1cdd2f6443d7003..12d06afe175ec198bb5ca548434b3af3d4d19c92 100644 (file)
@@ -43,237 +43,237 @@ static char data_net_set_mode_mode[MENU_DATA_SIZE + 1] = "8";
 static char data_net_set_emergency_callback_mode_mode[MENU_DATA_SIZE + 1] = "1";
 static char data_net_set_roaming_preference_roam_pref[MENU_DATA_SIZE + 1] = "1";
 
-static void on_prop_signal_dbm (TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+static void on_prop_signal_dbm(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        int *sig_dbm = data;
 
-       msg ("");
-       msgp ("property(%s) receive !!", TAPI_PROP_NETWORK_SIGNALSTRENGTH_DBM);
+       msg("");
+       msgp("property(%s) receive !!", TAPI_PROP_NETWORK_SIGNALSTRENGTH_DBM);
 
-       msg (" - sig_dbm = %d", *sig_dbm);
+       msg(" - sig_dbm = %d", *sig_dbm);
 }
 
-static void on_prop_signal_level (TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+static void on_prop_signal_level(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        int *sig_level = data;
 
-       msg ("");
-       msgp ("property(%s) receive !!", TAPI_PROP_NETWORK_SIGNALSTRENGTH_LEVEL);
+       msg("");
+       msgp("property(%s) receive !!", TAPI_PROP_NETWORK_SIGNALSTRENGTH_LEVEL);
 
-       msg (" - sig_level = %d", *sig_level);
+       msg(" - sig_level = %d", *sig_level);
 }
 
-static void on_prop_lac (TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+static void on_prop_lac(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        int *lac = data;
 
-       msg ("");
-       msgp ("property(%s) receive !!", TAPI_PROP_NETWORK_LAC);
+       msg("");
+       msgp("property(%s) receive !!", TAPI_PROP_NETWORK_LAC);
 
-       msg (" - lac = %d", *lac);
+       msg(" - lac = %d", *lac);
 }
 
-static void on_prop_plmn (TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+static void on_prop_plmn(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       msg ("");
-       msgp ("property(%s) receive !!", TAPI_PROP_NETWORK_PLMN);
+       msg("");
+       msgp("property(%s) receive !!", TAPI_PROP_NETWORK_PLMN);
 
-       msg (" - plmn = %s", (char *)data);
+       msg(" - plmn = %s", (char *)data);
 }
 
-static void on_prop_cellid (TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+static void on_prop_cellid(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        int *cell_id = data;
 
-       msg ("");
-       msgp ("property(%s) receive !!", TAPI_PROP_NETWORK_CELLID);
+       msg("");
+       msgp("property(%s) receive !!", TAPI_PROP_NETWORK_CELLID);
 
-       msg (" - cell_id = %d", *cell_id);
+       msg(" - cell_id = %d", *cell_id);
 }
 
-static void on_prop_service_type (TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+static void on_prop_service_type(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        int *service_type = data;
 
-       msg ("");
-       msgp ("property(%s) receive !!", TAPI_PROP_NETWORK_SERVICE_TYPE);
+       msg("");
+       msgp("property(%s) receive !!", TAPI_PROP_NETWORK_SERVICE_TYPE);
 
-       msg (" - service_type = %d", *service_type);
+       msg(" - service_type = %d", *service_type);
 }
 
-static void on_prop_act (TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+static void on_prop_act(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        int *act = data;
 
-       msg ("");
-       msgp ("property(%s) receive !!", TAPI_PROP_NETWORK_ACT);
+       msg("");
+       msgp("property(%s) receive !!", TAPI_PROP_NETWORK_ACT);
 
-       msg (" - access technology = %d", *act);
+       msg(" - access technology = %d", *act);
 }
 
-static void on_prop_ps_type (TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+static void on_prop_ps_type(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        int *ps_type = data;
 
-       msg ("");
-       msgp ("property(%s) receive !!", TAPI_PROP_NETWORK_PS_TYPE);
+       msg("");
+       msgp("property(%s) receive !!", TAPI_PROP_NETWORK_PS_TYPE);
 
-       msg (" - ps_type = %d", *ps_type);
+       msg(" - ps_type = %d", *ps_type);
 }
 
-static void on_prop_circuit_status (TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+static void on_prop_circuit_status(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        int *circuit_status = data;
 
-       msg ("");
-       msgp ("property(%s) receive !!", TAPI_PROP_NETWORK_CIRCUIT_STATUS);
+       msg("");
+       msgp("property(%s) receive !!", TAPI_PROP_NETWORK_CIRCUIT_STATUS);
 
-       msg (" - circuit_status = %d", *circuit_status);
+       msg(" - circuit_status = %d", *circuit_status);
 }
 
-static void on_prop_packet_status (TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+static void on_prop_packet_status(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        int *packet_status = data;
 
-       msg ("");
-       msgp ("property(%s) receive !!", TAPI_PROP_NETWORK_PACKET_STATUS);
+       msg("");
+       msgp("property(%s) receive !!", TAPI_PROP_NETWORK_PACKET_STATUS);
 
-       msg (" - packet_status = %d", *packet_status);
+       msg(" - packet_status = %d", *packet_status);
 }
 
-static void on_prop_roaming_status (TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+static void on_prop_roaming_status(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        guchar *roaming_status = data;
 
-       msg ("");
-       msgp ("property(%s) receive !!", TAPI_PROP_NETWORK_ROAMING_STATUS);
+       msg("");
+       msgp("property(%s) receive !!", TAPI_PROP_NETWORK_ROAMING_STATUS);
 
-       msg (" - roaming_status = %d", *roaming_status);
+       msg(" - roaming_status = %d", *roaming_status);
 }
 
-static void on_prop_name_option (TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+static void on_prop_name_option(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        int *option = data;
 
-       msg ("");
-       msgp ("property(%s) receive !!", TAPI_PROP_NETWORK_NAME_OPTION);
+       msg("");
+       msgp("property(%s) receive !!", TAPI_PROP_NETWORK_NAME_OPTION);
 
-       msg (" - name_option = %d", *option);
+       msg(" - name_option = %d", *option);
 }
 
-static void on_prop_network_name (TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+static void on_prop_network_name(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       msg ("");
-       msgp ("property(%s) receive !!", TAPI_PROP_NETWORK_NETWORK_NAME);
+       msg("");
+       msgp("property(%s) receive !!", TAPI_PROP_NETWORK_NETWORK_NAME);
 
-       msg (" - network_name = %s", (char *)data);
+       msg(" - network_name = %s", (char *)data);
 }
 
-static void on_prop_spn_name (TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+static void on_prop_spn_name(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
-       msg ("");
-       msgp ("property(%s) receive !!", TAPI_PROP_NETWORK_SPN_NAME);
+       msg("");
+       msgp("property(%s) receive !!", TAPI_PROP_NETWORK_SPN_NAME);
 
-       msg (" - spn_name = %s", (char *)data);
+       msg(" - spn_name = %s", (char *)data);
 }
 
-static void on_prop_ims_voice_status (TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+static void on_prop_ims_voice_status(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        int *status = data;
 
-       msg ("");
-       msgp ("property(%s) receive !!", TAPI_PROP_NETWORK_IMS_VOICE_SUPPORT_STATUS);
+       msg("");
+       msgp("property(%s) receive !!", TAPI_PROP_NETWORK_IMS_VOICE_SUPPORT_STATUS);
 
        if (status != NULL)
-               msg (" - ims_voice_support_status = %d", *status);
+               msg(" - ims_voice_support_status = %d", *status);
 }
 
 static void on_noti_registration_status(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        TelNetworkRegistrationStatus_t *noti = data;
 
-       msg ("");
-       msgb ("event(%s) receive !!", TAPI_NOTI_NETWORK_REGISTRATION_STATUS);
+       msg("");
+       msgb("event(%s) receive !!", TAPI_NOTI_NETWORK_REGISTRATION_STATUS);
 
-       msg (" - circuit status = %d", noti->cs);
-       msg (" - packet status = %d", noti->ps);
-       msg (" - service type = %d", noti->type);
-       msg (" - is roaming = %d", noti->is_roaming);
+       msg(" - circuit status = %d", noti->cs);
+       msg(" - packet status = %d", noti->ps);
+       msg(" - service type = %d", noti->type);
+       msg(" - is roaming = %d", noti->is_roaming);
 }
 
 static void on_noti_cell_info(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        struct tel_noti_network_cell_info *noti = data;
 
-       msg ("");
-       msgb ("event(%s) receive !!", TAPI_NOTI_NETWORK_CELLINFO);
+       msg("");
+       msgb("event(%s) receive !!", TAPI_NOTI_NETWORK_CELLINFO);
 
-       msg (" - lac = %d", noti->lac);
-       msg (" - cell_id = %d", noti->cell_id);
+       msg(" - lac = %d", noti->lac);
+       msg(" - cell_id = %d", noti->cell_id);
 }
 
 static void on_noti_change(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        struct tel_noti_network_change *noti = data;
 
-       msg ("");
-       msgb ("event(%s) receive !!", TAPI_NOTI_NETWORK_CHANGE);
+       msg("");
+       msgb("event(%s) receive !!", TAPI_NOTI_NETWORK_CHANGE);
 
-       msg (" - plmn = %s", noti->plmn);
-       msg (" - act = %d", noti->act);
+       msg(" - plmn = %s", noti->plmn);
+       msg(" - act = %d", noti->act);
 }
 
 static void on_noti_time_info(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        struct tel_noti_network_time_info *noti = data;
 
-       msg ("");
-       msgb ("event(%s) receive !!", TAPI_NOTI_NETWORK_TIMEINFO);
-
-       msg (" - plmn = %s", noti->plmn);
-       msg (" - year = %d", noti->year);
-       msg (" - month = %d", noti->month);
-       msg (" - day = %d", noti->day);
-       msg (" - hour = %d", noti->hour);
-       msg (" - minute = %d", noti->minute);
-       msg (" - second = %d", noti->second);
-       msg (" - wday = %d", noti->wday);
-       msg (" - gmtoff = %d", noti->gmtoff);
-       msg (" - dstoff = %d", noti->dstoff);
-       msg (" - isdst = %d", noti->isdst);
+       msg("");
+       msgb("event(%s) receive !!", TAPI_NOTI_NETWORK_TIMEINFO);
+
+       msg(" - plmn = %s", noti->plmn);
+       msg(" - year = %d", noti->year);
+       msg(" - month = %d", noti->month);
+       msg(" - day = %d", noti->day);
+       msg(" - hour = %d", noti->hour);
+       msg(" - minute = %d", noti->minute);
+       msg(" - second = %d", noti->second);
+       msg(" - wday = %d", noti->wday);
+       msg(" - gmtoff = %d", noti->gmtoff);
+       msg(" - dstoff = %d", noti->dstoff);
+       msg(" - isdst = %d", noti->isdst);
 }
 
 static void on_noti_identity(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        struct tel_noti_network_identity *noti = data;
 
-       msg ("");
-       msgb ("event(%s) receive !!", TAPI_NOTI_NETWORK_IDENTITY);
+       msg("");
+       msgb("event(%s) receive !!", TAPI_NOTI_NETWORK_IDENTITY);
 
-       msg (" - plmn = %s", noti->plmn);
-       msg (" - short_name = %s", noti->short_name);
-       msg (" - full_name = %s", noti->full_name);
+       msg(" - plmn = %s", noti->plmn);
+       msg(" - short_name = %s", noti->short_name);
+       msg(" - full_name = %s", noti->full_name);
 }
 
 static void on_noti_signal_strength(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        struct tel_noti_network_signal_strength *noti = data;
 
-       msg ("");
-       msgb ("event(%s) receive !!", TAPI_NOTI_NETWORK_SIGNALSTRENGTH);
+       msg("");
+       msgb("event(%s) receive !!", TAPI_NOTI_NETWORK_SIGNALSTRENGTH);
 
-       msg (" - dbm = %d", noti->dbm);
+       msg(" - dbm = %d", noti->dbm);
 }
 
 static void on_noti_default_data_subs(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        struct tel_noti_network_default_data_subs *noti = data;
 
-       msg ("");
-       msgb ("event(%s) receive !!", TAPI_NOTI_NETWORK_DEFAULT_DATA_SUBSCRIPTION);
+       msg("");
+       msgb("event(%s) receive !!", TAPI_NOTI_NETWORK_DEFAULT_DATA_SUBSCRIPTION);
 
        if (noti)
-               msg (" - 'default' Data Subscription = %s",
+               msg(" - 'default' Data Subscription = %s",
                        ((noti->default_subs == TAPI_NETWORK_DEFAULT_DATA_SUBS_SIM1) ? "SIM 1"
                        : ((noti->default_subs == TAPI_NETWORK_DEFAULT_DATA_SUBS_SIM2) ? "SIM 2"
                        : "Unknown")));
@@ -283,11 +283,11 @@ static void on_noti_default_subs(TapiHandle *handle, const char *noti_id, void *
 {
        struct tel_noti_network_default_subs *noti = data;
 
-       msg ("");
-       msgb ("event(%s) receive !!", TAPI_NOTI_NETWORK_DEFAULT_SUBSCRIPTION);
+       msg("");
+       msgb("event(%s) receive !!", TAPI_NOTI_NETWORK_DEFAULT_SUBSCRIPTION);
 
        if (noti)
-               msg (" - 'default' Subscription = %s",
+               msg(" - 'default' Subscription = %s",
                        ((noti->default_subs == TAPI_NETWORK_DEFAULT_SUBS_SIM1) ? "SIM 1"
                        : ((noti->default_subs == TAPI_NETWORK_DEFAULT_SUBS_SIM2) ? "SIM 2"
                        : "Unknown")));
@@ -297,30 +297,30 @@ static void on_noti_emergency_callback_mode(TapiHandle *handle, const char *noti
 {
        struct tel_noti_network_emergency_callback_mode *noti = data;
 
-       msg ("");
-       msgb ("event(%s) receive !!", TAPI_NOTI_NETWORK_EMERGENCY_CALLBACK_MODE);
+       msg("");
+       msgb("event(%s) receive !!", TAPI_NOTI_NETWORK_EMERGENCY_CALLBACK_MODE);
 
-       msg (" - mode = %d", noti->mode);
+       msg(" - mode = %d", noti->mode);
 }
 
 static void on_net_search(TapiHandle *handle, int result, void *data, void *user_data)
 {
        TelNetworkPlmnList_t *list = data;
-       int i =0;
+       int i = 0;
 
-       msg ("");
-       msgb ("tel_search_network() response receive");
-       msg (" - result = 0x%x", result);
+       msg("");
+       msgb("tel_search_network() response receive");
+       msg(" - result = 0x%x", result);
 
        if (!list) {
-               msg (" - failed");
+               msg(" - failed");
                return;
        }
 
-       msg (" - count = %d", list->networks_count);
+       msg(" - count = %d", list->networks_count);
 
        for (i = 0; i < list->networks_count; i++) {
-               msg (" - [%d] plmn=%s, act=%d, type=%d, name=%s",
+               msg(" - [%d] plmn=%s, act=%d, type=%d, name=%s",
                                i,
                                list->network_list[i].plmn,
                                list->network_list[i].access_technology,
@@ -331,35 +331,35 @@ static void on_net_search(TapiHandle *handle, int result, void *data, void *user
 
 static void on_net_set_plmn_mode_automatic(TapiHandle *handle, int result, void *data, void *user_data)
 {
-       msg ("");
-       msgb ("tel_select_network_automatic() response receive");
-       msg (" - result = 0x%x", result);
+       msg("");
+       msgb("tel_select_network_automatic() response receive");
+       msg(" - result = 0x%x", result);
 }
 
 static void on_net_set_plmn_mode_manual(TapiHandle *handle, int result, void *data, void *user_data)
 {
-       msg ("");
-       msgb ("tel_select_network_manual() response receive");
-       msg (" - result = 0x%x", result);
+       msg("");
+       msgb("tel_select_network_manual() response receive");
+       msg(" - result = 0x%x", result);
 }
 
 static void on_net_get_plmn_mode(TapiHandle *handle, int result, void *data, void *user_data)
 {
        int *mode = data;
 
-       msg ("");
-       msgb ("tel_get_network_selection_mode() response receive");
-       msg (" - result = 0x%x", result);
+       msg("");
+       msgb("tel_get_network_selection_mode() response receive");
+       msg(" - result = 0x%x", result);
 
        if (data)
-               msg (" - mode = %d", *mode);
+               msg(" - mode = %d", *mode);
 }
 
 static void on_net_set_preferred_plmn(TapiHandle *handle, int result, void *data, void *user_data)
 {
-       msg ("");
-       msgb ("tel_set_preferred_plmn() response receive");
-       msg (" - result = 0x%x", result);
+       msg("");
+       msgb("tel_set_preferred_plmn() response receive");
+       msg(" - result = 0x%x", result);
 }
 
 static void on_net_get_preferred_plmn(TapiHandle *handle, int result, void *data, void *user_data)
@@ -367,19 +367,19 @@ static void on_net_get_preferred_plmn(TapiHandle *handle, int result, void *data
        TelNetworkPreferredPlmnList_t *info = data;
        unsigned int i = 0;
 
-       msg ("");
-       msgb ("tel_get_preferred_plmn() response receive");
-       msg (" - result = 0x%x", result);
+       msg("");
+       msgb("tel_get_preferred_plmn() response receive");
+       msg(" - result = 0x%x", result);
 
        if (!info) {
-               msg (" - failed");
+               msg(" - failed");
                return;
        }
 
-       msg (" - count = %d", info->NumOfPrefPlmns);
+       msg(" - count = %d", info->NumOfPrefPlmns);
 
        for (i = 0; i < info->NumOfPrefPlmns; i++) {
-               msg (" - [%d] plmn=%s, type=%d, ef_index=%d, name=%s",
+               msg(" - [%d] plmn=%s, type=%d, ef_index=%d, name=%s",
                                i,
                                info->PrefPlmnRecord[i].Plmn,
                                info->PrefPlmnRecord[i].SystemType,
@@ -390,58 +390,58 @@ static void on_net_get_preferred_plmn(TapiHandle *handle, int result, void *data
 
 static void on_net_set_cancel_manual_search(TapiHandle *handle, int result, void *data, void *user_data)
 {
-       msg ("");
-       msgb ("tel_cancel_network_manual_search() response receive");
-       msg (" - result = 0x%x", result);
+       msg("");
+       msgb("tel_cancel_network_manual_search() response receive");
+       msg(" - result = 0x%x", result);
 }
 
 static void on_net_get_serving_network(TapiHandle *handle, int result, void *data, void *user_data)
 {
        TelNetworkServing_t *serving_info = data;
 
-       msg ("");
-       msgb ("tel_get_network_serving() response receive");
-       msg (" - result = 0x%x", result);
+       msg("");
+       msgb("tel_get_network_serving() response receive");
+       msg(" - result = 0x%x", result);
 
        if (!serving_info) {
-               msg (" - failed");
+               msg(" - failed");
                return;
        }
 
-       msg (" - plmn = %s", serving_info->plmn);
-       msg (" - access technology = %d", serving_info->act);
+       msg(" - plmn = %s", serving_info->plmn);
+       msg(" - access technology = %d", serving_info->act);
 
        if (serving_info->act >= TAPI_NETWORK_SYSTEM_IS95A && serving_info->act <= TAPI_NETWORK_SYSTEM_EHRPD) {
-               msg (" - carrier = %d", serving_info->info.cdma_info.carrier);
-               msg (" - system_id = %d", serving_info->info.cdma_info.system_id);
-               msg (" - network_id = %d", serving_info->info.cdma_info.network_id);
-               msg (" - base_station_id = %d", serving_info->info.cdma_info.base_station_id);
-               msg (" - base_station_latitude = %d", serving_info->info.cdma_info.base_station_latitude);
-               msg (" - base_station_longitude = %d", serving_info->info.cdma_info.base_station_longitude);
-               msg (" - registration_zone = %d", serving_info->info.cdma_info.registration_zone);
-               msg (" - pilot_offset = %d", serving_info->info.cdma_info.pilot_offset);
+               msg(" - carrier = %d", serving_info->info.cdma_info.carrier);
+               msg(" - system_id = %d", serving_info->info.cdma_info.system_id);
+               msg(" - network_id = %d", serving_info->info.cdma_info.network_id);
+               msg(" - base_station_id = %d", serving_info->info.cdma_info.base_station_id);
+               msg(" - base_station_latitude = %d", serving_info->info.cdma_info.base_station_latitude);
+               msg(" - base_station_longitude = %d", serving_info->info.cdma_info.base_station_longitude);
+               msg(" - registration_zone = %d", serving_info->info.cdma_info.registration_zone);
+               msg(" - pilot_offset = %d", serving_info->info.cdma_info.pilot_offset);
        } else {
-               msg (" - lac = %d", serving_info->info.lac);
+               msg(" - lac = %d", serving_info->info.lac);
        }
 }
 
 static void on_net_set_mode(TapiHandle *handle, int result, void *data, void *user_data)
 {
-       msg ("");
-       msgb ("tel_set_network_mode() response receive");
-       msg (" - result = 0x%x", result);
+       msg("");
+       msgb("tel_set_network_mode() response receive");
+       msg(" - result = 0x%x", result);
 }
 
 static void on_net_get_mode(TapiHandle *handle, int result, void *data, void *user_data)
 {
        int *mode = data;
 
-       msg ("");
-       msgb ("tel_get_network_mode() response receive");
-       msg (" - result = 0x%x", result);
+       msg("");
+       msgb("tel_get_network_mode() response receive");
+       msg(" - result = 0x%x", result);
 
        if (data)
-               msg (" - mode = %d", *mode);
+               msg(" - mode = %d", *mode);
 }
 
 static void on_net_get_neighboring_cell_info(TapiHandle *handle, int result, void *data, void *user_data)
@@ -449,58 +449,56 @@ static void on_net_get_neighboring_cell_info(TapiHandle *handle, int result, voi
        TelNetworkNeighboringCellInfo_t *info = data;
        int i, j;
 
-       msg ("");
-       msgb ("tel_get_neighboring_cell_info() response receive");
-       msg (" - result = 0x%x", result);
+       msg("");
+       msgb("tel_get_neighboring_cell_info() response receive");
+       msg(" - result = 0x%x", result);
 
        if (!data)
                return;
 
-       msg ("info=%p",info);
-
-       msg ("act=%d",info->serving.act);
-       msg ("mcc=%d",info->serving.mcc);
-       msg ("mnc=%d\n",info->serving.mnc);
-
-       if(info->serving.act <= TAPI_NETWORK_SYSTEM_EGPRS) {
-               msg ("geran.cell_id=%d",info->serving.cell.geran.cell_id);
-               msg ("geran.lac=%d",info->serving.cell.geran.lac);
-               msg ("geran.bcch=%d",info->serving.cell.geran.bcch);
-               msg ("geran.bsic=%d",info->serving.cell.geran.bsic);
-               msg ("geran.rxlev=%d\n",info->serving.cell.geran.rxlev);
-       }
-       else if(info->serving.act <= TAPI_NETWORK_SYSTEM_GSM_AND_UMTS) {
-               msg ("umts.cell_id=%d",info->serving.cell.umts.cell_id);
-               msg ("umts.lac=%d",info->serving.cell.umts.lac);
-               msg ("umts.arfcn=%d",info->serving.cell.umts.arfcn);
-               msg ("umts.psc=%d",info->serving.cell.umts.psc);
-               msg ("umts.rscp=%d\n",info->serving.cell.umts.rscp);
-       }
-       else if(info->serving.act == TAPI_NETWORK_SYSTEM_LTE) {
-               msg ("lte.cell_id=%d",info->serving.cell.lte.cell_id);
-               msg ("lte.lac=%d",info->serving.cell.lte.lac);
-               msg ("lte.earfcn=%d",info->serving.cell.lte.earfcn);
-               msg ("lte.tac=%d",info->serving.cell.lte.tac);
-               msg ("lte.rssi=%d\n",info->serving.cell.lte.rssi);
-       }
-       else if(info->serving.act >= TAPI_NETWORK_SYSTEM_IS95A && info->serving.act <= TAPI_NETWORK_SYSTEM_EHRPD) {
-               msg ("cdma.system_id=%d",info->serving.cell.cdma.system_id);
-               msg ("cdma.network_id=%d",info->serving.cell.cdma.network_id);
-               msg ("cdma.base_station_id=%d",info->serving.cell.cdma.base_station_id);
-               msg ("cdma.reference_pn=%d",info->serving.cell.cdma.reference_pn);
-               msg ("cdma.base_station_latitude=%d\n",info->serving.cell.cdma.base_station_latitude);
-               msg ("cdma.base_station_longitude=%d\n",info->serving.cell.cdma.base_station_longitude);
+       msg("info=%p", info);
+
+       msg("act=%d", info->serving.act);
+       msg("mcc=%d", info->serving.mcc);
+       msg("mnc=%d\n", info->serving.mnc);
+
+       if (info->serving.act <= TAPI_NETWORK_SYSTEM_EGPRS) {
+               msg("geran.cell_id=%d", info->serving.cell.geran.cell_id);
+               msg("geran.lac=%d", info->serving.cell.geran.lac);
+               msg("geran.bcch=%d", info->serving.cell.geran.bcch);
+               msg("geran.bsic=%d", info->serving.cell.geran.bsic);
+               msg("geran.rxlev=%d\n", info->serving.cell.geran.rxlev);
+       } else if (info->serving.act <= TAPI_NETWORK_SYSTEM_GSM_AND_UMTS) {
+               msg("umts.cell_id=%d", info->serving.cell.umts.cell_id);
+               msg("umts.lac=%d", info->serving.cell.umts.lac);
+               msg("umts.arfcn=%d", info->serving.cell.umts.arfcn);
+               msg("umts.psc=%d", info->serving.cell.umts.psc);
+               msg("umts.rscp=%d\n", info->serving.cell.umts.rscp);
+       } else if (info->serving.act == TAPI_NETWORK_SYSTEM_LTE) {
+               msg("lte.cell_id=%d", info->serving.cell.lte.cell_id);
+               msg("lte.lac=%d", info->serving.cell.lte.lac);
+               msg("lte.earfcn=%d", info->serving.cell.lte.earfcn);
+               msg("lte.tac=%d", info->serving.cell.lte.tac);
+               msg("lte.rssi=%d\n", info->serving.cell.lte.rssi);
+       } else if (info->serving.act >= TAPI_NETWORK_SYSTEM_IS95A && info->serving.act <= TAPI_NETWORK_SYSTEM_EHRPD) {
+               msg("cdma.system_id=%d", info->serving.cell.cdma.system_id);
+               msg("cdma.network_id=%d", info->serving.cell.cdma.network_id);
+               msg("cdma.base_station_id=%d", info->serving.cell.cdma.base_station_id);
+               msg("cdma.reference_pn=%d", info->serving.cell.cdma.reference_pn);
+               msg("cdma.base_station_latitude=%d\n", info->serving.cell.cdma.base_station_latitude);
+               msg("cdma.base_station_longitude=%d\n", info->serving.cell.cdma.base_station_longitude);
        }
-       msg ("geran_list_count=%d",info->geran_list_count);
-       for(i=0; i<info->geran_list_count; i++) {
-               msg ("[%d] cell_id=%d, lac=%d, bcch=%d, bsic=%d, rxlev=%d,",i,
+
+       msg("geran_list_count=%d", info->geran_list_count);
+       for (i = 0; i < info->geran_list_count; i++) {
+               msg("[%d] cell_id=%d, lac=%d, bcch=%d, bsic=%d, rxlev=%d, ", i,
                        info->geran_list[i].cell_id, info->geran_list[i].lac, info->geran_list[i].bcch,
                        info->geran_list[i].bsic, info->geran_list[i].rxlev);
        }
 
-       msg ("umts_list_count=%d",info->umts_list_count);
-       for(j=0; j<info->umts_list_count; j++) {
-               msg ("[%d] cell_id=%d, lac=%d, arfcn=%d, psc=%d, rscp=%d,",j,
+       msg("umts_list_count=%d", info->umts_list_count);
+       for (j = 0; j < info->umts_list_count; j++) {
+               msg("[%d] cell_id=%d, lac=%d, arfcn=%d, psc=%d, rscp=%d, ", j,
                        info->umts_list[j].cell_id, info->umts_list[j].lac, info->umts_list[j].arfcn,
                        info->umts_list[j].psc, info->umts_list[j].rscp);
        }
@@ -508,9 +506,9 @@ static void on_net_get_neighboring_cell_info(TapiHandle *handle, int result, voi
 
 static void on_net_set_default_data_subscription(TapiHandle *handle, int result, void *data, void *user_data)
 {
-       msg ("");
-       msgb ("tel_set_network_default_data_subscription() response receive");
-       msg (" - result = 0x%x", result);
+       msg("");
+       msgb("tel_set_network_default_data_subscription() response receive");
+       msg(" - result = 0x%x", result);
 }
 
 static void on_net_set_default_subscription(TapiHandle *handle, int result, void *data, void *user_data)
@@ -520,103 +518,99 @@ static void on_net_set_default_subscription(TapiHandle *handle, int result, void
 
 static void on_net_set_emergency_callback_mode(TapiHandle *handle, int result, void *data, void *user_data)
 {
-       msg ("");
-       msgb ("tel_set_network_emergency_callback_mode() response receive");
-       msg (" - result = 0x%x", result);
+       msg("");
+       msgb("tel_set_network_emergency_callback_mode() response receive");
+       msg(" - result = 0x%x", result);
 }
 
 static void on_net_set_roaming_preference(TapiHandle *handle, int result, void *data, void *user_data)
 {
-       msg ("");
-       msgb ("tel_set_network_roaming_preference() response receive");
-       msg (" - result = 0x%x", result);
+       msg("");
+       msgb("tel_set_network_roaming_preference() response receive");
+       msg(" - result = 0x%x", result);
 }
 
 static void on_net_get_roaming_preference(TapiHandle *handle, int result, void *data, void *user_data)
 {
        int *roam_pref = data;
 
-       msg ("");
-       msgb ("tel_get_network_roaming_preference() response receive");
-       msg (" - result = 0x%x", result);
+       msg("");
+       msgb("tel_get_network_roaming_preference() response receive");
+       msg(" - result = 0x%x", result);
 
        if (data)
-               msg (" - roaming preference = %d", *roam_pref);
+               msg(" - roaming preference = %d", *roam_pref);
 }
 
-static int run_net_search (MManager *mm, struct menu_data *menu)
+static int run_net_search(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
        int result;
 
-       msg ("call tel_search_network()");
+       msg("call tel_search_network()");
 
-       result = tel_search_network (handle, on_net_search, NULL);
-       if (result != TAPI_API_SUCCESS) {
-               msg ("failed. (result = %d)", result);
-       }
+       result = tel_search_network(handle, on_net_search, NULL);
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
        return 0;
 }
 
-static int run_net_set_plmn_mode_automatic (MManager *mm, struct menu_data *menu)
+static int run_net_set_plmn_mode_automatic(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
        int result;
 
-       msg ("call tel_select_network_automatic()");
+       msg("call tel_select_network_automatic()");
 
-       result = tel_select_network_automatic (handle, on_net_set_plmn_mode_automatic, NULL);
-       if (result != TAPI_API_SUCCESS) {
-               msg ("failed. (result = %d)", result);
-       }
+       result = tel_select_network_automatic(handle, on_net_set_plmn_mode_automatic, NULL);
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
        return 0;
 }
 
-static int run_net_set_plmn_mode_manual (MManager *mm, struct menu_data *menu)
+static int run_net_set_plmn_mode_manual(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
        int result;
        const char *plmn;
        int act;
 
-       msg ("call tel_select_network_manual()");
+       msg("call tel_select_network_manual()");
 
        plmn = data_net_set_plmn_mode_manual_plmn;
        act = atoi(data_net_set_plmn_mode_manual_act);
 
-       result = tel_select_network_manual (handle, plmn, act, on_net_set_plmn_mode_manual, NULL);
-       if (result != TAPI_API_SUCCESS) {
-               msg ("failed. (result = %d)", result);
-       }
+       result = tel_select_network_manual(handle, plmn, act, on_net_set_plmn_mode_manual, NULL);
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
        return 0;
 }
 
-static int run_net_get_plmn_mode (MManager *mm, struct menu_data *menu)
+static int run_net_get_plmn_mode(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
        int result;
 
-       msg ("call tel_get_network_selection_mode()");
+       msg("call tel_get_network_selection_mode()");
 
-       result = tel_get_network_selection_mode (handle, on_net_get_plmn_mode, NULL);
-       if (result != TAPI_API_SUCCESS) {
-               msg ("failed. (result = %d)", result);
-       }
+       result = tel_get_network_selection_mode(handle, on_net_get_plmn_mode, NULL);
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
        return 0;
 }
 
-static int run_net_set_preferred_plmn (MManager *mm, struct menu_data *menu)
+static int run_net_set_preferred_plmn(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
        int result;
        int operation;
        TelNetworkPreferredPlmnInfo_t info;
 
-       msg ("call tel_set_network_preferred_plmn()");
+       msg("call tel_set_network_preferred_plmn()");
 
        memset(&info, 0, sizeof(TelNetworkPreferredPlmnInfo_t));
 
@@ -625,131 +619,123 @@ static int run_net_set_preferred_plmn (MManager *mm, struct menu_data *menu)
        info.SystemType = atoi(data_net_set_preferred_plmn_type);
        strncpy(info.Plmn, data_net_set_preferred_plmn_plmn, 6);
 
-       result = tel_set_network_preferred_plmn (handle, operation, &info, on_net_set_preferred_plmn, NULL);
-       if (result != TAPI_API_SUCCESS) {
-               msg ("failed. (result = %d)", result);
-       }
+       result = tel_set_network_preferred_plmn(handle, operation, &info, on_net_set_preferred_plmn, NULL);
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
        return 0;
 }
 
-static int run_net_get_preferred_plmn (MManager *mm, struct menu_data *menu)
+static int run_net_get_preferred_plmn(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
        int result;
 
-       msg ("call tel_get_network_preferred_plmn()");
+       msg("call tel_get_network_preferred_plmn()");
 
-       result = tel_get_network_preferred_plmn (handle, on_net_get_preferred_plmn, NULL);
-       if (result != TAPI_API_SUCCESS) {
-               msg ("failed. (result = %d)", result);
-       }
+       result = tel_get_network_preferred_plmn(handle, on_net_get_preferred_plmn, NULL);
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
        return 0;
 }
 
-static int run_net_set_cancel_manual_search (MManager *mm, struct menu_data *menu)
+static int run_net_set_cancel_manual_search(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
        int result;
 
-       msg ("call tel_cancel_network_manual_search()");
+       msg("call tel_cancel_network_manual_search()");
 
-       result = tel_cancel_network_manual_search (handle, on_net_set_cancel_manual_search, NULL);
-       if (result != TAPI_API_SUCCESS) {
-               msg ("failed. (result = %d)", result);
-       }
+       result = tel_cancel_network_manual_search(handle, on_net_set_cancel_manual_search, NULL);
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
        return 0;
 }
 
-static int run_net_get_serving_network (MManager *mm, struct menu_data *menu)
+static int run_net_get_serving_network(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
        int result;
 
-       msg ("call tel_get_network_serving()");
+       msg("call tel_get_network_serving()");
 
-       result = tel_get_network_serving (handle, on_net_get_serving_network, NULL);
-       if (result != TAPI_API_SUCCESS) {
-               msg ("failed. (result = %d)", result);
-       }
+       result = tel_get_network_serving(handle, on_net_get_serving_network, NULL);
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
        return 0;
 }
 
-static int run_net_set_mode (MManager *mm, struct menu_data *menu)
+static int run_net_set_mode(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
        int result;
        int mode;
 
-       msg ("call tel_set_network_mode()");
+       msg("call tel_set_network_mode()");
 
        mode = atoi(data_net_set_mode_mode);
 
-       result = tel_set_network_mode (handle, mode, on_net_set_mode, NULL);
-       if (result != TAPI_API_SUCCESS) {
-               msg ("failed. (result = %d)", result);
-       }
+       result = tel_set_network_mode(handle, mode, on_net_set_mode, NULL);
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
        return 0;
 }
 
-static int run_net_get_mode (MManager *mm, struct menu_data *menu)
+static int run_net_get_mode(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
        int result;
 
-       msg ("call tel_get_network_mode()");
+       msg("call tel_get_network_mode()");
 
-       result = tel_get_network_mode (handle, on_net_get_mode, NULL);
-       if (result != TAPI_API_SUCCESS) {
-               msg ("failed. (result = %d)", result);
-       }
+       result = tel_get_network_mode(handle, on_net_get_mode, NULL);
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
        return 0;
 }
 
-static int run_net_get_neighboring_cell_info (MManager *mm, struct menu_data *menu)
+static int run_net_get_neighboring_cell_info(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
        int result;
 
-       msg ("call tel_get_network_neighboring_cell_info()");
+       msg("call tel_get_network_neighboring_cell_info()");
 
-       result = tel_get_network_neighboring_cell_info (handle, on_net_get_neighboring_cell_info, NULL);
-       if (result != TAPI_API_SUCCESS) {
-               msg ("failed. (result = %d)", result);
-       }
+       result = tel_get_network_neighboring_cell_info(handle, on_net_get_neighboring_cell_info, NULL);
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
        return 0;
 }
 
-static int run_net_set_default_data_subscription (MManager *mm, struct menu_data *menu)
+static int run_net_set_default_data_subscription(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
        int result;
 
-       msg ("call tel_set_network_default_data_subscription()");
+       msg("call tel_set_network_default_data_subscription()");
 
-       result = tel_set_network_default_data_subscription (handle, on_net_set_default_data_subscription, NULL);
-       if (result != TAPI_API_SUCCESS) {
-               msg ("failed. (result = %d)", result);
-       }
+       result = tel_set_network_default_data_subscription(handle, on_net_set_default_data_subscription, NULL);
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
        return 0;
 }
 
-static int run_net_get_default_data_subscription (MManager *mm, struct menu_data *menu)
+static int run_net_get_default_data_subscription(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        TelNetworkDefaultDataSubs_t default_subs = TAPI_NETWORK_DEFAULT_DATA_SUBS_UNKNOWN;
        int result = 0;
 
-       msg ("call tel_get_network_default_data_subscription()");
+       msg("call tel_get_network_default_data_subscription()");
 
-       result = tel_get_network_default_data_subscription (handle, &default_subs);
+       result = tel_get_network_default_data_subscription(handle, &default_subs);
        if (result != TAPI_API_SUCCESS) {
                msg("api call failed with[0x%x]", result);
                return 0;
@@ -772,9 +758,8 @@ static int run_net_set_default_subscription(MManager *mm, struct menu_data *menu
        msg("call tel_set_network_default_subscription()");
 
        result = tel_set_network_default_subscription(handle, on_net_set_default_subscription, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return result;
 }
@@ -801,58 +786,55 @@ static int run_net_get_default_subscription(MManager *mm, struct menu_data *menu
        return result;
 }
 
-static int run_net_set_emergency_callback_mode (MManager *mm, struct menu_data *menu)
+static int run_net_set_emergency_callback_mode(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
        int result;
        int mode;
 
-       msg ("call tel_set_network_emergency_callback_mode()");
+       msg("call tel_set_network_emergency_callback_mode()");
 
        mode = atoi(data_net_set_emergency_callback_mode_mode);
 
-       result = tel_set_network_emergency_callback_mode (handle, mode, on_net_set_emergency_callback_mode, NULL);
-       if (result != TAPI_API_SUCCESS) {
-               msg ("failed. (result = %d)", result);
-       }
+       result = tel_set_network_emergency_callback_mode(handle, mode, on_net_set_emergency_callback_mode, NULL);
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
        return 0;
 }
 
-static int run_net_set_roaming_preference (MManager *mm, struct menu_data *menu)
+static int run_net_set_roaming_preference(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
        int result;
        int domain;
 
-       msg ("call tel_set_network_roaming_preference()");
+       msg("call tel_set_network_roaming_preference()");
 
        domain = atoi(data_net_set_roaming_preference_roam_pref);
 
-       result = tel_set_network_roaming_preference (handle, domain, on_net_set_roaming_preference, NULL);
-       if (result != TAPI_API_SUCCESS) {
-               msg ("failed. (result = %d)", result);
-       }
+       result = tel_set_network_roaming_preference(handle, domain, on_net_set_roaming_preference, NULL);
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
        return 0;
 }
 
-static int run_net_get_roaming_preference (MManager *mm, struct menu_data *menu)
+static int run_net_get_roaming_preference(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
        int result;
 
-       msg ("call tel_get_network_roaming_preference()");
+       msg("call tel_get_network_roaming_preference()");
 
-       result = tel_get_network_roaming_preference (handle, on_net_get_roaming_preference, NULL);
-       if (result != TAPI_API_SUCCESS) {
-               msg ("failed. (result = %d)", result);
-       }
+       result = tel_get_network_roaming_preference(handle, on_net_get_roaming_preference, NULL);
+       if (result != TAPI_API_SUCCESS)
+               msg("failed. (result = %d)", result);
 
        return 0;
 }
 
-static int show_properties (MManager *mm, struct menu_data *menu)
+static int show_properties(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
        int lac = -1,
@@ -868,41 +850,40 @@ static int show_properties (MManager *mm, struct menu_data *menu)
                option = -1,
                ims_voice_status = -1;
        char *plmn = NULL,
-                *n_name = NULL,
-                *s_name = NULL;
-
-       tel_get_property_int (handle, TAPI_PROP_NETWORK_LAC     , &lac);
-       tel_get_property_int (handle, TAPI_PROP_NETWORK_CELLID, &cellid);
-       tel_get_property_int (handle, TAPI_PROP_NETWORK_SERVICE_TYPE, &svc_type);
-       tel_get_property_int (handle, TAPI_PROP_NETWORK_ACT, &act);
-       tel_get_property_string (handle, TAPI_PROP_NETWORK_PLMN, &plmn);
-       tel_get_property_int (handle, TAPI_PROP_NETWORK_PS_TYPE, &ps_type);
-       tel_get_property_int (handle, TAPI_PROP_NETWORK_CIRCUIT_STATUS, &cs);
-       tel_get_property_int (handle, TAPI_PROP_NETWORK_PACKET_STATUS, &ps);
-       tel_get_property_int (handle, TAPI_PROP_NETWORK_SIGNALSTRENGTH_DBM, &sig_dbm);
-       tel_get_property_int (handle, TAPI_PROP_NETWORK_SIGNALSTRENGTH_LEVEL, &sig_level);
-       tel_get_property_int (handle, TAPI_PROP_NETWORK_ROAMING_STATUS, &roam);
-       tel_get_property_int (handle, TAPI_PROP_NETWORK_NAME_OPTION, &option);
-       tel_get_property_string (handle, TAPI_PROP_NETWORK_NETWORK_NAME, &n_name);
-       tel_get_property_string (handle, TAPI_PROP_NETWORK_SPN_NAME, &s_name);
-       tel_get_property_int (handle, TAPI_PROP_NETWORK_IMS_VOICE_SUPPORT_STATUS, &ims_voice_status);
-
-       msg (
-                       "  [lac]: 0x%08X   [cellid]: 0x%08X\n"
-                       "  [service_type]: %d    [act]: %d            [plmn]: \"%s\"\n"
-                       "  [ps_type]: %d         [cs_status]: %d      [ps_status]: %d\n"
-                       "  [sig_dbm]: %d         [sig_level]: %d      [roaming_status]: %d\n"
-                       "  [option]: %d  [network_name]: \"%s\"    [spn_name]: \"%s\"\n"
-                       "  [ims_voice_status]: %d",
-                       lac, cellid,
-                       svc_type, act, plmn,
-                       ps_type, cs, ps,
-                       sig_dbm, sig_level, roam,
-                       option, n_name, s_name, ims_voice_status);
-
-       g_free (plmn);
-       g_free (n_name);
-       g_free (s_name);
+               *n_name = NULL,
+               *s_name = NULL;
+
+       tel_get_property_int(handle, TAPI_PROP_NETWORK_LAC      , &lac);
+       tel_get_property_int(handle, TAPI_PROP_NETWORK_CELLID, &cellid);
+       tel_get_property_int(handle, TAPI_PROP_NETWORK_SERVICE_TYPE, &svc_type);
+       tel_get_property_int(handle, TAPI_PROP_NETWORK_ACT, &act);
+       tel_get_property_string(handle, TAPI_PROP_NETWORK_PLMN, &plmn);
+       tel_get_property_int(handle, TAPI_PROP_NETWORK_PS_TYPE, &ps_type);
+       tel_get_property_int(handle, TAPI_PROP_NETWORK_CIRCUIT_STATUS, &cs);
+       tel_get_property_int(handle, TAPI_PROP_NETWORK_PACKET_STATUS, &ps);
+       tel_get_property_int(handle, TAPI_PROP_NETWORK_SIGNALSTRENGTH_DBM, &sig_dbm);
+       tel_get_property_int(handle, TAPI_PROP_NETWORK_SIGNALSTRENGTH_LEVEL, &sig_level);
+       tel_get_property_int(handle, TAPI_PROP_NETWORK_ROAMING_STATUS, &roam);
+       tel_get_property_int(handle, TAPI_PROP_NETWORK_NAME_OPTION, &option);
+       tel_get_property_string(handle, TAPI_PROP_NETWORK_NETWORK_NAME, &n_name);
+       tel_get_property_string(handle, TAPI_PROP_NETWORK_SPN_NAME, &s_name);
+       tel_get_property_int(handle, TAPI_PROP_NETWORK_IMS_VOICE_SUPPORT_STATUS, &ims_voice_status);
+
+       msg("  [lac]: 0x%08X   [cellid]: 0x%08X\n"
+               "  [service_type]: %d    [act]: %d            [plmn]: \"%s\"\n"
+               "  [ps_type]: %d         [cs_status]: %d      [ps_status]: %d\n"
+               "  [sig_dbm]: %d         [sig_level]: %d      [roaming_status]: %d\n"
+               "  [option]: %d  [network_name]: \"%s\"    [spn_name]: \"%s\"\n"
+               "  [ims_voice_status]: %d",
+               lac, cellid,
+               svc_type, act, plmn,
+               ps_type, cs, ps,
+               sig_dbm, sig_level, roam,
+               option, n_name, s_name, ims_voice_status);
+
+       g_free(plmn);
+       g_free(n_name);
+       g_free(s_name);
 
        return 0;
 }
@@ -933,7 +914,7 @@ static struct menu_data menu_net_set_preferred_plmn[] = {
        { "1", "mode (1=add, 2=edit, 3=delete)", NULL, NULL, data_net_set_preferred_plmn_mode},
        { "2", "plmn (45001)", NULL, NULL, data_net_set_preferred_plmn_plmn},
        { "3", "type (1=GSM, 2=GPRS, 3=EGPRS, 4=UMTS, ...)", NULL, NULL, data_net_set_preferred_plmn_type},
-       { "4", "ef_index (0,...)", NULL, NULL, data_net_set_preferred_plmn_ef_index},
+       { "4", "ef_index (0, ...)", NULL, NULL, data_net_set_preferred_plmn_ef_index},
        { "5", "run", NULL, run_net_set_preferred_plmn, NULL},
        { NULL, NULL, },
 };
@@ -1053,154 +1034,130 @@ struct menu_data menu_net_3gpp2[] = {
 struct menu_data menu_net[] = { { "1", "3GPP(GSM/WCDMA/LTE)", menu_net_3gpp, NULL, NULL }, {
                "2", "3GPP2(CDMA)", menu_net_3gpp2, NULL, NULL }, { NULL, NULL , }, };
 
-void register_network_event (TapiHandle *handle)
+void register_network_event(TapiHandle *handle)
 {
        int ret;
 
        /* Signal */
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_NOTI_NETWORK_REGISTRATION_STATUS,
                        on_noti_registration_status, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_NOTI_NETWORK_CELLINFO, on_noti_cell_info, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_NOTI_NETWORK_CHANGE, on_noti_change, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_NOTI_NETWORK_TIMEINFO, on_noti_time_info, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_NOTI_NETWORK_IDENTITY, on_noti_identity, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_NOTI_NETWORK_SIGNALSTRENGTH, on_noti_signal_strength, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_NOTI_NETWORK_DEFAULT_DATA_SUBSCRIPTION, on_noti_default_data_subs, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_NOTI_NETWORK_DEFAULT_SUBSCRIPTION, on_noti_default_subs, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_NOTI_NETWORK_EMERGENCY_CALLBACK_MODE, on_noti_emergency_callback_mode, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        /* Property */
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_PROP_NETWORK_SIGNALSTRENGTH_DBM, on_prop_signal_dbm, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_PROP_NETWORK_SIGNALSTRENGTH_LEVEL, on_prop_signal_level, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_PROP_NETWORK_LAC, on_prop_lac, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_PROP_NETWORK_PLMN, on_prop_plmn, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_PROP_NETWORK_CELLID, on_prop_cellid, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_PROP_NETWORK_SERVICE_TYPE, on_prop_service_type, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_PROP_NETWORK_ACT, on_prop_act, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_PROP_NETWORK_PS_TYPE, on_prop_ps_type, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_PROP_NETWORK_CIRCUIT_STATUS, on_prop_circuit_status, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_PROP_NETWORK_PACKET_STATUS, on_prop_packet_status, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_PROP_NETWORK_ROAMING_STATUS, on_prop_roaming_status, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_PROP_NETWORK_NAME_OPTION, on_prop_name_option, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_PROP_NETWORK_NETWORK_NAME, on_prop_network_name, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_PROP_NETWORK_SPN_NAME, on_prop_spn_name, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle,
+       ret = tel_register_noti_event(handle,
                        TAPI_PROP_NETWORK_IMS_VOICE_SUPPORT_STATUS, on_prop_ims_voice_status, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 }
index 37c4d9f659421ae1d6d9bbd605bff25869daffef..96f9543e48fdb09c2eb4cf44fdfafb0ef4e16ef6 100644 (file)
 #include "sim.h"
 #include "phonebook.h"
 
-#define CHECK_RT(x) \
-{ \
-    if((x) != 0) { \
-               msg("api call failed with[%d]",x); \
+#define CHECK_RT(x) do { \
+       if ((x) != 0) { \
+               msg("api call failed with[%d]", x); \
                return 0; \
-       }\
-}
+       } \
+} while (0)
 
-static const chardbg_pb_type_name[] = { "TAPI_SIM_PB_FDN", "TAPI_SIM_PB_ADN", "TAPI_SIM_PB_SDN",
+static const char *dbg_pb_type_name[] = { "TAPI_SIM_PB_FDN", "TAPI_SIM_PB_ADN", "TAPI_SIM_PB_SDN",
                "TAPI_SIM_PB_3GSIM", "TAPI_SIM_PB_AAS", "TAPI_SIM_PB_GAS", };
-static const chardbg_pb_adf_field_name[] = { "NO VALUE 0", "TAPI_PB_3G_NAME", "TAPI_PB_3G_NUMBER",
+static const char *dbg_pb_adf_field_name[] = { "NO VALUE 0", "TAPI_PB_3G_NAME", "TAPI_PB_3G_NUMBER",
                "TAPI_PB_3G_ANR1", "TAPI_PB_3G_ANR2", "TAPI_PB_3G_ANR3", "TAPI_PB_3G_EMAIL1",
                "TAPI_PB_3G_EMAIL2", "TAPI_PB_3G_EMAIL3", "TAPI_PB_3G_EMAIL4", "TAPI_PB_3G_SNE",
                "TAPI_PB_3G_GRP", "TAPI_PB_3G_PBC" };
-static const chardbg_pb_ton_name[] = { "TAPI_SIM_TON_UNKNOWN", "TAPI_SIM_TON_INTERNATIONAL",
+static const char *dbg_pb_ton_name[] = { "TAPI_SIM_TON_UNKNOWN", "TAPI_SIM_TON_INTERNATIONAL",
                "TAPI_SIM_TON_NATIONAL", "TAPI_SIM_TON_NETWORK_SPECIFIC", "TAPI_SIM_TON_DEDICATED_ACCESS",
                "TAPI_SIM_TON_ALPHA_NUMERIC", "TAPI_SIM_TON_ABBREVIATED_NUMBER",
                "TAPI_SIM_TON_RESERVED_FOR_EXT", };
-static const chardbg_pb_dcs_name[] = { "TAPI_SIM_TEXT_ENC_ASCII", "TAPI_SIM_TEXT_ENC_GSM7BIT",
+static const char *dbg_pb_dcs_name[] = { "TAPI_SIM_TEXT_ENC_ASCII", "TAPI_SIM_TEXT_ENC_GSM7BIT",
                "TAPI_SIM_TEXT_ENC_UCS2", "TAPI_SIM_TEXT_ENC_HEX", };
 
 static char data_pb_type[MENU_DATA_SIZE + 1] = {};
@@ -91,6 +90,19 @@ static void on_noti_pb_status(TapiHandle *handle, const char *noti_id, void *dat
                status->pb_list.b_gas);
 }
 
+static void on_noti_pb_contact_change(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
+{
+       TelSimPbContactChangeInfo_t *contact_change = data;
+       msgb("event(%s) receive !!", TAPI_NOTI_PB_CONTACT_CHANGE);
+       if (!contact_change)
+               return;
+
+       msg("phonebook_type[%d] index[%d] operation[%d]",
+               contact_change->pb_type,
+               contact_change->index,
+               contact_change->operation);
+}
+
 static int run_pb_get_sim_pb_init_info(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
@@ -122,11 +134,11 @@ static void on_pb_get_sim_pb_count(TapiHandle *handle, int result, void *data, v
        msg("on_pb_get_sim_pb_count received");
        msg("access_rt[%d]", access_rt);
        if (access_rt == TAPI_SIM_PB_SUCCESS) {
-               if (ps->StorageFileType <= TAPI_SIM_PB_GAS) {
-                       msg("StorageFileType[%d][%s]",  ps->StorageFileType, dbg_pb_type_name[ps->StorageFileType]);
-               } else {
+               if (ps->StorageFileType <= TAPI_SIM_PB_GAS)
+                       msg("StorageFileType[%d][%s]", ps->StorageFileType, dbg_pb_type_name[ps->StorageFileType]);
+               else
                        msg("StorageFileType[%d]", ps->StorageFileType);
-               }
+
                msg("TotalRecordCount[%d]", ps->TotalRecordCount);
                msg("UsedRecordCount[%d]", ps->UsedRecordCount);
        }
@@ -153,16 +165,16 @@ static void on_pb_get_sim_pb_meta_info(TapiHandle *handle, int result, void *dat
        msg("on_pb_get_sim_pb_meta_info received");
        msg("access_rt[%d]", access_rt);
        if (access_rt == TAPI_SIM_PB_SUCCESS) {
-               if (pe->StorageFileType <= TAPI_SIM_PB_GAS) {
-                       msg("StorageFileType[%d][%s]",  pe->StorageFileType, dbg_pb_type_name[pe->StorageFileType]);
-               } else {
+               if (pe->StorageFileType <= TAPI_SIM_PB_GAS)
+                       msg("StorageFileType[%d][%s]", pe->StorageFileType, dbg_pb_type_name[pe->StorageFileType]);
+               else
                        msg("StorageFileType[%d]", pe->StorageFileType);
-               }
-               msg("PbIndexMin[%d]",pe->PbIndexMin);
-               msg("PbIndexMax[%d]",pe->PbIndexMax);
-               msg("PbNumLenMax[%d]",pe->PbNumLenMax);
-               msg("PbTextLenMax[%d]",pe->PbTextLenMax);
-               msg("PbUsedCount[%d]",pe->PbUsedCount);
+
+               msg("PbIndexMin[%d]", pe->PbIndexMin);
+               msg("PbIndexMax[%d]", pe->PbIndexMax);
+               msg("PbNumLenMax[%d]", pe->PbNumLenMax);
+               msg("PbTextLenMax[%d]", pe->PbTextLenMax);
+               msg("PbUsedCount[%d]", pe->PbUsedCount);
        }
 
 }
@@ -190,11 +202,11 @@ static void on_pb_get_sim_pb_usim_meta_info(TapiHandle *handle, int result, void
        msg("access_rt[%d]", access_rt);
        if (access_rt == TAPI_SIM_PB_SUCCESS) {
                for (i = 0; i < capa->FileTypeCount; i++) {
-                       if(capa->FileTypeInfo[i].field_type <=TAPI_PB_3G_PBC ) {
+                       if (capa->FileTypeInfo[i].field_type <= TAPI_PB_3G_PBC)
                                msg("capa->FileTypeInfo[%d].field_type[%d][%s]", i, capa->FileTypeInfo[i].field_type, dbg_pb_adf_field_name[capa->FileTypeInfo[i].field_type]);
-                       } else {
+                       else
                                msg("capa->FileTypeInfo[%d].field_type[%d]", i, capa->FileTypeInfo[i].field_type);
-                       }
+
                        msg("capa->FileTypeInfo[%d].index_max[%d]", i, capa->FileTypeInfo[i].index_max);
                        msg("capa->FileTypeInfo[%d].text_max[%d]", i, capa->FileTypeInfo[i].text_max);
                        msg("capa->FileTypeInfo[%d].used_count[%d]", i, capa->FileTypeInfo[i].used_count);
@@ -220,47 +232,46 @@ static void on_pb_read_sim_pb_record(TapiHandle *handle, int result, void *data,
 
        msg("on_pb_read_sim_pb_record received");
        msg("access_rt[%d]", access_rt);
-       if(access_rt == TAPI_SIM_PB_SUCCESS) {
-               if( pr->phonebook_type <= TAPI_SIM_PB_GAS){
+       if (access_rt == TAPI_SIM_PB_SUCCESS) {
+               if (pr->phonebook_type <= TAPI_SIM_PB_GAS)
                        msg("phonebook_type[%d][%s]", pr->phonebook_type, dbg_pb_type_name[pr->phonebook_type]);
-               } else {
+                else
                        msg("phonebook_type[%d]", pr->phonebook_type);
-               }
+
                msg("index[%d]", pr->index);
                msg("next_index[%d]", pr->next_index);
                msg("name[%s]", pr->name);
-               if(pr->dcs <= TAPI_SIM_TEXT_ENC_HEX) {
+               if (pr->dcs <= TAPI_SIM_TEXT_ENC_HEX)
                        msg("dcs[%d][%s]", pr->dcs, dbg_pb_dcs_name[pr->dcs]);
-               } else {
+               else
                        msg("dcs[%d]", pr->dcs);
-               }
+
                msg("number[%s]", pr->number);
 
-               if(pr->ton <= TAPI_SIM_TON_RESERVED_FOR_EXT) {
+               if (pr->ton <= TAPI_SIM_TON_RESERVED_FOR_EXT)
                        msg("ton[%d][%s]", pr->ton, dbg_pb_ton_name[pr->ton]);
-               } else {
+               else
                        msg("ton[%d]", pr->ton);
-               }
 
                if (pr->phonebook_type == TAPI_SIM_PB_3GSIM) {
                        msg("anr1[%s]", pr->anr1);
-                       if(pr->anr1_ton <= TAPI_SIM_TON_RESERVED_FOR_EXT) {
+                       if (pr->anr1_ton <= TAPI_SIM_TON_RESERVED_FOR_EXT)
                                msg("anr1_ton[%d][%s]", pr->anr1_ton, dbg_pb_ton_name[pr->anr1_ton]);
-                       } else {
+                       else
                                msg("anr1_ton[%d]", pr->anr1_ton);
-                       }
+
                        msg("anr2[%s]", pr->anr2);
-                       if(pr->anr2_ton <= TAPI_SIM_TON_RESERVED_FOR_EXT) {
+                       if (pr->anr2_ton <= TAPI_SIM_TON_RESERVED_FOR_EXT)
                                msg("anr2_ton[%d][%s]", pr->anr2_ton, dbg_pb_ton_name[pr->anr2_ton]);
-                       } else {
+                       else
                                msg("anr2_ton[%d]", pr->anr2_ton);
-                       }
+
                        msg("anr3[%s]", pr->anr3);
-                       if(pr->anr3_ton <= TAPI_SIM_TON_RESERVED_FOR_EXT) {
+                       if (pr->anr3_ton <= TAPI_SIM_TON_RESERVED_FOR_EXT)
                                msg("anr3_ton[%d][%s]", pr->anr3_ton, dbg_pb_ton_name[pr->anr3_ton]);
-                       } else {
+                       else
                                msg("anr3_ton[%d]", pr->anr3_ton);
-                       }
+
                        msg("email1[%s]", pr->email1);
                        msg("email2[%s]", pr->email2);
                        msg("email3[%s]", pr->email3);
@@ -305,31 +316,30 @@ static int run_pb_update_sim_pb_record(MManager *mm, struct menu_data *menu)
 
        pb.phonebook_type = atoi(data_pb_type);
        pb.index = atoi(data_pb_index);
-       snprintf((char*)pb.name, strlen(data_pb_name)+1, "%s", data_pb_name);
+       snprintf((char *)pb.name, strlen(data_pb_name)+1, "%s", data_pb_name);
        pb.dcs = atoi(data_pb_dcs);
-       snprintf((char*)pb.number, strlen(data_pb_number)+1, "%s", data_pb_number);
+       snprintf((char *)pb.number, strlen(data_pb_number)+1, "%s", data_pb_number);
        pb.ton = atoi(data_pb_ton);
 
        if (pb.phonebook_type == TAPI_SIM_PB_3GSIM) {
-               snprintf((char*)pb.anr1, strlen(data_pb_anr1) + 1, "%s", data_pb_anr1);
+               snprintf((char *)pb.anr1, strlen(data_pb_anr1) + 1, "%s", data_pb_anr1);
                pb.anr1_ton = data_pb_anr1_ton[0] - '0';
-               snprintf((char*)pb.anr2, strlen(data_pb_anr2) + 1, "%s", data_pb_anr2);
+               snprintf((char *)pb.anr2, strlen(data_pb_anr2) + 1, "%s", data_pb_anr2);
                pb.anr2_ton = data_pb_anr2_ton[0] - '0';
-               snprintf((char*)pb.anr3, strlen(data_pb_anr3) + 1, "%s", data_pb_anr3);
+               snprintf((char *)pb.anr3, strlen(data_pb_anr3) + 1, "%s", data_pb_anr3);
                pb.anr3_ton = data_pb_anr3_ton[0] - '0';
-               snprintf((char*)pb.email1, strlen(data_pb_email1) + 1, "%s", data_pb_email1);
-               snprintf((char*)pb.email2, strlen(data_pb_email2) + 1, "%s", data_pb_email2);
-               snprintf((char*)pb.email3, strlen(data_pb_email3) + 1, "%s", data_pb_email3);
-               snprintf((char*)pb.email4, strlen(data_pb_email4) + 1, "%s", data_pb_email4);
+               snprintf((char *)pb.email1, strlen(data_pb_email1) + 1, "%s", data_pb_email1);
+               snprintf((char *)pb.email2, strlen(data_pb_email2) + 1, "%s", data_pb_email2);
+               snprintf((char *)pb.email3, strlen(data_pb_email3) + 1, "%s", data_pb_email3);
+               snprintf((char *)pb.email4, strlen(data_pb_email4) + 1, "%s", data_pb_email4);
                pb.group_index = data_pb_group_index[0] - '0';
                pb.pb_control = data_pb_pb_control[0] - '0';
        }
 
-       if( pb.phonebook_type <= TAPI_SIM_PB_GAS){
+       if (pb.phonebook_type <= TAPI_SIM_PB_GAS)
                msg("phonebook_type[%d][%s]", pb.phonebook_type, dbg_pb_type_name[pb.phonebook_type]);
-       } else {
+       else
                msg("phonebook_type[%d]", pb.phonebook_type);
-       }
 
        rt = tel_update_sim_pb_record(handle, &pb, on_pb_update_sim_pb_record, NULL);
        CHECK_RT(rt);
@@ -361,85 +371,85 @@ static int run_pb_delete_sim_pb_record(MManager *mm, struct menu_data *menu)
 }
 
 static struct menu_data menu_pb_get_sim_pb_init_info[] = {
-               { "1", "run", NULL, run_pb_get_sim_pb_init_info, NULL },
-               { NULL, NULL, },
+       { "1", "run", NULL, run_pb_get_sim_pb_init_info, NULL },
+       { NULL, NULL, },
 };
 
 /*static struct menu_data menu_pb_select_sim_pb[] = {
-               { "1", "type- 0:fdn, 1:adn, 2:sdn, 3:usim, 4:aas, 5:gas", NULL, NULL, data_pb_type},
-               { "2", "run", NULL, run_pb_select_sim_pb, NULL },
-               { NULL, NULL, },
+       { "1", "type- 0:fdn, 1:adn, 2:sdn, 3:usim, 4:aas, 5:gas", NULL, NULL, data_pb_type},
+       { "2", "run", NULL, run_pb_select_sim_pb, NULL },
+       { NULL, NULL, },
 };*/
 
 static struct menu_data menu_pb_get_sim_pb_count[] = {
-               { "1", "type- 0:fdn, 1:adn, 2:sdn, 3:usim, 4:aas, 5:gas", NULL, NULL, data_pb_type },
-               { "2", "run", NULL, run_pb_get_sim_pb_count, NULL },
-               { NULL, NULL, },
+       { "1", "type- 0:fdn, 1:adn, 2:sdn, 3:usim, 4:aas, 5:gas", NULL, NULL, data_pb_type },
+       { "2", "run", NULL, run_pb_get_sim_pb_count, NULL },
+       { NULL, NULL, },
 };
 
 static struct menu_data menu_pb_get_sim_pb_meta_info[] = {
-               { "1", "type- 0:fdn, 1:adn, 2:sdn, 3:usim, 4:aas, 5:gas", NULL, NULL, data_pb_type },
-               { "2", "run", NULL, run_pb_get_sim_pb_meta_info,        NULL },
-               { NULL, NULL, },
+       { "1", "type- 0:fdn, 1:adn, 2:sdn, 3:usim, 4:aas, 5:gas", NULL, NULL, data_pb_type },
+       { "2", "run", NULL, run_pb_get_sim_pb_meta_info, NULL },
+       { NULL, NULL, },
 };
 
 static struct menu_data menu_pb_get_sim_pb_usim_meta_info[] = {
-               { "1", "run", NULL, run_pb_get_sim_pb_usim_meta_info, NULL },
-               { NULL, NULL, },
+       { "1", "run", NULL, run_pb_get_sim_pb_usim_meta_info, NULL },
+       { NULL, NULL, },
 };
 
 static struct menu_data menu_pb_read_sim_pb_record[] = {
-               { "1", "type- 0:fdn, 1:adn, 2:sdn, 3:usim, 4:aas, 5:gas", NULL, NULL, data_pb_type },
-               { "2", "index", NULL, NULL, data_pb_index },
-               { "3", "run", NULL, run_pb_read_sim_pb_record,  NULL },
-               { NULL, NULL, },
+       { "1", "type- 0:fdn, 1:adn, 2:sdn, 3:usim, 4:aas, 5:gas", NULL, NULL, data_pb_type },
+       { "2", "index", NULL, NULL, data_pb_index },
+       { "3", "run", NULL, run_pb_read_sim_pb_record, NULL },
+       { NULL, NULL, },
 };
 
 static struct menu_data menu_pb_update_sim_pb_record[] = {
-               { "1", "type- 0:fdn, 1:adn, 2:sdn, 3:usim, 4:aas, 5:gas", NULL, NULL, data_pb_type },
-               { "2", "index", NULL, NULL, data_pb_index },
-               { "3", "name", NULL, NULL, data_pb_name },
-               { "4", "dcs", NULL, NULL, data_pb_dcs },
-               { "5", "number", NULL, NULL, data_pb_number },
-               { "6", "ton", NULL, NULL, data_pb_ton },
-               { "7", "anr1", NULL, NULL, data_pb_anr1 },
-               { "8", "anr1_ton", NULL, NULL, data_pb_anr1_ton },
-               { "9", "anr2", NULL, NULL, data_pb_anr2 },
-               { "10", "anr2_ton", NULL, NULL, data_pb_anr2_ton },
-               { "11", "anr3", NULL, NULL, data_pb_anr3 },
-               { "12", "anr3_ton", NULL, NULL, data_pb_anr3_ton },
-               { "13", "email1", NULL, NULL, data_pb_email1 },
-               { "14", "email2", NULL, NULL, data_pb_email2 },
-               { "15", "email3", NULL, NULL, data_pb_email3 },
-               { "16", "email4", NULL, NULL, data_pb_email4 },
-               { "17", "group_index", NULL, NULL, data_pb_group_index },
-               { "18", "pb_control", NULL, NULL, data_pb_pb_control },
-               { "19", "run", NULL, run_pb_update_sim_pb_record, NULL },
-               { NULL, NULL, },
+       { "1", "type- 0:fdn, 1:adn, 2:sdn, 3:usim, 4:aas, 5:gas", NULL, NULL, data_pb_type },
+       { "2", "index", NULL, NULL, data_pb_index },
+       { "3", "name", NULL, NULL, data_pb_name },
+       { "4", "dcs", NULL, NULL, data_pb_dcs },
+       { "5", "number", NULL, NULL, data_pb_number },
+       { "6", "ton", NULL, NULL, data_pb_ton },
+       { "7", "anr1", NULL, NULL, data_pb_anr1 },
+       { "8", "anr1_ton", NULL, NULL, data_pb_anr1_ton },
+       { "9", "anr2", NULL, NULL, data_pb_anr2 },
+       { "10", "anr2_ton", NULL, NULL, data_pb_anr2_ton },
+       { "11", "anr3", NULL, NULL, data_pb_anr3 },
+       { "12", "anr3_ton", NULL, NULL, data_pb_anr3_ton },
+       { "13", "email1", NULL, NULL, data_pb_email1 },
+       { "14", "email2", NULL, NULL, data_pb_email2 },
+       { "15", "email3", NULL, NULL, data_pb_email3 },
+       { "16", "email4", NULL, NULL, data_pb_email4 },
+       { "17", "group_index", NULL, NULL, data_pb_group_index },
+       { "18", "pb_control", NULL, NULL, data_pb_pb_control },
+       { "19", "run", NULL, run_pb_update_sim_pb_record, NULL },
+       { NULL, NULL, },
 };
 
 static struct menu_data menu_pb_delete_sim_pb_record[] = {
-               { "1", "type- 0:fdn, 1:adn, 2:sdn, 3:usim, 4:aas, 5:gas", NULL, NULL, data_pb_type },
-               { "2", "index", NULL, NULL, data_pb_index },
-               { "3", "run", NULL, run_pb_delete_sim_pb_record, NULL },
-               { NULL, NULL, },
+       { "1", "type- 0:fdn, 1:adn, 2:sdn, 3:usim, 4:aas, 5:gas", NULL, NULL, data_pb_type },
+       { "2", "index", NULL, NULL, data_pb_index },
+       { "3", "run", NULL, run_pb_delete_sim_pb_record, NULL },
+       { NULL, NULL, },
 };
 
 struct menu_data menu_phonebook_common[] = {
-               { "1", "phonebook init info", menu_pb_get_sim_pb_init_info, NULL,       NULL },
-               { "2", "get pb count",  menu_pb_get_sim_pb_count, NULL, NULL },
-               { "3", "get pb meta info", menu_pb_get_sim_pb_meta_info, NULL, NULL },
-               { "4", "get usim pb meta info", menu_pb_get_sim_pb_usim_meta_info, NULL, NULL },
-               { "5", "read record", menu_pb_read_sim_pb_record, NULL, NULL },
-               { "6", "add/update record", menu_pb_update_sim_pb_record, NULL, NULL },
-               { "7", "delete record", menu_pb_delete_sim_pb_record, NULL, NULL },
-               { NULL, NULL, },
+       { "1", "phonebook init info", menu_pb_get_sim_pb_init_info, NULL, NULL },
+       { "2", "get pb count", menu_pb_get_sim_pb_count, NULL, NULL },
+       { "3", "get pb meta info", menu_pb_get_sim_pb_meta_info, NULL, NULL },
+       { "4", "get usim pb meta info", menu_pb_get_sim_pb_usim_meta_info, NULL, NULL },
+       { "5", "read record", menu_pb_read_sim_pb_record, NULL, NULL },
+       { "6", "add/update record", menu_pb_update_sim_pb_record, NULL, NULL },
+       { "7", "delete record", menu_pb_delete_sim_pb_record, NULL, NULL },
+       { NULL, NULL, },
 };
 
 struct menu_data menu_phonebook[] = {
-               {"1", "3GPP(WCDMA/GSM/LTE)" , menu_phonebook_common, NULL, NULL},
-               {"2", "3GPP2(CDMA)" , menu_phonebook_common, NULL, NULL},
-               { NULL, NULL, },
+       {"1", "3GPP(WCDMA/GSM/LTE)" , menu_phonebook_common, NULL, NULL},
+       {"2", "3GPP2(CDMA)" , menu_phonebook_common, NULL, NULL},
+       { NULL, NULL, },
 };
 
 
@@ -449,7 +459,10 @@ void register_phonebook_event(TapiHandle *handle)
 
        /* PHONEBOOK */
        ret = tel_register_noti_event(handle, TAPI_NOTI_PB_STATUS, on_noti_pb_status, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
+               msg("event register failed(%d)", ret);
+
+       ret = tel_register_noti_event(handle, TAPI_NOTI_PB_CONTACT_CHANGE, on_noti_pb_contact_change, NULL);
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 }
index a6165388e139a464f239f6f10662cc5cc0211cfe..6c1a78c2de78c9a9faaa42e5090d78004e8520ad 100644 (file)
@@ -41,7 +41,7 @@ static void on_noti_setup_menu(TapiHandle *handle, const char *noti_id, void *da
 
        msg("noti id (%s)", noti_id);
 
-       if(!data){
+       if (!data) {
                msg("noti data is null");
                return;
        }
@@ -51,9 +51,9 @@ static void on_noti_setup_menu(TapiHandle *handle, const char *noti_id, void *da
        msg("menu present (%d)", setup_menu->bIsMainMenuPresent);
        msg("menu title (%s)", setup_menu->satMainTitle);
        msg("item cnt (%d)", setup_menu->satMainMenuNum);
-       for(local_index=0;local_index < setup_menu->satMainMenuNum; local_index++){
+       for (local_index = 0; local_index < setup_menu->satMainMenuNum; local_index++)
                msg("item id(%d) (%s)", setup_menu->satMainMenuItem[local_index].itemId, setup_menu->satMainMenuItem[local_index].itemString);
-       }
+
        msg("menu help info (%d)", setup_menu->bIsSatMainMenuHelpInfo);
        msg("menu updated (%d)", setup_menu->bIsUpdatedSatMainMenu);
 }
@@ -64,7 +64,7 @@ static void on_noti_display_text(TapiHandle *handle, const char *noti_id, void *
 
        msg("noti id (%s)", noti_id);
 
-       if(!data){
+       if (!data) {
                msg("noti data is null");
                return;
        }
@@ -86,7 +86,7 @@ static void on_noti_select_item(TapiHandle *handle, const char *noti_id, void *d
 
        msg("noti id (%s)", noti_id);
 
-       if(!data){
+       if (!data) {
                msg("noti data is null");
                return;
        }
@@ -99,7 +99,7 @@ static void on_noti_select_item(TapiHandle *handle, const char *noti_id, void *d
        msg("string len(%d)", select_item->text.stringLen);
        msg("default item local_index(%d)", select_item->defaultItemIndex);
        msg("item count(%d)", select_item->menuItemCount);
-       for(local_index=0;local_index < select_item->menuItemCount; local_index++){
+       for (local_index = 0; local_index < select_item->menuItemCount; local_index++) {
                msg("item local_index(%d) id(%d) len(%d) str(%s)", local_index,
                        select_item->menuItem[local_index].itemId, select_item->menuItem[local_index].textLen, select_item->menuItem[local_index].text);
        }
@@ -119,9 +119,8 @@ static int run_sat_get_main_menu_info(MManager *mm, struct menu_data *menu)
        msg("call get main menu info()");
 
        result = tel_get_sat_main_menu_info(handle, &main_menu);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        msg("success to get main menu");
        return 0;
@@ -131,14 +130,14 @@ static int run_sat_select_menu(MManager *mm, struct menu_data *menu)
 {
        TapiHandle *handle = menu_manager_ref_user_data(mm);
        TelSatMenuSelectionReqInfo_t selected_menu;
-       int result, local_index=0;
+       int result, local_index = 0;
        int item_id;
 
        msg("call select menu()");
 
-       for(local_index=0;local_index < main_menu.satMainMenuNum; local_index++){
+       for (local_index = 0; local_index < main_menu.satMainMenuNum; local_index++)
                msg("item id(%d) (%s)", main_menu.satMainMenuItem[local_index].itemId, main_menu.satMainMenuItem[local_index].itemString);
-       }
+
        msg("select item >>> ");
        if (scanf("%d", &item_id) < 0) {
                msg("scanf() failed.");
@@ -150,9 +149,8 @@ static int run_sat_select_menu(MManager *mm, struct menu_data *menu)
 
        msg("selected item id (%d)", selected_menu.itemIdentifier);
        result = tel_select_sat_menu(handle, &selected_menu, on_resp_select_menu, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return 0;
 }
@@ -186,19 +184,16 @@ void register_sat_event(TapiHandle *handle)
 
        /* SAT */
        ret = tel_register_noti_event(handle, TAPI_NOTI_SAT_SETUP_MENU, on_noti_setup_menu, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_SAT_DISPLAY_TEXT, on_noti_display_text, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_SAT_SELECT_ITEM, on_noti_select_item, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        /*      ret = tel_register_noti_event(handle, TAPI_NOTI_SAT_GET_INKEY, on_noti_get_inkey, NULL);
        ret = tel_register_noti_event(handle, TAPI_NOTI_SAT_GET_INPUT, on_noti_get_input, NULL);*/
index ad06d847cca945f30b55618b175c988eb85756c2..37ac3a338628aaaddaa8e46a6533d1fa9f2d2224 100644 (file)
 
 #define CHECK_RT(x) \
 { \
-       if((x) != 0) { \
-               msg("api call failed with[%d]",x); \
+       if ((x) != 0) { \
+               msg("api call failed with[%d]", x); \
                return 0; \
        } \
 }
 
 #define CHECK_ACCESS_RT(x) \
 { \
-       if((x) != 0) { \
-               msg("api call failed with[%d]",x); \
+       if ((x) != 0) { \
+               msg("api call failed with[%d]", x); \
                return; \
        } \
 }
@@ -91,7 +91,7 @@ static char data_sim_set_mb_number[MENU_DATA_SIZE + 1] = { };
 static char data_sim_set_mb_cc_id[MENU_DATA_SIZE + 1] = { };
 static char data_sim_set_mb_ext1_id[MENU_DATA_SIZE + 1] = { };
 
-static char data_sim_req_authentication_type[MENU_DATA_SIZE + 1] = { 0x01, }; //SIM_AUTH_TYPE_GSM
+static char data_sim_req_authentication_type[MENU_DATA_SIZE + 1] = { 0x01, }; /* SIM_AUTH_TYPE_GSM */
 static char data_sim_req_authentication_autn_data[MENU_DATA_SIZE + 1] = { 200,
                200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200,
                200, };
@@ -122,7 +122,7 @@ static char data_sim_get_lock_type[MENU_DATA_SIZE + 1] = "1";
 
 static char data_sim_transmit_apdu_apdu[MENU_DATA_SIZE + 1] = "0070000000";
 
-static int _sim_str_to_hex (char a)
+static int _sim_str_to_hex(char a)
 {
        int ret = 0;
 
@@ -130,11 +130,10 @@ static int _sim_str_to_hex (char a)
                ret = a - '0';
        else if (a >= 'a' && a <= 'f')
                ret = a - 'a' + 10;
-       //printf("'%c' => %d(0x%x)\n", a, ret, ret);
        return ret;
 }
 
-static void on_noti_sim_status (TapiHandle *handle, const char *noti_id,
+static void on_noti_sim_status(TapiHandle *handle, const char *noti_id,
                void *data, void *user_data)
 {
        TelSimCardStatus_t *status = data;
@@ -149,21 +148,21 @@ static void on_noti_sim_cf_state(TapiHandle *handle, const char *noti_id,
 {
        int *status = data;
        msg("");
-       msgp ("property(%s) receive !!", TAPI_PROP_SIM_CALL_FORWARD_STATE);
-       if(status)
+       msgp("property(%s) receive !!", TAPI_PROP_SIM_CALL_FORWARD_STATE);
+       if (status)
                msg("status[%d]", *status);
 }
 
-static int run_sim_get_init_info (MManager *mm, struct menu_data *menu)
+static int run_sim_get_init_info(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
        TelSimCardStatus_t o_status = 0;
        gboolean o_new = FALSE;
 
        msg("call [%s] tapi service !!!", menu->title);
 
-       rt = tel_get_sim_init_info (handle, &o_status, &o_new);
+       rt = tel_get_sim_init_info(handle, &o_status, &o_new);
        CHECK_RT(rt);
 
        msg("status[%d]", o_status);
@@ -171,31 +170,31 @@ static int run_sim_get_init_info (MManager *mm, struct menu_data *menu)
        return 0;
 }
 
-static int run_sim_get_card_type (MManager *mm, struct menu_data *menu)
+static int run_sim_get_card_type(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
        TelSimCardType_t o_type = 0;
 
        msg("call [%s] tapi service !!!", menu->title);
 
-       rt = tel_get_sim_type (handle, &o_type);
+       rt = tel_get_sim_type(handle, &o_type);
        CHECK_RT(rt);
 
        msg("card type[%d]", o_type);
        return 0;
 }
 
-static int run_sim_get_imsi (MManager *mm, struct menu_data *menu)
+static int run_sim_get_imsi(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
        TelSimImsiInfo_t imsi;
-       memset (&imsi, 0, sizeof(TelSimImsiInfo_t));
+       memset(&imsi, 0, sizeof(TelSimImsiInfo_t));
 
        msg("call [%s] tapi service !!!", menu->title);
 
-       rt = tel_get_sim_imsi (handle, &imsi);
+       rt = tel_get_sim_imsi(handle, &imsi);
        CHECK_RT(rt);
 
        msg("mcc[%s]", imsi.szMcc);
@@ -204,17 +203,17 @@ static int run_sim_get_imsi (MManager *mm, struct menu_data *menu)
        return 0;
 }
 
-static int run_sim_get_ecc (MManager *mm, struct menu_data *menu)
+static int run_sim_get_ecc(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
        TelSimEccList_t ecc_list;
        int i = 0;
-       memset (&ecc_list, 0, sizeof(TelSimEccList_t));
+       memset(&ecc_list, 0, sizeof(TelSimEccList_t));
 
        msg("call [%s] tapi service !!!", menu->title);
 
-       rt = tel_get_sim_ecc (handle, &ecc_list);
+       rt = tel_get_sim_ecc(handle, &ecc_list);
        CHECK_RT(rt);
 
        msg("ecc_list.ecc_count[%d]", ecc_list.ecc_count);
@@ -227,7 +226,7 @@ static int run_sim_get_ecc (MManager *mm, struct menu_data *menu)
        return 0;
 }
 
-static void on_sim_get_iccid (TapiHandle *handle, int result, void *data,
+static void on_sim_get_iccid(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimAccessResult_t access_rt = result;
@@ -242,14 +241,14 @@ static void on_sim_get_iccid (TapiHandle *handle, int result, void *data,
        msg("iccid[%s]", iccid->icc_num);
 }
 
-static int run_sim_get_iccid (MManager *mm, struct menu_data *menu)
+static int run_sim_get_iccid(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
 
        msg("call [%s] tapi service !!!", menu->title);
 
-       rt = tel_get_sim_iccid (handle, on_sim_get_iccid, NULL );
+       rt = tel_get_sim_iccid(handle, on_sim_get_iccid, NULL);
        CHECK_RT(rt);
        return 0;
 }
@@ -276,7 +275,7 @@ static int run_sim_get_application_list(MManager *mm, struct menu_data *menu)
        return 0;
 }
 
-static void on_sim_get_language (TapiHandle *handle, int result, void *data,
+static void on_sim_get_language(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimLanguagePreferenceCode_t *language = data;
@@ -290,19 +289,19 @@ static void on_sim_get_language (TapiHandle *handle, int result, void *data,
        msg("language[%d]", *language);
 }
 
-static int run_sim_get_language (MManager *mm, struct menu_data *menu)
+static int run_sim_get_language(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
 
        msg("call [%s] tapi service !!!", menu->title);
 
-       rt = tel_get_sim_language (handle, on_sim_get_language, NULL );
+       rt = tel_get_sim_language(handle, on_sim_get_language, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_set_language (TapiHandle *handle, int result, void *data,
+static void on_sim_set_language(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimAccessResult_t access_rt = result;
@@ -314,20 +313,20 @@ static void on_sim_set_language (TapiHandle *handle, int result, void *data,
        msg("access_rt[%d]", access_rt);
 }
 
-static int run_sim_set_language (MManager *mm, struct menu_data *menu)
+static int run_sim_set_language(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
 
        msg("call [%s] tapi service !!!", menu->title);
        data_sim_set_language[0] = data_sim_set_language[0] - '0';
-       rt = tel_set_sim_language (handle, data_sim_set_language[0],
-                       on_sim_set_language, NULL );
+       rt = tel_set_sim_language(handle, data_sim_set_language[0],
+                       on_sim_set_language, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_get_cf (TapiHandle *handle, int result, void *data,
+static void on_sim_get_cf(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimAccessResult_t access_rt = result;
@@ -345,8 +344,7 @@ static void on_sim_get_cf (TapiHandle *handle, int result, void *data,
                msg("cf->cphs_cf.b_line2[%d]", cf->cphs_cf.b_line2);
                msg("cf->cphs_cf.b_fax[%d]", cf->cphs_cf.b_fax);
                msg("cf->cphs_cf.b_data[%d]", cf->cphs_cf.b_data);
-       }
-       else {
+       } else {
                for (i = 0; i < cf->cf_list.profile_count; i++) {
                        msg("cf->cf_list.cf[%d].rec_index[%d]", i,
                                        cf->cf_list.cf[i].rec_index);
@@ -363,18 +361,18 @@ static void on_sim_get_cf (TapiHandle *handle, int result, void *data,
        }
 }
 
-static int run_sim_get_cf (MManager *mm, struct menu_data *menu)
+static int run_sim_get_cf(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
 
        msg("call [%s] tapi service !!!", menu->title);
-       rt = tel_get_sim_callforwarding_info (handle, on_sim_get_cf, NULL );
+       rt = tel_get_sim_callforwarding_info(handle, on_sim_get_cf, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_set_cf (TapiHandle *handle, int result, void *data,
+static void on_sim_set_cf(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimAccessResult_t access_rt = result;
@@ -386,12 +384,12 @@ static void on_sim_set_cf (TapiHandle *handle, int result, void *data,
        msg("access_rt[%d]", access_rt);
 }
 
-static int run_sim_set_cf (MManager *mm, struct menu_data *menu)
+static int run_sim_set_cf(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
        TelSimCallForwardingReq_t cf;
-       memset (&cf, 0, sizeof(TelSimCallForwardingReq_t));
+       memset(&cf, 0, sizeof(TelSimCallForwardingReq_t));
 
        msg("call [%s] tapi service !!!", menu->title);
 
@@ -401,25 +399,24 @@ static int run_sim_set_cf (MManager *mm, struct menu_data *menu)
                cf.cf_data_u.cphs_cf.b_line2 = data_sim_set_cf_cphs_line2[0] - '0';
                cf.cf_data_u.cphs_cf.b_fax = data_sim_set_cf_cphs_fax[0] - '0';
                cf.cf_data_u.cphs_cf.b_data = data_sim_set_cf_cphs_data[0] - '0';
-       }
-       else {
+       } else {
                cf.cf_data_u.cf.rec_index = data_sim_set_cf_rec_index[0] - '0';
                cf.cf_data_u.cf.msp_num = data_sim_set_cf_msp_num[0] - '0';
                cf.cf_data_u.cf.cfu_status = data_sim_set_cf_cfu_status[0] - '0';
                cf.cf_data_u.cf.ton = data_sim_set_cf_ton[0] - '0';
                cf.cf_data_u.cf.npi = data_sim_set_cf_npi[0] - '0';
-               memcpy (&cf.cf_data_u.cf.cfu_num, data_sim_set_cf_number,
-                               sizeof (cf.cf_data_u.cf.cfu_num));
+               memcpy(&cf.cf_data_u.cf.cfu_num, data_sim_set_cf_number,
+                               sizeof(cf.cf_data_u.cf.cfu_num));
                cf.cf_data_u.cf.cc2_id = data_sim_set_cf_cc2_id[0] - '0';
                cf.cf_data_u.cf.ext7_id = data_sim_set_cf_ext7_id[0] - '0';
        }
 
-       rt = tel_set_sim_callforwarding_info (handle, &cf, on_sim_set_cf, NULL );
+       rt = tel_set_sim_callforwarding_info(handle, &cf, on_sim_set_cf, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_get_mw (TapiHandle *handle, int result, void *data,
+static void on_sim_get_mw(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimAccessResult_t access_rt = result;
@@ -438,8 +435,7 @@ static void on_sim_get_mw (TapiHandle *handle, int result, void *data,
                msg("mw->cphs_mw.b_voice2[%d]", mw->cphs_mw.b_voice2);
                msg("mw->cphs_mw.b_fax[%d]", mw->cphs_mw.b_fax);
                msg("mw->cphs_mw.b_data[%d]", mw->cphs_mw.b_data);
-       }
-       else {
+       } else {
                for (i = 0; i < mw->mw_list.profile_count; i++) {
                        msg("mw->mw_list.mw[%d].rec_index[%d]", i,
                                        mw->mw_list.mw[i].rec_index);
@@ -459,18 +455,18 @@ static void on_sim_get_mw (TapiHandle *handle, int result, void *data,
        }
 }
 
-static int run_sim_get_mw (MManager *mm, struct menu_data *menu)
+static int run_sim_get_mw(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
 
        msg("call [%s] tapi service !!!", menu->title);
-       rt = tel_get_sim_messagewaiting_info (handle, on_sim_get_mw, NULL );
+       rt = tel_get_sim_messagewaiting_info(handle, on_sim_get_mw, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_set_mw (TapiHandle *handle, int result, void *data,
+static void on_sim_set_mw(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimAccessResult_t access_rt = result;
@@ -482,13 +478,13 @@ static void on_sim_set_mw (TapiHandle *handle, int result, void *data,
        msg("access_rt[%d]", access_rt);
 }
 
-static int run_sim_set_mw (MManager *mm, struct menu_data *menu)
+static int run_sim_set_mw(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
        TelSimMessageWaitingReq_t mw;
 
-       memset (&mw, 0, sizeof(TelSimMessageWaitingReq_t));
+       memset(&mw, 0, sizeof(TelSimMessageWaitingReq_t));
 
        msg("call [%s] tapi service !!!", menu->title);
 
@@ -499,8 +495,7 @@ static int run_sim_set_mw (MManager *mm, struct menu_data *menu)
                mw.mw_data_u.cphs_mw.b_voice2 = data_sim_set_mw_cphs_voice2[0] - '0';
                mw.mw_data_u.cphs_mw.b_fax = data_sim_set_mw_cphs_fax[0] - '0';
                mw.mw_data_u.cphs_mw.b_data = data_sim_set_mw_cphs_data[0] - '0';
-       }
-       else {
+       } else {
                mw.mw_data_u.mw.rec_index = data_sim_set_mw_rec_index[0] - '0';
                mw.mw_data_u.mw.indicator_status = data_sim_set_mw_indicator_status[0]
                                - '0';
@@ -511,12 +506,12 @@ static int run_sim_set_mw (MManager *mm, struct menu_data *menu)
                mw.mw_data_u.mw.video_count = data_sim_set_mw_video_cnt[0] - '0';
        }
 
-       rt = tel_set_sim_messagewaiting_info (handle, &mw, on_sim_set_mw, NULL );
+       rt = tel_set_sim_messagewaiting_info(handle, &mw, on_sim_set_mw, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_get_mb (TapiHandle *handle, int result, void *data,
+static void on_sim_get_mb(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimAccessResult_t access_rt = result;
@@ -546,18 +541,18 @@ static void on_sim_get_mb (TapiHandle *handle, int result, void *data,
        }
 }
 
-static int run_sim_get_mb (MManager *mm, struct menu_data *menu)
+static int run_sim_get_mb(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
 
        msg("call [%s] tapi service !!!", menu->title);
-       rt = tel_get_sim_mailbox_info (handle, on_sim_get_mb, NULL );
+       rt = tel_get_sim_mailbox_info(handle, on_sim_get_mb, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_set_mb (TapiHandle *handle, int result, void *data,
+static void on_sim_set_mb(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimAccessResult_t access_rt = result;
@@ -569,35 +564,35 @@ static void on_sim_set_mb (TapiHandle *handle, int result, void *data,
        msg("access_rt[%d]", access_rt);
 }
 
-static int run_sim_set_mb (MManager *mm, struct menu_data *menu)
+static int run_sim_set_mb(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
        TelSimMailBoxNumber_t mb;
 
        msg("call [%s] tapi service !!!", menu->title);
 
-       memset (&mb, 0, sizeof(TelSimMailBoxNumber_t));
+       memset(&mb, 0, sizeof(TelSimMailBoxNumber_t));
 
        mb.b_cphs = data_sim_set_mb_b_cphs[0] - '0';
        mb.mb_type = data_sim_set_mb_type[0] - '0';
        mb.rec_index = data_sim_set_mb_rec_index[0] - '0';
        mb.profile_num = data_sim_set_mb_profile_num[0] - '0';
        mb.alpha_id_max_len = data_sim_set_mb_alpha_id_max_len[0] - '0';
-       memcpy (&mb.alpha_id, data_sim_set_mb_alpha_id,
+       memcpy(&mb.alpha_id, data_sim_set_mb_alpha_id,
                        TAPI_SIM_XDN_ALPHA_ID_MAX_LEN);
        mb.ton = data_sim_set_mb_ton[0] - '0';
        mb.npi = data_sim_set_mb_npi[0] - '0';
-       memcpy (&mb.num, data_sim_set_mb_number, sizeof (mb.num));
+       memcpy(&mb.num, data_sim_set_mb_number, sizeof(mb.num));
        mb.cc_id = data_sim_set_mb_cc_id[0] - '0';
        mb.ext1_id = data_sim_set_mb_ext1_id[0] - '0';
 
-       rt = tel_set_sim_mailbox_info (handle, &mb, on_sim_set_mb, NULL );
+       rt = tel_set_sim_mailbox_info(handle, &mb, on_sim_set_mb, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_get_cphs_info (TapiHandle *handle, int result, void *data,
+static void on_sim_get_cphs_info(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimAccessResult_t access_rt = result;
@@ -621,7 +616,7 @@ static void on_sim_get_cphs_info (TapiHandle *handle, int result, void *data,
                        cphs->CphsServiceTable.bInformationNumbers);
 }
 
-static void on_sim_get_service_table (TapiHandle *handle, int result,
+static void on_sim_get_service_table(TapiHandle *handle, int result,
                void *data, void *user_data)
 {
        TelSimAccessResult_t access_rt = result;
@@ -636,8 +631,8 @@ static void on_sim_get_service_table (TapiHandle *handle, int result,
        if (svct->sim_type == TAPI_SIM_CARD_TYPE_GSM) {
                int i = 0, size = sizeof(TelSimSST_t);
                char *temp = NULL;
-               if ( (temp = (char *) calloc (size + 1, 1)) != NULL ) {
-                       memcpy (temp, &svct->table.sst, size);
+               if ((temp = (char *)calloc(size + 1, 1)) != NULL) {
+                       memcpy(temp, &svct->table.sst, size);
                        for (i = 0; i < size; i++) {
                                if (temp[i] == 1)
                                        temp[i] = '1';
@@ -645,14 +640,13 @@ static void on_sim_get_service_table (TapiHandle *handle, int result,
                                        temp[i] = '0';
                        }
                        msg("svct->table.sst=[%s]", temp);
-                       free (temp);
+                       free(temp);
                }
-       }
-       else if (svct->sim_type == TAPI_SIM_CARD_TYPE_USIM) {
+       } else if (svct->sim_type == TAPI_SIM_CARD_TYPE_USIM) {
                int i = 0, size = sizeof(TelSimUST_t);
                char *temp = NULL;
-               if ( (temp = (char *) calloc (size + 1, 1)) != NULL ) {
-                       memcpy (temp, &svct->table.ust, size);
+               if ((temp = (char *)calloc(size + 1, 1)) != NULL) {
+                       memcpy(temp, &svct->table.ust, size);
                        for (i = 0; i < size; i++) {
                                if (temp[i] == 1)
                                        temp[i] = '1';
@@ -660,37 +654,36 @@ static void on_sim_get_service_table (TapiHandle *handle, int result,
                                        temp[i] = '0';
                        }
                        msg("svct->table.ust=[%s]", temp);
-                       free (temp);
+                       free(temp);
                }
-       }
-       else {
+       } else {
                msg("Unknown sim type");
        }
 }
 
-static int run_sim_get_cphs_info (MManager *mm, struct menu_data *menu)
+static int run_sim_get_cphs_info(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
 
        msg("call [%s] tapi service !!!", menu->title);
-       rt = tel_get_sim_cphs_info (handle, on_sim_get_cphs_info, NULL );
+       rt = tel_get_sim_cphs_info(handle, on_sim_get_cphs_info, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static int run_sim_get_service_table (MManager *mm, struct menu_data *menu)
+static int run_sim_get_service_table(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
 
        msg("call [%s] tapi service !!!", menu->title);
-       rt = tel_get_sim_service_table (handle, on_sim_get_service_table, NULL );
+       rt = tel_get_sim_service_table(handle, on_sim_get_service_table, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_get_msisdn (TapiHandle *handle, int result, void *data,
+static void on_sim_get_msisdn(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimAccessResult_t access_rt = result;
@@ -709,18 +702,18 @@ static void on_sim_get_msisdn (TapiHandle *handle, int result, void *data,
                                list->list[i].num);
 }
 
-static int run_sim_get_msisdn (MManager *mm, struct menu_data *menu)
+static int run_sim_get_msisdn(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
 
        msg("call [%s] tapi service !!!", menu->title);
-       rt = tel_get_sim_msisdn (handle, on_sim_get_msisdn, NULL );
+       rt = tel_get_sim_msisdn(handle, on_sim_get_msisdn, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_get_oplmnwact (TapiHandle *handle, int result, void *data,
+static void on_sim_get_oplmnwact(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimAccessResult_t access_rt = result;
@@ -740,18 +733,18 @@ static void on_sim_get_oplmnwact (TapiHandle *handle, int result, void *data,
        }
 }
 
-static int run_sim_get_oplmnwact (MManager *mm, struct menu_data *menu)
+static int run_sim_get_oplmnwact(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
 
        msg("call [%s] tapi service !!!", menu->title);
-       rt = tel_get_sim_oplmnwact (handle, on_sim_get_oplmnwact, NULL );
+       rt = tel_get_sim_oplmnwact(handle, on_sim_get_oplmnwact, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_get_spn (TapiHandle *handle, int result, void *data,
+static void on_sim_get_spn(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimAccessResult_t access_rt = result;
@@ -766,18 +759,18 @@ static void on_sim_get_spn (TapiHandle *handle, int result, void *data,
        msg("spn condition[0x%x]", spn_info->display_condition);
 }
 
-static int run_sim_get_spn (MManager *mm, struct menu_data *menu)
+static int run_sim_get_spn(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
 
        msg("call [%s] tapi service !!!", menu->title);
-       rt = tel_get_sim_spn (handle, on_sim_get_spn, NULL );
+       rt = tel_get_sim_spn(handle, on_sim_get_spn, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_get_cphs_netname (TapiHandle *handle, int result, void *data,
+static void on_sim_get_cphs_netname(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimAccessResult_t access_rt = result;
@@ -792,18 +785,18 @@ static void on_sim_get_cphs_netname (TapiHandle *handle, int result, void *data,
        msg("cphs short name[%s]", cphs_net->short_name);
 }
 
-static int run_sim_get_cphs_netname (MManager *mm, struct menu_data *menu)
+static int run_sim_get_cphs_netname(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
 
        msg("call [%s] tapi service !!!", menu->title);
-       rt = tel_get_sim_cphs_netname (handle, on_sim_get_cphs_netname, NULL );
+       rt = tel_get_sim_cphs_netname(handle, on_sim_get_cphs_netname, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_req_authentication (TapiHandle *handle, int result,
+static void on_sim_req_authentication(TapiHandle *handle, int result,
                void *data, void *user_data)
 {
        TelSimAccessResult_t access_rt = result;
@@ -848,12 +841,12 @@ static void on_sim_req_authentication (TapiHandle *handle, int result,
 
 }
 
-static int run_sim_req_authentication (MManager *mm, struct menu_data *menu)
+static int run_sim_req_authentication(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
        TelSimAuthenticationData_t auth;
-       memset (&auth, 0, sizeof(TelSimAuthenticationData_t));
+       memset(&auth, 0, sizeof(TelSimAuthenticationData_t));
 
        msg("call [%s] tapi service !!!", menu->title);
 
@@ -861,20 +854,20 @@ static int run_sim_req_authentication (MManager *mm, struct menu_data *menu)
                        - '0';
 
        auth.auth_type = data_sim_req_authentication_type[0];
-       auth.autn_length = strlen (data_sim_req_authentication_autn_data);
-       memcpy (&auth.autn_data, data_sim_req_authentication_autn_data,
+       auth.autn_length = strlen(data_sim_req_authentication_autn_data);
+       memcpy(&auth.autn_data, data_sim_req_authentication_autn_data,
                        auth.autn_length);
-       auth.rand_length = strlen (data_sim_req_authentication_rand_data);
-       memcpy (&auth.rand_data, data_sim_req_authentication_rand_data,
+       auth.rand_length = strlen(data_sim_req_authentication_rand_data);
+       memcpy(&auth.rand_data, data_sim_req_authentication_rand_data,
                        auth.rand_length);
 
-       rt = tel_req_sim_authentication (handle, &auth, on_sim_req_authentication,
-                       NULL );
+       rt = tel_req_sim_authentication(handle, &auth, on_sim_req_authentication,
+                       NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_security_op_resp (TapiHandle *handle, int result, void *data,
+static void on_sim_security_op_resp(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimPinOperationResult_t sec_rt = result;
@@ -884,7 +877,7 @@ static void on_sim_security_op_resp (TapiHandle *handle, int result, void *data,
 
        if (sec_rt == TAPI_SIM_PIN_INCORRECT_PASSWORD ||
                sec_rt == TAPI_SIM_PUK_INCORRECT_PASSWORD) {
-               msg("SIM operation: Password Incorrect[%d]",sec_rt);
+               msg("SIM operation: Password Incorrect[%d]", sec_rt);
        } else {
                CHECK_ACCESS_RT(sec_rt);
        }
@@ -894,41 +887,41 @@ static void on_sim_security_op_resp (TapiHandle *handle, int result, void *data,
        msg("rt->retry_count[%d]", rt->retry_count);
 }
 
-static int run_sim_verify_pins (MManager *mm, struct menu_data *menu)
+static int run_sim_verify_pins(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
        TelSimSecPw_t pwt;
-       memset (&pwt, 0, sizeof(TelSimSecPw_t));
+       memset(&pwt, 0, sizeof(TelSimSecPw_t));
 
        msg("call [%s] tapi service !!!", menu->title);
 
        data_sim_verify_pins_type[0] = data_sim_verify_pins_type[0] - '0';
        data_sim_verify_pins_pw[MENU_DATA_SIZE] = '\0';
        pwt.type = data_sim_verify_pins_type[0];
-       pwt.pw_len = strlen (data_sim_verify_pins_pw);
+       pwt.pw_len = strlen(data_sim_verify_pins_pw);
        pwt.pw = (unsigned char *) data_sim_verify_pins_pw;
 
-       rt = tel_verifiy_sim_pins (handle, &pwt, on_sim_security_op_resp, NULL );
+       rt = tel_verifiy_sim_pins(handle, &pwt, on_sim_security_op_resp, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static int run_sim_verify_puks (MManager *mm, struct menu_data *menu)
+static int run_sim_verify_puks(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
        TelSimSecPw_t puk_t;
        TelSimSecPw_t new_pin_t;
-       memset (&puk_t, 0, sizeof(TelSimSecPw_t));
-       memset (&new_pin_t, 0, sizeof(TelSimSecPw_t));
+       memset(&puk_t, 0, sizeof(TelSimSecPw_t));
+       memset(&new_pin_t, 0, sizeof(TelSimSecPw_t));
        msg("call [%s] tapi service !!!", menu->title);
 
        data_sim_verify_puks_type[0] = data_sim_verify_puks_type[0] - '0';
        data_sim_verify_puks_puk[MENU_DATA_SIZE] = '\0';
        puk_t.type = data_sim_verify_puks_type[0];
-       puk_t.pw_len = strlen (data_sim_verify_puks_puk);
-       puk_t.pw = (unsigned char*) data_sim_verify_puks_puk;
+       puk_t.pw_len = strlen(data_sim_verify_puks_puk);
+       puk_t.pw = (unsigned char *) data_sim_verify_puks_puk;
 
        if (puk_t.type == TAPI_SIM_PTYPE_PUK1)
                new_pin_t.type = TAPI_SIM_PTYPE_PIN1;
@@ -936,23 +929,23 @@ static int run_sim_verify_puks (MManager *mm, struct menu_data *menu)
                new_pin_t.type = TAPI_SIM_PTYPE_PIN2;
 
        data_sim_verify_puks_pin[MENU_DATA_SIZE] = '\0';
-       new_pin_t.pw_len = strlen (data_sim_verify_puks_pin);
-       new_pin_t.pw = (unsigned char*) data_sim_verify_puks_pin;
+       new_pin_t.pw_len = strlen(data_sim_verify_puks_pin);
+       new_pin_t.pw = (unsigned char *) data_sim_verify_puks_pin;
 
-       rt = tel_verify_sim_puks (handle, &puk_t, &new_pin_t,
-                       on_sim_security_op_resp, NULL );
+       rt = tel_verify_sim_puks(handle, &puk_t, &new_pin_t,
+                       on_sim_security_op_resp, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static int run_sim_change_pins (MManager *mm, struct menu_data *menu)
+static int run_sim_change_pins(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
        TelSimSecPw_t old;
        TelSimSecPw_t new;
-       memset (&old, 0, sizeof(TelSimSecPw_t));
-       memset (&new, 0, sizeof(TelSimSecPw_t));
+       memset(&old, 0, sizeof(TelSimSecPw_t));
+       memset(&new, 0, sizeof(TelSimSecPw_t));
 
        msg("call [%s] tapi service !!!", menu->title);
 
@@ -960,21 +953,21 @@ static int run_sim_change_pins (MManager *mm, struct menu_data *menu)
 
        data_sim_change_pins_old_pw[MENU_DATA_SIZE] = '\0';
        old.type = data_sim_change_pins_type[0];
-       old.pw_len = strlen (data_sim_change_pins_old_pw);
-       old.pw = (unsigned char*) data_sim_change_pins_old_pw;
+       old.pw_len = strlen(data_sim_change_pins_old_pw);
+       old.pw = (unsigned char *) data_sim_change_pins_old_pw;
 
        data_sim_change_pins_new_pw[MENU_DATA_SIZE] = '\0';
        new.type = data_sim_change_pins_type[0];
-       new.pw_len = strlen (data_sim_change_pins_new_pw);
-       new.pw = (unsigned char*) data_sim_change_pins_new_pw;
+       new.pw_len = strlen(data_sim_change_pins_new_pw);
+       new.pw = (unsigned char *) data_sim_change_pins_new_pw;
 
-       rt = tel_change_sim_pins (handle, &old, &new, on_sim_security_op_resp,
-                       NULL );
+       rt = tel_change_sim_pins(handle, &old, &new, on_sim_security_op_resp,
+                       NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_facility_op_resp (TapiHandle *handle, int result, void *data,
+static void on_sim_facility_op_resp(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimPinOperationResult_t sec_rt = result;
@@ -984,7 +977,7 @@ static void on_sim_facility_op_resp (TapiHandle *handle, int result, void *data,
 
        if (sec_rt == TAPI_SIM_PIN_INCORRECT_PASSWORD ||
                sec_rt == TAPI_SIM_PUK_INCORRECT_PASSWORD) {
-               msg("SIM operation: Password Incorrect[%d]",sec_rt);
+               msg("SIM operation: Password Incorrect[%d]", sec_rt);
        } else {
                CHECK_ACCESS_RT(sec_rt);
        }
@@ -994,52 +987,52 @@ static void on_sim_facility_op_resp (TapiHandle *handle, int result, void *data,
        msg("f_rt->retry_count[%d]", f_rt->retry_count);
 }
 
-static int run_sim_disable_facility (MManager *mm, struct menu_data *menu)
+static int run_sim_disable_facility(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
        TelSimFacilityPw_t fpw;
        msg("call [%s] tapi service !!!", menu->title);
 
-       memset (&fpw, 0, sizeof (fpw));
+       memset(&fpw, 0, sizeof(fpw));
 
        data_sim_disable_facility_type[0] = data_sim_disable_facility_type[0] - '0';
        data_sim_disable_facility_pw[MENU_DATA_SIZE] = '\0';
        fpw.lock_type = data_sim_disable_facility_type[0];
-       fpw.pw_len = strlen (data_sim_disable_facility_pw);
-       fpw.pw = (unsigned char*) data_sim_disable_facility_pw;
+       fpw.pw_len = strlen(data_sim_disable_facility_pw);
+       fpw.pw = (unsigned char *) data_sim_disable_facility_pw;
 
        msg("fpw.lock_type[%d], fpw.pw_len[%d], fpw.pw[%s]", fpw.lock_type,
                        fpw.pw_len, fpw.pw);
-       rt = tel_disable_sim_facility (handle, &fpw, on_sim_facility_op_resp,
-                       NULL );
+       rt = tel_disable_sim_facility(handle, &fpw, on_sim_facility_op_resp,
+                       NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static int run_sim_enable_facility (MManager *mm, struct menu_data *menu)
+static int run_sim_enable_facility(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
        TelSimFacilityPw_t fpw;
        msg("call [%s] tapi service !!!", menu->title);
 
-       memset (&fpw, 0, sizeof (fpw));
+       memset(&fpw, 0, sizeof(fpw));
 
        data_sim_enable_facility_type[0] = data_sim_enable_facility_type[0] - '0';
        data_sim_enable_facility_pw[MENU_DATA_SIZE] = '\0';
        fpw.lock_type = data_sim_enable_facility_type[0];
-       fpw.pw_len = strlen (data_sim_enable_facility_pw);
-       fpw.pw = (unsigned char*) data_sim_enable_facility_pw;
+       fpw.pw_len = strlen(data_sim_enable_facility_pw);
+       fpw.pw = (unsigned char *) data_sim_enable_facility_pw;
 
        msg("fpw.lock_type[%d], fpw.pw_len[%d], fpw.pw[%s]", fpw.lock_type,
                        fpw.pw_len, fpw.pw);
-       rt = tel_enable_sim_facility (handle, &fpw, on_sim_facility_op_resp, NULL );
+       rt = tel_enable_sim_facility(handle, &fpw, on_sim_facility_op_resp, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_get_facility (TapiHandle *handle, int result, void *data,
+static void on_sim_get_facility(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimPinOperationResult_t sec_rt = result;
@@ -1054,9 +1047,9 @@ static void on_sim_get_facility (TapiHandle *handle, int result, void *data,
        msg("fi->f_status[%d]", fi->f_status);
 }
 
-static int run_sim_get_facility (MManager *mm, struct menu_data *menu)
+static int run_sim_get_facility(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
        TelSimLockType_t t = 0;
        msg("call [%s] tapi service !!!", menu->title);
@@ -1064,41 +1057,48 @@ static int run_sim_get_facility (MManager *mm, struct menu_data *menu)
        data_sim_get_facility_type[0] = data_sim_get_facility_type[0] - '0';
 
        switch (data_sim_get_facility_type[0]) {
-               case 1:
-                       t = TAPI_SIM_LOCK_PS;
-                       break;
-               case 2:
-                       t = TAPI_SIM_LOCK_PF;
-                       break;
-               case 3:
-                       t = TAPI_SIM_LOCK_SC;
-                       break;
-               case 4:
-                       t = TAPI_SIM_LOCK_FD;
-                       break;
-               case 5:
-                       t = TAPI_SIM_LOCK_PN;
-                       break;
-               case 6:
-                       t = TAPI_SIM_LOCK_PU;
-                       break;
-               case 7:
-                       t = TAPI_SIM_LOCK_PP;
-                       break;
-               case 8:
-                       t = TAPI_SIM_LOCK_PC;
-                       break;
-               default:
-                       msg("not handled type[%d]", data_sim_get_facility_type[0])
-                       ;
-                       break;
+       case 1:
+               t = TAPI_SIM_LOCK_PS;
+       break;
+
+       case 2:
+               t = TAPI_SIM_LOCK_PF;
+       break;
+
+       case 3:
+               t = TAPI_SIM_LOCK_SC;
+       break;
+
+       case 4:
+               t = TAPI_SIM_LOCK_FD;
+       break;
+
+       case 5:
+               t = TAPI_SIM_LOCK_PN;
+       break;
+
+       case 6:
+               t = TAPI_SIM_LOCK_PU;
+       break;
+
+       case 7:
+               t = TAPI_SIM_LOCK_PP;
+       break;
+
+       case 8:
+               t = TAPI_SIM_LOCK_PC;
+       break;
+
+       default:
+               msg("not handled type[%d]", data_sim_get_facility_type[0]);
+       break;
        }
-       rt = tel_get_sim_facility (handle, t, on_sim_get_facility, NULL );
+       rt = tel_get_sim_facility(handle, t, on_sim_get_facility, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_get_lock_info (TapiHandle *handle, int result, void *data,
+static void on_sim_get_lock_info(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimPinOperationResult_t sec_rt = result;
@@ -1116,9 +1116,9 @@ static void on_sim_get_lock_info (TapiHandle *handle, int result, void *data,
        msg("lock->retry_count[%d]", lock->retry_count);
 }
 
-static int run_sim_get_lock_info (MManager *mm, struct menu_data *menu)
+static int run_sim_get_lock_info(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
        TelSimLockType_t t = 0;
        msg("call [%s] tapi service !!!", menu->title);
@@ -1126,41 +1126,48 @@ static int run_sim_get_lock_info (MManager *mm, struct menu_data *menu)
        data_sim_get_lock_type[0] = data_sim_get_lock_type[0] - '0';
 
        switch (data_sim_get_lock_type[0]) {
-               case 1:
-                       t = TAPI_SIM_LOCK_PS;
-                       break;
-               case 2:
-                       t = TAPI_SIM_LOCK_PF;
-                       break;
-               case 3:
-                       t = TAPI_SIM_LOCK_SC;
-                       break;
-               case 4:
-                       t = TAPI_SIM_LOCK_FD;
-                       break;
-               case 5:
-                       t = TAPI_SIM_LOCK_PN;
-                       break;
-               case 6:
-                       t = TAPI_SIM_LOCK_PU;
-                       break;
-               case 7:
-                       t = TAPI_SIM_LOCK_PP;
-                       break;
-               case 8:
-                       t = TAPI_SIM_LOCK_PC;
-                       break;
-               default:
-                       msg("not handled type[%d]", data_sim_get_lock_type[0])
-                       ;
-                       break;
+       case 1:
+               t = TAPI_SIM_LOCK_PS;
+       break;
+
+       case 2:
+               t = TAPI_SIM_LOCK_PF;
+       break;
+
+       case 3:
+               t = TAPI_SIM_LOCK_SC;
+       break;
+
+       case 4:
+               t = TAPI_SIM_LOCK_FD;
+       break;
+
+       case 5:
+               t = TAPI_SIM_LOCK_PN;
+       break;
+
+       case 6:
+               t = TAPI_SIM_LOCK_PU;
+       break;
+
+       case 7:
+               t = TAPI_SIM_LOCK_PP;
+       break;
+
+       case 8:
+               t = TAPI_SIM_LOCK_PC;
+       break;
+
+       default:
+               msg("not handled type[%d]", data_sim_get_lock_type[0]);
+       break;
        }
-       rt = tel_get_sim_lock_info (handle, t, on_sim_get_lock_info, NULL );
+       rt = tel_get_sim_lock_info(handle, t, on_sim_get_lock_info, NULL);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_transmit_apdu (TapiHandle *handle, int result, void *data,
+static void on_sim_transmit_apdu(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimAccessResult_t access_rt = result;
@@ -1179,44 +1186,46 @@ static void on_sim_transmit_apdu (TapiHandle *handle, int result, void *data,
        }
 }
 
-static int run_sim_transmit_apdu (MManager *mm, struct menu_data *menu)
+static int run_sim_transmit_apdu(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
        TelSimApdu_t t_apdu;
        unsigned char result_apdu[MENU_DATA_SIZE + 1] = { 0, };
        int i = 0, j = 0, len = 0, hex = 0;
 
-       memset (&t_apdu, 0, sizeof(TelSimApdu_t));
+       memset(&t_apdu, 0, sizeof(TelSimApdu_t));
 
        msg("call [%s] tapi service !!!", menu->title);
 
-       len = strlen (data_sim_transmit_apdu_apdu);
+       len = strlen(data_sim_transmit_apdu_apdu);
 
        for (i = 0, j = 0; i < len; i += 2, j++) {
-               hex = (_sim_str_to_hex (data_sim_transmit_apdu_apdu[i]) << 4)
-                               | (_sim_str_to_hex (data_sim_transmit_apdu_apdu[i + 1]));
-               printf ("0x%x\n", hex);
+               hex = (_sim_str_to_hex(data_sim_transmit_apdu_apdu[i]) << 4)
+                               | (_sim_str_to_hex(data_sim_transmit_apdu_apdu[i + 1]));
+               printf("0x%x\n", hex);
 
                result_apdu[j] = hex;
        }
 
-       for (i = 0; i < len / 2; i++) {
-               printf ("[%02d] = 0x%02x\n", i, result_apdu[i]);
-       }
+       for (i = 0; i < len / 2; i++)
+               printf("[%02d] = 0x%02x\n", i, result_apdu[i]);
 
        t_apdu.apdu_len = len / 2;
-       t_apdu.apdu = (unsigned char*) malloc (t_apdu.apdu_len);
-       memcpy (t_apdu.apdu, result_apdu, t_apdu.apdu_len);
+       t_apdu.apdu = (unsigned char *)malloc(t_apdu.apdu_len);
+       if (!t_apdu.apdu)
+               return 0;
 
-       rt = tel_req_sim_apdu (handle, &t_apdu, on_sim_transmit_apdu, NULL );
+       memcpy(t_apdu.apdu, result_apdu, t_apdu.apdu_len);
+
+       rt = tel_req_sim_apdu(handle, &t_apdu, on_sim_transmit_apdu, NULL);
        if (t_apdu.apdu)
                free(t_apdu.apdu);
        CHECK_RT(rt);
        return 0;
 }
 
-static void on_sim_get_atr (TapiHandle *handle, int result, void *data,
+static void on_sim_get_atr(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimAccessResult_t access_rt = result;
@@ -1246,7 +1255,7 @@ static int run_sim_get_atr(MManager *mm, struct menu_data *menu)
        return 0;
 }
 
-static void on_sim_set_power_state (TapiHandle *handle, int result, void *data,
+static void on_sim_set_power_state(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSimPowerSetResult_t access_rt = result;
@@ -1260,13 +1269,13 @@ static void on_sim_set_power_state (TapiHandle *handle, int result, void *data,
 
 static int run_sim_set_power_state(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int rt = 0;
 
        msg("call [%s] tapi service !!!", menu->title);
        data_sim_set_state[0] = data_sim_set_state[0] - '0';
-       rt = tel_set_sim_power_state (handle, data_sim_set_state[0],
-                       on_sim_set_power_state, NULL );
+       rt = tel_set_sim_power_state(handle, data_sim_set_state[0],
+                       on_sim_set_power_state, NULL);
        CHECK_RT(rt);
        return 0;
 }
@@ -1298,189 +1307,189 @@ static struct menu_data menu_sim_get_iccid[] = {
 };
 
 static struct menu_data menu_sim_get_language[] = {
-               {"1", "run", NULL, run_sim_get_language, NULL},
-               {NULL, NULL},
+       {"1", "run", NULL, run_sim_get_language, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_set_language[] = {
-               {"1", "select language", NULL, NULL, (char*)data_sim_set_language},
-               {"2", "run", NULL, run_sim_set_language, NULL},
-               {NULL, NULL},
+       {"1", "select language", NULL, NULL, (char *)data_sim_set_language},
+       {"2", "run", NULL, run_sim_set_language, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_change_state[] = {
-               {"1", "change state(0:OFF, 1:ON)", NULL, NULL, (char*)data_sim_set_state},
-               {"2", "run", NULL, run_sim_set_power_state, NULL},
-               {NULL, NULL},
+       {"1", "change state(0:OFF, 1:ON)", NULL, NULL, (char *)data_sim_set_state},
+       {"2", "run", NULL, run_sim_set_power_state, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_get_application_list[] = {
-               {"1", "run", NULL, run_sim_get_application_list, NULL},
-               {NULL, NULL},
+       {"1", "run", NULL, run_sim_get_application_list, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_get_cf[] = {
-               {"1", "run", NULL, run_sim_get_cf, NULL},
-               {NULL, NULL},
+       {"1", "run", NULL, run_sim_get_cf, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_set_cf[] = {
-               {"1", "b_cphs no/yes => 0/1", NULL, NULL, data_sim_set_cf_b_cphs},
-               {"2", "rec_index int", NULL, NULL, data_sim_set_cf_rec_index},
-               {"3", "msp_num int", NULL, NULL, data_sim_set_cf_msp_num},
-               {"4", "cfu_status int", NULL, NULL, data_sim_set_cf_cfu_status},
-               {"5", "ton int", NULL, NULL, data_sim_set_cf_ton},
-               {"6", "npi int", NULL, NULL, data_sim_set_cf_npi},
-               {"7", "number string", NULL, NULL, data_sim_set_cf_number},
-               {"8", "cc2_id int", NULL, NULL, data_sim_set_cf_cc2_id},
-               {"9", "ext7_id int", NULL, NULL, data_sim_set_cf_ext7_id},
-               {"10", "cphs_line1 no/yes => 0/1", NULL, NULL, data_sim_set_cf_cphs_line1},
-               {"11", "cphs_line2 no/yes => 0/1", NULL, NULL, data_sim_set_cf_cphs_line2},
-               {"12", "cphs_fax no/yes => 0/1", NULL, NULL, data_sim_set_cf_cphs_fax},
-               {"13", "cphs_data no/yes => 0/1", NULL, NULL, data_sim_set_cf_cphs_data},
-               {"14", "run", NULL, run_sim_set_cf, NULL},
-               {NULL, NULL},
+       {"1", "b_cphs no/yes => 0/1", NULL, NULL, data_sim_set_cf_b_cphs},
+       {"2", "rec_index int", NULL, NULL, data_sim_set_cf_rec_index},
+       {"3", "msp_num int", NULL, NULL, data_sim_set_cf_msp_num},
+       {"4", "cfu_status int", NULL, NULL, data_sim_set_cf_cfu_status},
+       {"5", "ton int", NULL, NULL, data_sim_set_cf_ton},
+       {"6", "npi int", NULL, NULL, data_sim_set_cf_npi},
+       {"7", "number string", NULL, NULL, data_sim_set_cf_number},
+       {"8", "cc2_id int", NULL, NULL, data_sim_set_cf_cc2_id},
+       {"9", "ext7_id int", NULL, NULL, data_sim_set_cf_ext7_id},
+       {"10", "cphs_line1 no/yes => 0/1", NULL, NULL, data_sim_set_cf_cphs_line1},
+       {"11", "cphs_line2 no/yes => 0/1", NULL, NULL, data_sim_set_cf_cphs_line2},
+       {"12", "cphs_fax no/yes => 0/1", NULL, NULL, data_sim_set_cf_cphs_fax},
+       {"13", "cphs_data no/yes => 0/1", NULL, NULL, data_sim_set_cf_cphs_data},
+       {"14", "run", NULL, run_sim_set_cf, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_get_mw[] = {
-               {"1", "run", NULL, run_sim_get_mw, NULL},
-               {NULL, NULL},
+       {"1", "run", NULL, run_sim_get_mw, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_set_mw[] = {
-               {"1", "b_cphs no/yes => 0/1", NULL, NULL, data_sim_set_mw_b_cphs},
-               {"2", "rec_index int", NULL, NULL, data_sim_set_mw_rec_index},
-               {"3", "indicator_status int", NULL, NULL, data_sim_set_mw_indicator_status},
-               {"4", "voice_cnt int", NULL, NULL, data_sim_set_mw_voice_cnt},
-               {"5", "fax_cnt int", NULL, NULL, data_sim_set_mw_fax_cnt},
-               {"6", "email_cnt int", NULL, NULL, data_sim_set_mw_email_cnt},
-               {"7", "other_cnt int", NULL, NULL, data_sim_set_mw_other_cnt},
-               {"8", "video_cnt int", NULL, NULL, data_sim_set_mw_video_cnt},
-               {"9", "cphs_voice1 no/yes => 0/1", NULL, NULL, data_sim_set_mw_cphs_voice1},
-               {"10", "cphs_voice2 no/yes => 0/1", NULL, NULL, data_sim_set_mw_cphs_voice2},
-               {"11", "cphs_fax no/yes => 0/1", NULL, NULL, data_sim_set_mw_cphs_fax},
-               {"12", "cphs_data no/yes => 0/1", NULL, NULL, data_sim_set_mw_cphs_data},
-               {"13", "run", NULL, run_sim_set_mw, NULL},
-               {NULL, NULL},
+       {"1", "b_cphs no/yes => 0/1", NULL, NULL, data_sim_set_mw_b_cphs},
+       {"2", "rec_index int", NULL, NULL, data_sim_set_mw_rec_index},
+       {"3", "indicator_status int", NULL, NULL, data_sim_set_mw_indicator_status},
+       {"4", "voice_cnt int", NULL, NULL, data_sim_set_mw_voice_cnt},
+       {"5", "fax_cnt int", NULL, NULL, data_sim_set_mw_fax_cnt},
+       {"6", "email_cnt int", NULL, NULL, data_sim_set_mw_email_cnt},
+       {"7", "other_cnt int", NULL, NULL, data_sim_set_mw_other_cnt},
+       {"8", "video_cnt int", NULL, NULL, data_sim_set_mw_video_cnt},
+       {"9", "cphs_voice1 no/yes => 0/1", NULL, NULL, data_sim_set_mw_cphs_voice1},
+       {"10", "cphs_voice2 no/yes => 0/1", NULL, NULL, data_sim_set_mw_cphs_voice2},
+       {"11", "cphs_fax no/yes => 0/1", NULL, NULL, data_sim_set_mw_cphs_fax},
+       {"12", "cphs_data no/yes => 0/1", NULL, NULL, data_sim_set_mw_cphs_data},
+       {"13", "run", NULL, run_sim_set_mw, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_get_mb[] = {
-               {"1", "run", NULL, run_sim_get_mb, NULL},
-               {NULL, NULL},
+       {"1", "run", NULL, run_sim_get_mb, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_set_mb[] = {
-               {"1", "b_cphs no/yes => 0/1", NULL, NULL, data_sim_set_mb_b_cphs},
-               {"2", "type 1voice 2voice2 3fax 4data 5email 6other  int", NULL, NULL, data_sim_set_mb_type},
-               {"3", "rec_index int", NULL, NULL, data_sim_set_mb_rec_index},
-               {"4", "profile_num int", NULL, NULL, data_sim_set_mb_profile_num},
-               {"5", "alpha_id_max_len int", NULL, NULL, data_sim_set_mb_alpha_id_max_len},
-               {"6", "alpha_id string", NULL, NULL, data_sim_set_mb_alpha_id},
-               {"7", "ton int", NULL, NULL, data_sim_set_mb_ton},
-               {"8", "npi int", NULL, NULL, data_sim_set_mb_npi},
-               {"9", "number string", NULL, NULL, data_sim_set_mb_number},
-               {"10", "cc_id int", NULL, NULL, data_sim_set_mb_cc_id},
-               {"11", "ext1_id int", NULL, NULL, data_sim_set_mb_ext1_id},
-               {"12", "run", NULL, run_sim_set_mb, NULL},
-               {NULL, NULL},
+       {"1", "b_cphs no/yes => 0/1", NULL, NULL, data_sim_set_mb_b_cphs},
+       {"2", "type 1voice 2voice2 3fax 4data 5email 6other  int", NULL, NULL, data_sim_set_mb_type},
+       {"3", "rec_index int", NULL, NULL, data_sim_set_mb_rec_index},
+       {"4", "profile_num int", NULL, NULL, data_sim_set_mb_profile_num},
+       {"5", "alpha_id_max_len int", NULL, NULL, data_sim_set_mb_alpha_id_max_len},
+       {"6", "alpha_id string", NULL, NULL, data_sim_set_mb_alpha_id},
+       {"7", "ton int", NULL, NULL, data_sim_set_mb_ton},
+       {"8", "npi int", NULL, NULL, data_sim_set_mb_npi},
+       {"9", "number string", NULL, NULL, data_sim_set_mb_number},
+       {"10", "cc_id int", NULL, NULL, data_sim_set_mb_cc_id},
+       {"11", "ext1_id int", NULL, NULL, data_sim_set_mb_ext1_id},
+       {"12", "run", NULL, run_sim_set_mb, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_get_cphs_info[] = {
-               {"1", "run", NULL, run_sim_get_cphs_info, NULL},
-               {NULL, NULL},
+       {"1", "run", NULL, run_sim_get_cphs_info, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_get_service_table[] = {
-               {"1", "run", NULL, run_sim_get_service_table, NULL},
-               {NULL, NULL},
+       {"1", "run", NULL, run_sim_get_service_table, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_get_msisdn[] = {
-               {"1", "run", NULL, run_sim_get_msisdn, NULL},
-               {NULL, NULL},
+       {"1", "run", NULL, run_sim_get_msisdn, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_get_oplmnwact[] = {
-               {"1", "run", NULL, run_sim_get_oplmnwact, NULL},
-               {NULL, NULL},
+       {"1", "run", NULL, run_sim_get_oplmnwact, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_get_spn[] = {
-               {"1", "run", NULL, run_sim_get_spn, NULL},
-               {NULL, NULL},
+       {"1", "run", NULL, run_sim_get_spn, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_get_cphs_netname[] = {
-               {"1", "run", NULL, run_sim_get_cphs_netname, NULL},
-               {NULL, NULL},
+       {"1", "run", NULL, run_sim_get_cphs_netname, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_req_authentication[] = {
-               {"1", "type", NULL, NULL, data_sim_req_authentication_type},
-               {"2", "autn_data", NULL, NULL, data_sim_req_authentication_autn_data},
-               {"3", "rand_data", NULL, NULL, data_sim_req_authentication_rand_data},
-               {"4", "run", NULL, run_sim_req_authentication, NULL},
-               {NULL, NULL},
+       {"1", "type", NULL, NULL, data_sim_req_authentication_type},
+       {"2", "autn_data", NULL, NULL, data_sim_req_authentication_autn_data},
+       {"3", "rand_data", NULL, NULL, data_sim_req_authentication_rand_data},
+       {"4", "run", NULL, run_sim_req_authentication, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_verify_pins[] = {
-               {"1", "type(0:pin1, 1:pin2, 6:sim)", NULL, NULL, data_sim_verify_pins_type},
-               {"2", "pw", NULL, NULL, data_sim_verify_pins_pw},
-               {"3", "run", NULL, run_sim_verify_pins, NULL},
-               {NULL, NULL},
+       {"1", "type(0:pin1, 1:pin2, 6:sim)", NULL, NULL, data_sim_verify_pins_type},
+       {"2", "pw", NULL, NULL, data_sim_verify_pins_pw},
+       {"3", "run", NULL, run_sim_verify_pins, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_verify_puks[] = {
-               {"1", "type(2:puk1, 3:puk2)", NULL, NULL, data_sim_verify_puks_type},
-               {"2", "puk", NULL, NULL, data_sim_verify_puks_puk},
-               {"3", "pin", NULL, NULL, data_sim_verify_puks_pin},
-               {"4", "run", NULL, run_sim_verify_puks, NULL},
-               {NULL, NULL},
+       {"1", "type(2:puk1, 3:puk2)", NULL, NULL, data_sim_verify_puks_type},
+       {"2", "puk", NULL, NULL, data_sim_verify_puks_puk},
+       {"3", "pin", NULL, NULL, data_sim_verify_puks_pin},
+       {"4", "run", NULL, run_sim_verify_puks, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_change_pins[] = {
-               {"1", "type(0:pin1, 1:pin2)", NULL, NULL, data_sim_change_pins_type},
-               {"2", "old_pw", NULL, NULL, data_sim_change_pins_old_pw},
-               {"3", "new_pw", NULL, NULL, data_sim_change_pins_new_pw},
-               {"4", "run", NULL, run_sim_change_pins, NULL},
-               {NULL, NULL},
+       {"1", "type(0:pin1, 1:pin2)", NULL, NULL, data_sim_change_pins_type},
+       {"2", "old_pw", NULL, NULL, data_sim_change_pins_old_pw},
+       {"3", "new_pw", NULL, NULL, data_sim_change_pins_new_pw},
+       {"4", "run", NULL, run_sim_change_pins, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_disable_facility[] = {
-               {"1", "type(1:simlock, 3:pinlock., 4:fdnlock, 5:net, 6:netsub, 7:sp, 8:cp)", NULL, NULL, data_sim_disable_facility_type},
-               {"2", "pw", NULL, NULL, data_sim_disable_facility_pw},
-               {"3", "run", NULL, run_sim_disable_facility, NULL},
-               {NULL, NULL},
+       {"1", "type(1:simlock, 3:pinlock., 4:fdnlock, 5:net, 6:netsub, 7:sp, 8:cp)", NULL, NULL, data_sim_disable_facility_type},
+       {"2", "pw", NULL, NULL, data_sim_disable_facility_pw},
+       {"3", "run", NULL, run_sim_disable_facility, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_enable_facility[] = {
-               {"1", "type(1:simlock, 3:pinlock., 4:fdnlock, 5:net, 6:netsub, 7:sp, 8:cp)", NULL, NULL, data_sim_enable_facility_type},
-               {"2", "pw", NULL, NULL, data_sim_enable_facility_pw},
-               {"3", "run", NULL, run_sim_enable_facility, NULL},
-               {NULL, NULL},
+       {"1", "type(1:simlock, 3:pinlock., 4:fdnlock, 5:net, 6:netsub, 7:sp, 8:cp)", NULL, NULL, data_sim_enable_facility_type},
+       {"2", "pw", NULL, NULL, data_sim_enable_facility_pw},
+       {"3", "run", NULL, run_sim_enable_facility, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_get_facility[] = {
-               {"1", "type(1:simlock, 3:pinlock., 4:fdnlock, 5:net, 6:netsub, 7:sp, 8:cp)", NULL, NULL, data_sim_get_facility_type},
-               {"2", "run", NULL, run_sim_get_facility, NULL},
-               {NULL, NULL},
+       {"1", "type(1:simlock, 3:pinlock., 4:fdnlock, 5:net, 6:netsub, 7:sp, 8:cp)", NULL, NULL, data_sim_get_facility_type},
+       {"2", "run", NULL, run_sim_get_facility, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_get_lock_info[] = {
-               {"1", "type(1:simlock, 3:pinlock., 4:fdnlock, 5:net, 6:netsub, 7:sp, 8:cp)", NULL, NULL, data_sim_get_lock_type},
-               {"2", "run", NULL, run_sim_get_lock_info, NULL},
-               {NULL, NULL},
+       {"1", "type(1:simlock, 3:pinlock., 4:fdnlock, 5:net, 6:netsub, 7:sp, 8:cp)", NULL, NULL, data_sim_get_lock_type},
+       {"2", "run", NULL, run_sim_get_lock_info, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_transmit_apdu[] = {
-               {"1", "apdu", NULL, NULL, data_sim_transmit_apdu_apdu},
-               {"2", "run", NULL, run_sim_transmit_apdu, NULL},
-               {NULL, NULL},
+       {"1", "apdu", NULL, NULL, data_sim_transmit_apdu_apdu},
+       {"2", "run", NULL, run_sim_transmit_apdu, NULL},
+       {NULL, NULL},
 };
 
 static struct menu_data menu_sim_get_atr[] = {
-               {"1", "run", NULL, run_sim_get_atr, NULL},
-               {NULL, NULL},
+       {"1", "run", NULL, run_sim_get_atr, NULL},
+       {NULL, NULL},
 };
 
 struct menu_data menu_sim_3gpp[] = {
@@ -1509,7 +1518,7 @@ struct menu_data menu_sim_3gpp[] = {
        {"23", "disable facility", menu_sim_disable_facility, NULL, NULL},
        {"24", "enable facility", menu_sim_enable_facility, NULL, NULL},
        {"25", "facility(en/dis status) info", menu_sim_get_facility, NULL, NULL},
-       {"26", "lock status(status,retry count) info", menu_sim_get_lock_info, NULL, NULL},
+       {"26", "lock status(status, retry count) info", menu_sim_get_lock_info, NULL, NULL},
        {"27", "apdu", menu_sim_transmit_apdu, NULL, NULL},
        {"28", "atr info", menu_sim_get_atr, NULL, NULL},
        {"29", "service table", menu_sim_get_service_table, NULL, NULL},
@@ -1533,7 +1542,7 @@ struct menu_data menu_sim_3gpp2[] = {
        {"12", "disable facility", menu_sim_disable_facility, NULL, NULL},
        {"13", "enable facility", menu_sim_enable_facility, NULL, NULL},
        {"14", "facility(en/dis status) info", menu_sim_get_facility, NULL, NULL},
-       {"15", "lock status(status,retry count) info", menu_sim_get_lock_info, NULL, NULL},
+       {"15", "lock status(status, retry count) info", menu_sim_get_lock_info, NULL, NULL},
        {"16", "apdu", menu_sim_transmit_apdu, NULL, NULL},
        {"17", "atr info", menu_sim_get_atr, NULL, NULL},
        {"18", "service table", menu_sim_get_service_table, NULL, NULL},
@@ -1546,16 +1555,15 @@ struct menu_data menu_sim[] = {
                { NULL, NULL, },
 };
 
-void register_sim_event (TapiHandle *handle)
+void register_sim_event(TapiHandle *handle)
 {
        int ret;
 
        /* SIM */
-       ret = tel_register_noti_event (handle, TAPI_NOTI_SIM_STATUS,
-                       on_noti_sim_status, NULL );
-       ret = tel_register_noti_event (handle, TAPI_PROP_SIM_CALL_FORWARD_STATE,
-                       on_noti_sim_cf_state, NULL );
-       if (ret != TAPI_API_SUCCESS) {
+       ret = tel_register_noti_event(handle, TAPI_NOTI_SIM_STATUS,
+                       on_noti_sim_status, NULL);
+       ret = tel_register_noti_event(handle, TAPI_PROP_SIM_CALL_FORWARD_STATE,
+                       on_noti_sim_cf_state, NULL);
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 }
index 87301d8b9d6eec391ace81671e3a6fae30073a91..fd7a50fd01c8b73dbe6833ee7533786074363ee4 100644 (file)
@@ -36,7 +36,7 @@
 #include "sms_util.h"
 #include "sms_util_cdma.h"
 
-// Global Variabl
+/* Global Variables */
 int dcs_pos = 0;
 unsigned int SmsMsgId = 0;
 unsigned char tp_mr = 0x00;
@@ -53,52 +53,59 @@ unsigned char tp_mr = 0x00;
 #define u16 uint16_t
 #define u8 uint8_t
 
-const char *cmdString[] = { "TAPI_SERVICE_SMS_SEND_UMTS_MSG",
-               "TAPI_SERVICE_SMS_READ_MSG", "TAPI_SERVICE_SMS_SAVE_MSG",
-               "TAPI_SERVICE_SMS_DELETE_MSG", "TAPI_SERVICE_SMS_GET_COUNT",
-               "TAPI_SERVICE_SMS_GET_SCA", "TAPI_SERVICE_SMS_SET_SCA",
-               "TAPI_SERVICE_SMS_GET_CB_CONFIG", "TAPI_SERVICE_SMS_SET_CB_CONFIG",
-               "TAPI_SERVICE_SMS_SET_MEM_STATUS", "TAPI_SERVICE_SMS_GET_PREF_BEARER",
-               "TAPI_SERVICE_SMS_SET_PREF_BEARER",
-               "TAPI_SERVICE_SMS_SET_DELIVERY_REPORT",
-               "TAPI_SERVICE_SMS_SET_MSG_STATUS", "TAPI_SERVICE_SMS_GET_PARAMS",
-               "TAPI_SERVICE_SMS_SET_PARAMS", "TAPI_SERVICE_SMS_GET_PARAMCNT",
-               "TAPI_SERVICE_SMS_SEND_CDMA_MSG" };
-
-static void on_resp_send_msg (TapiHandle *handle, int result, void *data,
+const char *cmdString[] = {
+       "TAPI_SERVICE_SMS_SEND_UMTS_MSG",
+       "TAPI_SERVICE_SMS_READ_MSG",
+       "TAPI_SERVICE_SMS_SAVE_MSG",
+       "TAPI_SERVICE_SMS_DELETE_MSG",
+       "TAPI_SERVICE_SMS_GET_COUNT",
+       "TAPI_SERVICE_SMS_GET_SCA",
+       "TAPI_SERVICE_SMS_SET_SCA",
+       "TAPI_SERVICE_SMS_GET_CB_CONFIG",
+       "TAPI_SERVICE_SMS_SET_CB_CONFIG",
+       "TAPI_SERVICE_SMS_SET_MEM_STATUS",
+       "TAPI_SERVICE_SMS_GET_PREF_BEARER",
+       "TAPI_SERVICE_SMS_SET_PREF_BEARER",
+       "TAPI_SERVICE_SMS_SET_DELIVERY_REPORT",
+       "TAPI_SERVICE_SMS_SET_MSG_STATUS",
+       "TAPI_SERVICE_SMS_GET_PARAMS",
+       "TAPI_SERVICE_SMS_SET_PARAMS",
+       "TAPI_SERVICE_SMS_GET_PARAMCNT",
+       "TAPI_SERVICE_SMS_SEND_CDMA_MSG"
+};
+
+static void on_resp_send_msg(TapiHandle *handle, int result, void *data,
                void *user_data);
-static void on_resp_send_cdma_msg (TapiHandle *handle, int result, void *data,
+static void on_resp_send_cdma_msg(TapiHandle *handle, int result, void *data,
                void *user_data);
-static void on_resp_read_msg (TapiHandle *handle, int result, void *data,
+static void on_resp_read_msg(TapiHandle *handle, int result, void *data,
                void *user_data);
-static void on_resp_save_msg (TapiHandle *handle, int result, void *data,
+static void on_resp_save_msg(TapiHandle *handle, int result, void *data,
                void *user_data);
-static void on_resp_DeliverReport_msg (TapiHandle *handle, int result,
+static void on_resp_DeliverReport_msg(TapiHandle *handle, int result,
                void *data, void *user_data);
-int  _util_hexstring_to_asciistring(const unsigned char *hex_string, unsigned char *ascii_string,int hex_len);
+int  _util_hexstring_to_asciistring(const unsigned char *hex_string, unsigned char *ascii_string, int hex_len);
 
 unsigned int SmsUtilEncodeSca(TelSmsAddressInfo_t *sca, unsigned char *sca_num);
 
-static int CdmaCbSetting (MManager *mm, struct menu_data *menu);
+static int CdmaCbSetting(MManager *mm, struct menu_data *menu);
 
-int  _util_hexstring_to_asciistring(const unsigned char *hex_string, unsigned char *ascii_string,int hex_len)
+int  _util_hexstring_to_asciistring(const unsigned char *hex_string, unsigned char *ascii_string, int hex_len)
 {
-       int i,ascii_len;
+       int i, ascii_len;
 
-       if(hex_string[hex_len-1]>>4 == 0x0f ) {
-               ascii_len = (hex_len * 2 ) -1;
-       }else {
-               ascii_len = (hex_len * 2 );
-       }
+       if (hex_string[hex_len - 1]>>4 == 0x0f)
+               ascii_len = (hex_len * 2) - 1;
+       else
+               ascii_len = (hex_len * 2);
 
-       for (i =0; i < ascii_len; i++ ) {
-               if (i % 2 == 0) {
-                       ascii_string[i]= (hex_string[i/2] & 0x0f)+ '0';
-               }else{
-                       ascii_string[i]=((hex_string[i/2]   >> 4 ))+ '0';
-               }
+       for (i = 0; i < ascii_len; i++) {
+               if (i % 2 == 0)
+                       ascii_string[i] = (hex_string[i/2] & 0x0f) + '0';
+               else
+                       ascii_string[i] = ((hex_string[i/2]   >> 4)) + '0';
        }
-       ascii_string[ascii_len]='\0';
+       ascii_string[ascii_len] = '\0';
        return ascii_len;
 }
 
@@ -112,7 +119,7 @@ unsigned int SmsUtilEncodeSca(TelSmsAddressInfo_t *sca, unsigned char *sca_num)
        sca->Ton = TAPI_SIM_TON_UNKNOWN;
        if (sca_num[0] == '+') {
                sca->Ton = TAPI_SIM_TON_INTERNATIONAL;
-               additional_len = 1;
+               additional_len = 1;
        }
        sca_length = strlen((char *)sca_num) - additional_len;
        if (sca_length % 2 == 0) {
@@ -121,7 +128,7 @@ unsigned int SmsUtilEncodeSca(TelSmsAddressInfo_t *sca, unsigned char *sca_num)
        } else {
                for (local_index = additional_len, j = 0; local_index < sca_length; local_index += 2, j++) {
                        if (local_index == (sca_length - 1))
-                               sca->szDiallingNum[j] = ((0xF0) | (sca_num[local_index] & 0x0F));
+                               sca->szDiallingNum[j] = ((0xF0) | (sca_num[local_index] & 0x0F));
                        else
                                sca->szDiallingNum[j] = ((sca_num[local_index+1] & 0X0F) << 4) | (sca_num[local_index] & 0x0F);
                }
@@ -133,31 +140,30 @@ unsigned int SmsUtilEncodeSca(TelSmsAddressInfo_t *sca, unsigned char *sca_num)
 }
 
 
-static BOOL EncodeCdmaSmsParamTeleservice(int teleservice_id ,ParamTeleserv_t *ParamTeleserv)
+static BOOL EncodeCdmaSmsParamTeleservice(int teleservice_id , ParamTeleserv_t *ParamTeleserv)
 {
        BOOL ret = FALSE;
 
-       if(ParamTeleserv == NULL) {
+       if (ParamTeleserv == NULL) {
                printf("[EncodeCdmaSmsParamTeleservice] NULL pointer  \n");
                return ret;
        }
 
-       switch(teleservice_id) {
-               case SMS_3GPP2_TELESERVICE_ID_CPT:
-               case SMS_3GPP2_TELESERVICE_ID_CCMT:
-               case SMS_3GPP2_TELESERVICE_ID_VMN:
-               case SMS_3GPP2_TELESERVICE_ID_WAP:
-                       ret = TRUE;
-               break;
-               default:
-                       ret = FALSE;
+       switch (teleservice_id) {
+       case SMS_3GPP2_TELESERVICE_ID_CPT:
+       case SMS_3GPP2_TELESERVICE_ID_CCMT:
+       case SMS_3GPP2_TELESERVICE_ID_VMN:
+       case SMS_3GPP2_TELESERVICE_ID_WAP:
+               ret = TRUE;
+       break;
+
+       default:
+               ret = FALSE;
        }
 
-       if(ret == TRUE) {
+       if (ret == TRUE) {
                ParamTeleserv->param_id = SMS_3GPP2_PARAM_ID_TELESERVICE_ID;
                ParamTeleserv->param_len = 2;
-               //ParamTeleserv->teleserv_id = teleservice_id;
-               //memcpy((&ParamTeleserv->teleserv_id), &teleservice_id, sizeof(unsigned short));
                ParamTeleserv->teleserv_id = teleservice_id;
                printf("ParamTeleserv->teleserv_id[%d]\n", ParamTeleserv->teleserv_id);
        }
@@ -168,13 +174,13 @@ static BOOL EncodeCdmaSmsParamMsgId(int type, ParamMsgId_t *ParamMsg)
 {
        BOOL ret = FALSE;
 
-       if(ParamMsg == NULL) {
+       if (ParamMsg == NULL) {
                printf("[EncodeCdmaSmsParamMsgId] NULL pointer  \n");
                return ret;
        }
 
        ParamMsg->param_id = SMS_3GPP2_BSUB_ID_MESSAGE_IDENTIFIER;
-       ParamMsg->param_len =3;
+       ParamMsg->param_len = 3;
        ParamMsg->type = type;
        ParamMsg->msg_id = SmsMsgId++;
 
@@ -183,12 +189,12 @@ static BOOL EncodeCdmaSmsParamMsgId(int type, ParamMsgId_t *ParamMsg)
        return ret;
 }
 
-static BOOL EncodeCdmaSmsParamUserData(charSendTxt, ParamUserData_t *ParamUser)
+static BOOL EncodeCdmaSmsParamUserData(char *SendTxt, ParamUserData_t *ParamUser)
 {
        BOOL ret = FALSE;
        int length = 0;
 
-       if(ParamUser == NULL || SendTxt == NULL) {
+       if (ParamUser == NULL || SendTxt == NULL) {
                printf("[EncodeCdmaSmsParamUserData] NULL pointer  \n");
                return ret;
        }
@@ -208,8 +214,8 @@ static BOOL EncodeCdmaSmsParamUserData(char* SendTxt, ParamUserData_t *ParamUser
        return ret;
 }
 
-static BOOL EncodeCdmaSmsSubmitTpdu (MManager *mm,
-       chardiallingNum, int dialNumLen, char *msgTxt, int msg_len)
+static BOOL EncodeCdmaSmsSubmitTpdu(MManager *mm,
+       char *diallingNum, int dialNumLen, char *msgTxt, int msg_len)
 {
        int ret, index = 0;
        unsigned char *encoded_msg, digit_mode_val = 0, number_mode_val = 0;
@@ -218,9 +224,9 @@ static BOOL EncodeCdmaSmsSubmitTpdu (MManager *mm,
        TelSmsDatapackageInfo_t data_package;
        u16 data;
 
-       ParamTeleserv_t param_teleservice = {0,};
-       ParamMsgId_t param_msg = {0,};
-       ParamUserData_t param_user = {0,};
+       ParamTeleserv_t param_teleservice = {0, };
+       ParamMsgId_t param_msg = {0, };
+       ParamUserData_t param_user = {0, };
 
        msg("EncodeCdmaSmsSubmitTpdu:Enter");
 
@@ -244,29 +250,29 @@ static BOOL EncodeCdmaSmsSubmitTpdu (MManager *mm,
        encoded_msg[index++] = SMS_PTP_MSG;
 
        /* 3GPP2 C.S0015-A section:3.4.3.1 Teleservice Identifier*/
-       //1 TeleService Identifier
+       /* 1 TeleService Identifier */
        {
                EncodeCdmaSmsParamTeleservice(SMS_3GPP2_TELESERVICE_ID_CCMT, &param_teleservice);
-               encoded_msg[index++] = param_teleservice.param_id;/*TeleService Identifier Tag e.g SMS_PARAMID_TELESERVICE_ID*/
-               encoded_msg[index++] = param_teleservice.param_len;/*TeleService Identifier Length*/
-               data=  htons(param_teleservice.teleserv_id);/*Conversion of Little Endian*/
+               encoded_msg[index++] = param_teleservice.param_id;  /*TeleService Identifier Tag e.g SMS_PARAMID_TELESERVICE_ID*/
+               encoded_msg[index++] = param_teleservice.param_len;  /*TeleService Identifier Length*/
+               data =  htons(param_teleservice.teleserv_id);  /*Conversion of Little Endian*/
                memcpy(encoded_msg + index, &(data), sizeof(unsigned short));
                index += sizeof(unsigned short);
        }
 
        /* 3GPP2 C.S0015-A section:3.4.3.3 Address Parameters*/
-       //1 Destination Address
+       /* 1 Destination Address */
        {
                int dest_addr_offset = 2, previous_addr_index;
                unsigned char num_fields[SMS_ADDRESS_LEN_MAX + 1] = { 0, };
 
                encoded_msg[index++] = SMS_3GPP2_PARAM_ID_DESTINATION_ADDRESS;
                /* Fill the length value at the end */
-               unsigned char *addr_len = &encoded_msg[index++];// param length
+               unsigned char *addr_len = &encoded_msg[index++]; /* param length */
                previous_addr_index = index;
 
-               encoded_msg[index]  = ((digit_mode_val << (DIGIT_MODE_OFFSET)) & DIGIT_MODE_BIT);
-               encoded_msg[index]  = ((number_mode_val << (NUMBER_MODE_OFFSET)) & NUMBER_MODE_BIT);
+               encoded_msg[index]  = ((digit_mode_val << (DIGIT_MODE_OFFSET)) & DIGIT_MODE_BIT);
+               encoded_msg[index]  = ((number_mode_val << (NUMBER_MODE_OFFSET)) & NUMBER_MODE_BIT);
 
                bitarray_copy(num_fields, 0, dialNumLen * CHAR_BIT, &encoded_msg[index], dest_addr_offset);
                index++;
@@ -274,22 +280,22 @@ static BOOL EncodeCdmaSmsSubmitTpdu (MManager *mm,
                bitarray_copy(hex_string, 0, dialNumLen * NIBBLE_BIT_LENGTH, &encoded_msg[index], dest_addr_offset);
 
                index += (dest_addr_offset + dialNumLen * NIBBLE_BIT_LENGTH) / 8 +
-                                                       ((dest_addr_offset + dialNumLen * NIBBLE_BIT_LENGTH) % 8? 1: 0);
+                       ((dest_addr_offset + dialNumLen * NIBBLE_BIT_LENGTH) % 8 ? 1 : 0);
 
-               /*Updating the Address Length*/
+               /* Updating the Address Length */
                *addr_len = index - previous_addr_index;
 
                msg("Dest addr final Index[%d] ", index);
                __util_hex_dump("    ", index, encoded_msg);
        }
 
-       //Bearer Data Options:
+       /* Bearer Data Options: */
        int bearer_data_previous_index;
        encoded_msg[index++] = SMS_3GPP2_PARAM_ID_BEARER_DATA;
        unsigned char *bearer_data_length = &encoded_msg[index++];
        bearer_data_previous_index = index;
        {
-               //1  Message Identifier
+               /* 1  Message Identifier */
                {
                        u8 offset = 4;
                        EncodeCdmaSmsParamMsgId(SMS_3GPP2_BSUB_TELSERVICE_MSG_TYPE_SUBMIT, &param_msg);
@@ -299,22 +305,22 @@ static BOOL EncodeCdmaSmsSubmitTpdu (MManager *mm,
 
                        /*Copying the Message ID*/
                        bitarray_copy((&param_msg.type), offset, NIBBLE_BIT_LENGTH, &encoded_msg[index], 0);
-                       param_msg.msg_id = htons(param_msg.msg_id );
+                       param_msg.msg_id = htons(param_msg.msg_id);
 
-                       bitarray_copy((unsigned char *)(&param_msg.msg_id), 0, sizeof(param_msg.msg_id)*CHAR_BIT, &encoded_msg[index], offset);
-                       param_msg.msg_id = ntohs(param_msg.msg_id );
+                       bitarray_copy((unsigned char *)(&param_msg.msg_id), 0, sizeof(param_msg.msg_id) * CHAR_BIT, &encoded_msg[index], offset);
+                       param_msg.msg_id = ntohs(param_msg.msg_id);
 
                        index += (offset + sizeof(param_msg.msg_id)*CHAR_BIT)/8 +
-                                                               (( (offset + sizeof(param_msg.msg_id)*CHAR_BIT)%8)?1:0);
+                               (((offset + sizeof(param_msg.msg_id)*CHAR_BIT)%8) ? 1 : 0);
 
                        msg("Message Identifier final Index[%d] ", index);
                        __util_hex_dump("    ", index, encoded_msg);
                }
 
                /*3GPP2 C.S0015-A section 4.5.2 User Data*/
-               //1 User Data
+               /* 1 User Data */
                {
-                       int message_type = 0, offset =5, prev_userdata_index;
+                       int message_type = 0, offset = 5, prev_userdata_index;
                        int current_index, i, initial_offset, index_data;
                        EncodeCdmaSmsParamUserData(msgTxt, &param_user);
                        encoded_msg[index++] = param_user.param_id;
@@ -328,7 +334,7 @@ static BOOL EncodeCdmaSmsSubmitTpdu (MManager *mm,
                                encoded_msg[index] = (encoded_msg[index]  & (0xF8)) | (message_type >> 5);
                                index++;
                                encoded_msg[index] = message_type << 3;
-                       }else {
+                       } else {
                                encoded_msg[index] = param_user.encoding << 3;
                        }
 
@@ -340,8 +346,8 @@ static BOOL EncodeCdmaSmsSubmitTpdu (MManager *mm,
                        current_index = index;
                        initial_offset = offset;
                        index_data = 0;
-                       for (i= 1; i <= param_user.len; i++) {
-                               bitarray_copy((const unsigned char*)&param_user.CHARi[i-1], 1, 7, (unsigned char*)&encoded_msg[current_index+index_data], offset);
+                       for (i = 1; i <= param_user.len; i++) {
+                               bitarray_copy((const unsigned char *)&param_user.CHARi[i-1], 1, 7, (unsigned char *)&encoded_msg[current_index+index_data], offset);
                                offset = (offset + 7) % 8;
                                index_data = (initial_offset + i * 7) / 8;
                        }
@@ -362,7 +368,7 @@ static BOOL EncodeCdmaSmsSubmitTpdu (MManager *mm,
        data_package.format = TAPI_NETTEXT_NETTYPE_3GPP2;
        data_package.MsgLength = index;
 
-       data_package.szData[data_package.MsgLength +1] = '\0';
+       data_package.szData[data_package.MsgLength + 1] = '\0';
 
        memcpy(&(data_package.szData), encoded_msg, data_package.MsgLength);
 
@@ -377,11 +383,11 @@ static BOOL EncodeCdmaSmsSubmitTpdu (MManager *mm,
        return TRUE;
 }
 
-static BOOL DecodeCellBroadcastMsg (int length, char * pPDU)
+static BOOL DecodeCellBroadcastMsg(int length, char *pPDU)
 {
        int msgLength;
-       int sn = 0; //serial number
-       int msgID; //message identifier
+       int sn = 0; /* serial number */
+       int msgID; /* message identifier */
        Sms_coding_scheme dcs;
 
        unsigned char page[2];
@@ -392,8 +398,8 @@ static BOOL DecodeCellBroadcastMsg (int length, char * pPDU)
        unsigned char msgCode;
        unsigned char updateNumber;
 
-       if (pPDU == NULL ) {
-               msg("pData is Null")
+       if (pPDU == NULL) {
+               msg("pData is Null");
                return FALSE;
        }
 
@@ -403,18 +409,18 @@ static BOOL DecodeCellBroadcastMsg (int length, char * pPDU)
        msg("$$$$$$$$$$$$$$$length of cb msg is %d", length);
        sn = (pPDU[2] << 8) | pPDU[1];
 
-       gs = (pPDU[2] & 0xC0) >> 6;  //bit 7, bit 6
+       gs = (pPDU[2] & 0xC0) >> 6;  /* bit 7, bit 6 */
 
-       msgCode = ( ( (pPDU[2] & 0x3F) << 4) | pPDU[3]) & 0xF0;
+       msgCode = (((pPDU[2] & 0x3F) << 4) | pPDU[3]) & 0xF0;
 
-       updateNumber = pPDU[3] & 0x0F;  //bit3, bit2, bit1, bit0
+       updateNumber = pPDU[3] & 0x0F;  /* bit3, bit2, bit1, bit0 */
 
        msgID = pPDU[4] << 4 | pPDU[3];
 
-       SmsUtilDecodeDCS (&dcs, pPDU[6]);
+       SmsUtilDecodeDCS(&dcs, pPDU[6]);
 
-       page[0] = pPDU[7] & 0x0F; //total page
-       page[1] = (pPDU[7] & 0xF0) >> 4; //current page
+       page[0] = pPDU[7] & 0x0F; /* total page */
+       page[1] = (pPDU[7] & 0xF0) >> 4; /* current page */
 
        msgLength = length - 2;
 
@@ -423,36 +429,35 @@ static BOOL DecodeCellBroadcastMsg (int length, char * pPDU)
        if (dcs.alphabet_type == SMS_ALPHABET_DEFAULT) {
                unsigned char inData[SMS_CB_SIZE_MAX + 1];
 
-               memset (inData, 0x00, SMS_CB_SIZE_MAX + 1);
+               memset(inData, 0x00, SMS_CB_SIZE_MAX + 1);
 
-               memcpy ((void*) inData, (void*) &pPDU[8], contents_length);
-               SmsUtilUnpackGSMCode (contents, &pPDU[8], msgLength);
-       }
-       else {
-               memcpy (contents, &pPDU[8], msgLength);
+               memcpy((void *)inData, (void *)&pPDU[8], contents_length);
+               SmsUtilUnpackGSMCode(contents, &pPDU[8], msgLength);
+       } else {
+               memcpy(contents, &pPDU[8], msgLength);
                contents[msgLength] = 0;
        }
 
-       printf ("*************************************\n");
-       printf ("serical number : 0x%04x \n", sn);
-       printf ("Geographical Scope: 0x%x\n", gs);
-       printf ("message code : 0x%x\n", msgCode);
-       printf ("update Number : 0x%x\n", updateNumber);
-       printf ("message identifier :  0x%x\n", msgID);
-       printf ("DCS-Commpressed?: %d (1: true)\n", dcs.bCompressed);
-       printf ("DCS-coding_group_type:  %x\n", dcs.coding_group_type);
-       printf ("contents bytes size : %d\n", contents_length);
-       printf ("page : (%d /%d) (page /total ) \n", page[1], page[0]);
-       printf ("contents: %s\n", contents);
-       printf ("*************************************\n");
+       printf("*************************************\n");
+       printf("serical number : 0x%04x \n", sn);
+       printf("Geographical Scope: 0x%x\n", gs);
+       printf("message code : 0x%x\n", msgCode);
+       printf("update Number : 0x%x\n", updateNumber);
+       printf("message identifier :  0x%x\n", msgID);
+       printf("DCS-Commpressed?: %d (1: true)\n", dcs.bCompressed);
+       printf("DCS-coding_group_type:  %x\n", dcs.coding_group_type);
+       printf("contents bytes size : %d\n", contents_length);
+       printf("page : (%d /%d) (page /total) \n", page[1], page[0]);
+       printf("contents: %s\n", contents);
+       printf("*************************************\n");
 
        return TRUE;
 }
 
-static BOOL EncodeSmsSubmitTpdu (MManager *mm, char* diallingNum,
-               int dialNumLen, charmsg, int msg_len)
+static BOOL EncodeSmsSubmitTpdu(MManager *mm, char *diallingNum,
+               int dialNumLen, char *msg, int msg_len)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
 
        TPDU_SMS_SUBMIT tpdu_submit;
 
@@ -461,10 +466,9 @@ static BOOL EncodeSmsSubmitTpdu (MManager *mm, char* diallingNum,
        unsigned char SCA[TAPI_NETTEXT_ADDRESS_LEN_MAX + 1];
        int ret = 0;
 
-       //      unsigned char tp_mr = 0x03;
        tp_mr++;
-       unsigned char tp_pid = 0; //reaplace type (65)
-       unsigned char tp_dcs; //=17; //class_1(17),class_2(18)
+       unsigned char tp_pid = 0; /* replace type (65) */
+       unsigned char tp_dcs; /* class_1(17), class_2(18) */
        unsigned char tp_vp;
 
        int local_index = 0, ScIndex = 0;
@@ -475,111 +479,100 @@ static BOOL EncodeSmsSubmitTpdu (MManager *mm, char* diallingNum,
 
        TelSmsDatapackageInfo_t *pDataPackage = NULL;
 
-       memset (packet, 0, TAPI_NETTEXT_MSG_SIZE_MAX);
+       memset(packet, 0, TAPI_NETTEXT_MSG_SIZE_MAX);
 
        /************SCA ADDRESS GET START**************/
        /*
-        returnStatus = TelTapiSmsGetSCA(&sc_addr,0);
-        printf("Service center addr returned from TAPI SCA address %s returnStatus %d\n",sc_addr.szDiallingNum,returnStatus);
-        SmsUtilDecodeAddrField(decodeScaAddr, &sc_addr.szDiallingNum[0],&sc_addr.Ton, &sc_addr.Npi);
-        sca_len = strlen( decodeScaAddr );
+        returnStatus = TelTapiSmsGetSCA(&sc_addr, 0);
+        printf("Service center addr returned from TAPI SCA address %s returnStatus %d\n", sc_addr.szDiallingNum, returnStatus);
+        SmsUtilDecodeAddrField(decodeScaAddr, &sc_addr.szDiallingNum[0], &sc_addr.Ton, &sc_addr.Npi);
+        sca_len = strlen(decodeScaAddr);
 
-        memcpy( SCA, decodeScaAddr, sca_len);
+        memcpy(SCA, decodeScaAddr, sca_len);
         SCA[sca_len] = '\0';
         */
        msg("Enter a Valid Service Centre Number  or Just Enter:");
-       memset (SCA, 0, sizeof (SCA));
+       memset(SCA, 0, sizeof(SCA));
 
-       ret = read (0, SCA, sizeof (SCA) - 1);
+       ret = read(0, SCA, sizeof(SCA) - 1);
        if (ret <= 0) {
                msg(" NULL msg can NOT be sent ");
                return -1;
        }
        SCA[ret] = '\0';
 
-       pDataPackage = malloc (sizeof(TelSmsDatapackageInfo_t));
-       memset (pDataPackage, 0, sizeof(TelSmsDatapackageInfo_t));
+       pDataPackage = malloc(sizeof(TelSmsDatapackageInfo_t));
+       if (!pDataPackage)
+               return -1;
 
-       sca_len = strlen ((char *) SCA) - 1;
+       memset(pDataPackage, 0, sizeof(TelSmsDatapackageInfo_t));
+
+       sca_len = strlen((char *)SCA) - 1;
 
        msg("Decode SCA Address =========");
        msg("SCA Number :%s, SCA Length :%d ", SCA, sca_len);
        msg("========================");
 
-       //SCA ADDRESS GET END
-
-       //SCA
+       /* SCA ADDRESS GET END */
 
-       //TODO : SCA
-
-       //      index +=SmsUtilEncodeAddrField(packet,SCA, strlen(SCA)  ,0x01,0x01);
-       ScIndex = SmsUtilEncodeAddrField ((unsigned char*) pDataPackage->Sca,
-                       (char *) SCA, sca_len, 0x00, 0x01);
+       ScIndex = SmsUtilEncodeAddrField((unsigned char *)pDataPackage->Sca,
+                       (char *)SCA, sca_len, 0x00, 0x01);
 
        msg("ScIndex is %d", ScIndex);
 
-       // TP-MTI, TP-RD, TP-VPF, TP-SRR, TP_UDHI, TP-RP
+       /* TP-MTI, TP-RD, TP-VPF, TP-SRR, TP_UDHI, TP-RP */
        tpdu_submit.msg_type = SMS_TPDU_SUBMIT;
-       tpdu_submit.rd = FALSE; //false :accept duplicate msg , true: reject duplicate msg
+       tpdu_submit.rd = FALSE; /* false :accept duplicate msg , true: reject duplicate msg */
        tpdu_submit.vpf = SMS_VP_RELATIVE;
-       tpdu_submit.srr = FALSE; //false :A status report is not requested , true: A status report is requested
-       tpdu_submit.udhi = FALSE; //false: contains only the short message , true :a Header in addition to the short message
-       tpdu_submit.rp = FALSE; //false :TP Reply Path parameter is not set in this SMS SUBMIT, true : TP Reply Path parameter is set in this SMS SUBMIT
+       tpdu_submit.srr = FALSE; /* false :A status report is not requested , true: A status report is requested */
+       tpdu_submit.udhi = FALSE; /* false: contains only the short message , true :a Header in addition to the short message */
+       tpdu_submit.rp = FALSE; /* false :TP Reply Path parameter is not set in this SMS SUBMIT, true : TP Reply Path parameter is set in this SMS SUBMIT */
 
-       packet[local_index] = tpdu_submit.msg_type;                                     // SUBMIT: bits 0, 1
-       packet[local_index] |= tpdu_submit.rd ? 0x04 : 0;                                               // bit 2
-       packet[local_index] |= tpdu_submit.vpf << 3;    // bits 3, 4
-       packet[local_index] |= tpdu_submit.srr ? 0x20 : 0;                                              // bit 5
-       packet[local_index] |= tpdu_submit.udhi ? 0x40 : 0;                                             // bit 6
-       packet[local_index] |= tpdu_submit.rp ? 0x80 : 0;                                               // bit 7
+       packet[local_index] = tpdu_submit.msg_type; /* SUBMIT: bits 0, 1 */
+       packet[local_index] |= tpdu_submit.rd ? 0x04 : 0; /* bit 2 */
+       packet[local_index] |= tpdu_submit.vpf << 3; /* bits 3, 4 */
+       packet[local_index] |= tpdu_submit.srr ? 0x20 : 0; /* bit 5 */
+       packet[local_index] |= tpdu_submit.udhi ? 0x40 : 0; /* bit 6 */
+       packet[local_index] |= tpdu_submit.rp ? 0x80 : 0; /* bit 7 */
 
        local_index++;
        msg("local_index of message ref is %d, msgref is %d", local_index, tp_mr);
        /* TP-MR */
        packet[local_index++] = tp_mr;
 
-       // TP-DA
-       local_index += SmsUtilEncodeAddrField (packet + local_index, diallingNum, dialNumLen, 0x01, 0x01);
-
-       //msg("DESTINATTION  ADDR Encoded =========");
+       /* TP-DA */
+       local_index += SmsUtilEncodeAddrField(packet + local_index, diallingNum, dialNumLen, 0x01, 0x01);
 
-       //TP-PID
+       /* TP-PID */
        packet[local_index++] = tp_pid;
 
-       // TP_DCS (Data Coding Scheme)
-
+       /* TP_DCS (Data Coding Scheme) */
        tpdu_submit.dcs.bCompressed = FALSE;
        tpdu_submit.dcs.bmsg_class_set = TRUE;
        tpdu_submit.dcs.coding_group_type = SMS_CODGRP_SM_GENERAL_DCS;
        tpdu_submit.dcs.alphabet_type = SMS_ALPHABET_DEFAULT;
        tpdu_submit.dcs.class_type = SMS_CLASS_1;
 
-       SmsUtilEncodeDCS (&tp_dcs, &tpdu_submit.dcs);
+       SmsUtilEncodeDCS(&tp_dcs, &tpdu_submit.dcs);
 
        packet[local_index++] = tp_dcs;
 
-       //msg("DCS Encoded:tp_dcs =%d =========",tp_dcs);
-
-       //TP-VP
-
+       /* TP-VP */
        tpdu_submit.vp.vp_rel_type = SMS_VP_REL_6H;
        tpdu_submit.vp.vp_type = SMS_VP_RELATIVE;
        tpdu_submit.vp.vpValue = 0xff;
 
-       SmsUtilEncodeValidity (&tp_vp, &tpdu_submit.vp);
+       SmsUtilEncodeValidity(&tp_vp, &tpdu_submit.vp);
 
-       //tp_vp =65;
        packet[local_index++] = tp_vp;
-       //msg("Validity Encoded :tp_vp =%d =========",tp_vp);
 
-       // UDL
+       /* UDL */
        packet[local_index++] = msg_len;
 
-       // TP-UD
-
+       /* TP-UD */
        if (tpdu_submit.dcs.alphabet_type == SMS_ALPHABET_DEFAULT) {
                int pos;
-               pos = SmsUtilPackGSMCode (packet + local_index, msg, msg_len);
+               pos = SmsUtilPackGSMCode(packet + local_index, msg, msg_len);
                local_index += pos;
        }
 
@@ -592,7 +585,7 @@ static BOOL EncodeSmsSubmitTpdu (MManager *mm, char* diallingNum,
        }
        msg("\n");
 
-       memcpy (pDataPackage->szData, packet, local_index);
+       memcpy(pDataPackage->szData, packet, local_index);
        pDataPackage->MsgLength = local_index;
 
        msg("***Sending the Message (Api:SendMsg)***");
@@ -602,41 +595,40 @@ static BOOL EncodeSmsSubmitTpdu (MManager *mm, char* diallingNum,
        pDataPackage->format = TAPI_NETTEXT_NETTYPE_3GPP;
        msg("Format : %d", pDataPackage->format);
 
-       returnStatus = tel_send_sms (handle, pDataPackage, 0, on_resp_send_msg, NULL );
+       returnStatus = tel_send_sms(handle, pDataPackage, 0, on_resp_send_msg, NULL);
 
        msg("SendMsg : returnStatus=%d requestId=%d", returnStatus, requestId);
 
-       free (pDataPackage);
+       free(pDataPackage);
 
        return TRUE;
 
 }
 
 
-static int DecodeSmsDeliverTpdu (int tpdu_len, char* pTPDU)
+static int DecodeSmsDeliverTpdu(int tpdu_len, char *pTPDU)
 {
        TPDU_SMS_DELIVER tpdu_deliver;
        TmDateTime SCTimeStamp;
        int orgAddr_len = 0;
        char diallingNum[SMS_ADDRESS_LEN_MAX + 1];
-       char orgAddr[SMS_ADDRESS_LEN_MAX + 1]; //originating number
+       char orgAddr[SMS_ADDRESS_LEN_MAX + 1]; /* originating number */
        int org_ton, org_npi;
        int position = 0;
 
        /* TP-MTI, TP-MMS, TP-SRI, TP_UDHI, TP-RP */
        tpdu_deliver.msg_type = SMS_TPDU_DELIVER;
-       tpdu_deliver.mms = (pTPDU[position] & 0x04) ? TRUE : FALSE; // bit 2 (Message Type Indicator)
-       tpdu_deliver.sri = (pTPDU[position] & 0x20) ? TRUE : FALSE;     // bit 5 (Status Report Indication)
-       tpdu_deliver.udhi = (pTPDU[position] & 0x40) ? TRUE : FALSE;// bit 6 (User Data Header Indicator)
-       tpdu_deliver.rp = (pTPDU[position] & 0x80) ? TRUE : FALSE;// bit 7 (Reply Path)
+       tpdu_deliver.mms = (pTPDU[position] & 0x04) ? TRUE : FALSE; /* bit 2 (Message Type Indicator) */
+       tpdu_deliver.sri = (pTPDU[position] & 0x20) ? TRUE : FALSE; /* bit 5 (Status Report Indication) */
+       tpdu_deliver.udhi = (pTPDU[position] & 0x40) ? TRUE : FALSE; /* bit 6 (User Data Header Indicator) */
+       tpdu_deliver.rp = (pTPDU[position] & 0x80) ? TRUE : FALSE; /* bit 7 (Reply Path) */
 
        position++;
 
        /* TP-OA */
+       memset(diallingNum, 0, sizeof(diallingNum));
 
-       memset (diallingNum, 0, sizeof (diallingNum));
-
-       orgAddr_len = SmsUtilDecodeAddrField (diallingNum, &pTPDU[position],
+       orgAddr_len = SmsUtilDecodeAddrField(diallingNum, &pTPDU[position],
                        &org_ton, &org_npi);
        if (orgAddr_len > SMS_ADDRESS_LEN_MAX - 1)
                orgAddr_len = SMS_ADDRESS_LEN_MAX - 1;
@@ -652,11 +644,10 @@ static int DecodeSmsDeliverTpdu (int tpdu_len, char* pTPDU)
 
        if (org_ton == SMS_TON_INTERNATIONAL) {
                orgAddr[0] = '+';
-               memcpy (&orgAddr[1], diallingNum, orgAddr_len - 1);
+               memcpy(&orgAddr[1], diallingNum, orgAddr_len - 1);
                orgAddr[orgAddr_len + 1] = '\0';
-       }
-       else {
-               memcpy (orgAddr, diallingNum, orgAddr_len);
+       } else {
+               memcpy(orgAddr, diallingNum, orgAddr_len);
                orgAddr[orgAddr_len] = '\0';
        }
 
@@ -666,12 +657,12 @@ static int DecodeSmsDeliverTpdu (int tpdu_len, char* pTPDU)
        position++;
 
        /* TP-DCS */
-       SmsUtilDecodeDCS (&tpdu_deliver.dcs, pTPDU[position]);
+       SmsUtilDecodeDCS(&tpdu_deliver.dcs, pTPDU[position]);
        dcs_pos = position;
        position++;
 
        /* TP-SCTS */
-       SmsUtilDecodeTimeStamp (&pTPDU[position], &SCTimeStamp);
+       SmsUtilDecodeTimeStamp(&pTPDU[position], &SCTimeStamp);
 
        position += 7;
 
@@ -684,67 +675,63 @@ static int DecodeSmsDeliverTpdu (int tpdu_len, char* pTPDU)
        position++;
 
        /* TP-UD */
-       tpdu_deliver.userData = malloc (
-                       sizeof(unsigned char) * (SMS_SMDATA_SIZE_MAX + 1));
+       tpdu_deliver.userData = malloc(sizeof(unsigned char) * (SMS_SMDATA_SIZE_MAX + 1));
+       if (!tpdu_deliver.userData)
+               return 0;
 
-       memset (tpdu_deliver.userData, 0,
-                       sizeof(unsigned char) * (SMS_SMDATA_SIZE_MAX + 1));
+       memset(tpdu_deliver.userData, 0,
+               sizeof(unsigned char) * (SMS_SMDATA_SIZE_MAX + 1));
 
        if (tpdu_deliver.dcs.alphabet_type == SMS_ALPHABET_DEFAULT) {
                char inData[SMS_SMDATA_SIZE_MAX + 1];
 
-               memset (inData, 0x00, SMS_SMDATA_SIZE_MAX + 1);
+               memset(inData, 0x00, SMS_SMDATA_SIZE_MAX + 1);
 
-               memcpy ((void*) inData, (void*) &pTPDU[position], tpdu_deliver.udl);
+               memcpy((void *)inData, (void *)&pTPDU[position], tpdu_deliver.udl);
 
-               SmsUtilUnpackGSMCode (tpdu_deliver.userData, inData,
+               SmsUtilUnpackGSMCode(tpdu_deliver.userData, inData,
                                (unsigned char) tpdu_deliver.udl);
        }
 
        msg("*************************************");
        msg("Msg Type: TPDU_DELIVER");
 
-       if (tpdu_deliver.rp) {
-               msg("RP: Set Reply Path")
-       }
-       else if (!tpdu_deliver.rp) {
-               msg("RP: Not set Reply Path")
-       }
+       if (tpdu_deliver.rp)
+               msg("RP: Set Reply Path");
+       else if (!tpdu_deliver.rp)
+               msg("RP: Not set Reply Path");
 
-       if (tpdu_deliver.sri) {
-               msg("SRI: A status report shall be returned to the SME")
-       }
-       else if (!tpdu_deliver.sri) {
-               msg("SRI: A status report shall be not returned to the SME")
-       }
+       if (tpdu_deliver.sri)
+               msg("SRI: A status report shall be returned to the SME");
+       else if (!tpdu_deliver.sri)
+               msg("SRI: A status report shall be not returned to the SME");
 
-       if (tpdu_deliver.mms) {
-               msg("MMS: No more messages are waiting for the MS in this SC")
-       }
-       else if (!tpdu_deliver.mms) {
-               msg("MMS: More messages are waiting for the MS in this SC")
-       }
+       if (tpdu_deliver.mms)
+               msg("MMS: No more messages are waiting for the MS in this SC");
+       else if (!tpdu_deliver.mms)
+               msg("MMS: More messages are waiting for the MS in this SC");
 
-       if (tpdu_deliver.udhi) {
-               msg("UDHI: Contains a Header in addition to the short message.")
-       }
-       else if (!tpdu_deliver.udhi) {
-               msg("UDHI: Only short message.")
-       }
+       if (tpdu_deliver.udhi)
+               msg("UDHI: Contains a Header in addition to the short message.");
+       else if (!tpdu_deliver.udhi)
+               msg("UDHI: Only short message.");
 
        msg("DcsClass : %x (4 means Class None) ", tpdu_deliver.dcs.class_type);
 
        msg("From : %10s", orgAddr);
-       msg("Time : %d-%d-%d  , %d:%d:%d", SCTimeStamp.year, SCTimeStamp.month,
-                       SCTimeStamp.day, SCTimeStamp.hour, SCTimeStamp.minute,
-                       SCTimeStamp.second);
+       msg("Time : %d-%d-%d  , %d:%d:%d",
+               SCTimeStamp.year, SCTimeStamp.month,
+               SCTimeStamp.day, SCTimeStamp.hour, SCTimeStamp.minute, SCTimeStamp.second);
        msg("Message : %s ", tpdu_deliver.userData);
        msg("*************************************");
 
+       if (tpdu_deliver.userData)
+               free(tpdu_deliver.userData);
+
        return dcs_pos;
 }
 
-static int DecodeSmsStatusReportTpdu (int tpdu_len, char* pTPDU)
+static int DecodeSmsStatusReportTpdu(int tpdu_len, char *pTPDU)
 {
        TPDU_SMS_STATUS_REPORT status_report;
 
@@ -754,17 +741,17 @@ static int DecodeSmsStatusReportTpdu (int tpdu_len, char* pTPDU)
        int rcpAddr_len = 0;
        char diallingNum[SMS_ADDRESS_LEN_MAX];
 
-       char rcpAddr[SMS_ADDRESS_LEN_MAX]; //recipient number
+       char rcpAddr[SMS_ADDRESS_LEN_MAX]; /* recipient number */
        int rcp_ton, rcp_npi;
        int position = 0;
        unsigned int mask;
 
        /* TP-MTI, TP MMS, TP SRQ, TP_UDHI */
 
-       status_report.msg_type = pTPDU[position] & 0x03; // bit 0,1
-       status_report.mms = pTPDU[position] & 0x04 ? TRUE : FALSE; // bit 2
-       status_report.srq = pTPDU[position] & 0x20 ? TRUE : FALSE; //bit 5
-       status_report.udhi = pTPDU[position] & 0x40 ? TRUE : FALSE;      //bit 6
+       status_report.msg_type = pTPDU[position] & 0x03; /* bit 0, 1 */
+       status_report.mms = pTPDU[position] & 0x04 ? TRUE : FALSE; /* bit 2 */
+       status_report.srq = pTPDU[position] & 0x20 ? TRUE : FALSE; /* bit 5 */
+       status_report.udhi = pTPDU[position] & 0x40 ? TRUE : FALSE; /* bit 6 */
 
        position++;
 
@@ -773,14 +760,13 @@ static int DecodeSmsStatusReportTpdu (int tpdu_len, char* pTPDU)
        position++;
 
        /* TP-RA */
+       memset(diallingNum, 0, sizeof(diallingNum));
 
-       memset (diallingNum, 0, sizeof (diallingNum));
-
-       SmsUtilDecodeAddrField (diallingNum, &pTPDU[position], &rcp_ton, &rcp_npi);
+       SmsUtilDecodeAddrField(diallingNum, &pTPDU[position], &rcp_ton, &rcp_npi);
 
        position += 2;
 
-       rcpAddr_len = strlen ((char*) diallingNum);
+       rcpAddr_len = strlen((char *)diallingNum);
        if (rcpAddr_len % 2)
                position += rcpAddr_len / 2 + 1;
        else
@@ -788,25 +774,24 @@ static int DecodeSmsStatusReportTpdu (int tpdu_len, char* pTPDU)
 
        if (rcp_ton == SMS_TON_INTERNATIONAL) {
                rcpAddr[0] = '+';
-               memcpy (&rcpAddr[1], diallingNum, rcpAddr_len);
+               memcpy(&rcpAddr[1], diallingNum, rcpAddr_len);
                rcpAddr[rcpAddr_len + 1] = '\0';
-       }
-       else {
-               memcpy (rcpAddr, diallingNum, rcpAddr_len);
+       } else {
+               memcpy(rcpAddr, diallingNum, rcpAddr_len);
                rcpAddr[rcpAddr_len] = '\0';
        }
 
        status_report.rcpAddr.DialNumLen = rcpAddr_len;
-       memcpy (status_report.rcpAddr.szDiallingNum, rcpAddr, rcpAddr_len);
+       memcpy(status_report.rcpAddr.szDiallingNum, rcpAddr, rcpAddr_len);
        status_report.rcpAddr.Npi = rcp_npi;
        status_report.rcpAddr.Ton = rcp_ton;
 
        /* TP-SCTS */
-       SmsUtilDecodeTimeStamp (&pTPDU[position], &SCTimeStamp);
+       SmsUtilDecodeTimeStamp(&pTPDU[position], &SCTimeStamp);
        position += 7;
 
        /* TP-DT */
-       SmsUtilDecodeTimeStamp (&pTPDU[position], &DischargeTime);
+       SmsUtilDecodeTimeStamp(&pTPDU[position], &DischargeTime);
        position += 7;
 
        /* TP-ST */
@@ -818,7 +803,7 @@ static int DecodeSmsStatusReportTpdu (int tpdu_len, char* pTPDU)
 
        mask = status_report.paraInd;
 
-       if ( (mask != 0xFF) && (mask != 0)) {
+       if ((mask != 0xFF) && (mask != 0)) {
                /* Increment only if mask is valid */
                position++;
 
@@ -827,11 +812,13 @@ static int DecodeSmsStatusReportTpdu (int tpdu_len, char* pTPDU)
                        status_report.pId = pTPDU[position];
                        position++;
                }
+
                /* TP-DCS */
                if (mask & 0x02) {
-                       SmsUtilDecodeDCS (&status_report.dcs, pTPDU[position]);
+                       SmsUtilDecodeDCS(&status_report.dcs, pTPDU[position]);
                        position++;
                }
+
                if (mask & 0x04) {
                        /* TP-UDL */
                        status_report.udl = pTPDU[position];
@@ -839,22 +826,23 @@ static int DecodeSmsStatusReportTpdu (int tpdu_len, char* pTPDU)
 
                        /* TP-UD */
 
-                       status_report.userData = malloc (
-                                       sizeof(unsigned char) * (SMS_SMDATA_SIZE_MAX + 1));
+                       status_report.userData = malloc(sizeof(unsigned char) * (SMS_SMDATA_SIZE_MAX + 1));
+                       if (!status_report.userData)
+                               return -1;
 
-                       memset (status_report.userData, 0,
-                                       sizeof(unsigned char) * (SMS_SMDATA_SIZE_MAX + 1));
+                       memset(status_report.userData, 0,
+                               sizeof(unsigned char) * (SMS_SMDATA_SIZE_MAX + 1));
 
                        if (status_report.dcs.alphabet_type == SMS_ALPHABET_DEFAULT) {
                                char inData[SMS_SMDATA_SIZE_MAX + 1];
 
-                               memset (inData, 0x00, SMS_SMDATA_SIZE_MAX + 1);
+                               memset(inData, 0x00, SMS_SMDATA_SIZE_MAX + 1);
 
-                               memcpy ((void*) inData, (void*) &pTPDU[position],
+                               memcpy((void *)inData, (void *)&pTPDU[position],
                                                status_report.udl);
 
-                               SmsUtilUnpackGSMCode (status_report.userData, inData,
-                                               (unsigned char) status_report.udl);
+                               SmsUtilUnpackGSMCode(status_report.userData, inData,
+                                               (unsigned char)status_report.udl);
                        }
 
                }
@@ -862,67 +850,56 @@ static int DecodeSmsStatusReportTpdu (int tpdu_len, char* pTPDU)
 
        msg("*************************************");
        msg("Msg Type: STATUS_REPORT");
-       if (status_report.mms) {
-               msg("MMS: No more messages are waiting for the MS in this SC")
-       }
-       else if (!status_report.mms) {
-               msg("MMS: More messages are waiting for the MS in this SC")
-       }
+       if (status_report.mms)
+               msg("MMS: No more messages are waiting for the MS in this SC");
+       else if (!status_report.mms)
+               msg("MMS: More messages are waiting for the MS in this SC");
 
-       if (status_report.srq) {
-               msg("SRQ: the result of an SMS COMMAND ")
-       }
-       else if (!status_report.srq) {
-               msg("SRQ: the result of a SMS SUBMIT.")
-       }
+       if (status_report.srq)
+               msg("SRQ: the result of an SMS COMMAND ");
+       else if (!status_report.srq)
+               msg("SRQ: the result of a SMS SUBMIT.");
 
-       if (status_report.udhi) {
-               msg("UDHI: Contains a Header in addition to the short message.")
-       }
-       else if (!status_report.udhi) {
-               msg("UDHI: Only Short Message")
-       }
+       if (status_report.udhi)
+               msg("UDHI: Contains a Header in addition to the short message.");
+       else if (!status_report.udhi)
+               msg("UDHI: Only Short Message");
 
        msg("STATUS:%x", status_report.status);
-       if (status_report.status == 0x00) {
-               msg("STATUS : Short message received by the SME")
-       }
-       else if (status_report.status == 0x01) {
-               msg(
-                               "STATUS : Short message forwarded by the SC to the SMEbut the SC is unable to confirm delivery")
-       }
-       else if (status_report.status == 0x02) {
-               msg("STATUS : Short message replaced by the SC")
-       }
+       if (status_report.status == 0x00)
+               msg("STATUS : Short message received by the SME");
+       else if (status_report.status == 0x01)
+               msg("STATUS : Short message forwarded by the SC to the SMEbut the SC is unable to confirm delivery");
+       else if (status_report.status == 0x02)
+               msg("STATUS : Short message replaced by the SC");
 
        msg("Recipient Number : %s", rcpAddr);
-       msg("SC Time Stamp : %d-%d-%d  , %d:%d:%d", SCTimeStamp.year,
-                       SCTimeStamp.month, SCTimeStamp.day, SCTimeStamp.hour,
-                       SCTimeStamp.minute, SCTimeStamp.second);
-       msg("Discharge Time : %d-%d-%d  , %d:%d:%d", DischargeTime.year,
-                       DischargeTime.month, DischargeTime.day, DischargeTime.hour,
-                       DischargeTime.minute, DischargeTime.second);
+       msg("SC Time Stamp : %d-%d-%d  , %d:%d:%d",
+               SCTimeStamp.year, SCTimeStamp.month, SCTimeStamp.day,
+               SCTimeStamp.hour, SCTimeStamp.minute, SCTimeStamp.second);
+       msg("Discharge Time : %d-%d-%d  , %d:%d:%d",
+               DischargeTime.year, DischargeTime.month, DischargeTime.day,
+               DischargeTime.hour, DischargeTime.minute, DischargeTime.second);
 
        if (mask & 0x04)
                msg("Message : %s ", status_report.userData);
 
        msg("*************************************");
 
+       if (status_report.userData)
+               free(status_report.userData);
+
        return 1;
 }
 
-static void __on_noti_3gpp_sms_incoming_msg
-(
-       TapiHandle *handle,
-       TelSmsDatapackageInfo_t *datapackage,
-       void *user_data
-)
+static void __on_noti_3gpp_sms_incoming_msg(TapiHandle *handle, TelSmsDatapackageInfo_t *datapackage,
+       void *user_data)
 {
        int scaAddr_len = 0;
-       char * pTPDU;
+       char *pTPDU;
        int tpdu_len = 0;
        unsigned char diallingNum[TAPI_NETTEXT_ADDRESS_LEN_MAX + 1] = { 0, };
-       unsigned char scaAddr[TAPI_NETTEXT_SCADDRESS_LEN_MAX + 2] = { 0, }; //service center address
+       unsigned char scaAddr[TAPI_NETTEXT_SCADDRESS_LEN_MAX + 2] = { 0, }; /* Service Center Address */
        int sca_ton, sca_npi;
        int position;
        int offset = 0;
@@ -936,25 +913,23 @@ static void __on_noti_3gpp_sms_incoming_msg
        Sms_coding_scheme dcs;
        TapiResult_t returnStatus;
        int sca_length;
-       TelSmsDatapackageInfo_t * del_report = NULL;
-
        position = 0;
 
        msg("");
        msgb("event(%s) receive !!", TAPI_NOTI_SMS_INCOM_MSG);
 
-       memset (diallingNum, 0, sizeof (diallingNum));
+       memset(diallingNum, 0, sizeof(diallingNum));
 
        sca_length = datapackage->Sca[0];
 
-       sca_ton = (datapackage->Sca[offset +1] & 0x70) >> 4;
-       sca_npi = datapackage->Sca[offset +1] & 0x0F;
+       sca_ton = (datapackage->Sca[offset + 1] & 0x70) >> 4;
+       sca_npi = datapackage->Sca[offset + 1] & 0x0F;
 
        msg("TON %d", sca_ton);
        msg("NPI %d", sca_npi);
 
        /* Modem Send the hex encoded SCA Service center digits*/
-       scaAddr_len = _util_hexstring_to_asciistring(&datapackage->Sca[2], (unsigned char *) diallingNum, sca_length-1);
+       scaAddr_len = _util_hexstring_to_asciistring(&datapackage->Sca[2], (unsigned char *)diallingNum, sca_length-1);
 
        msg("SCA ascii length%d", scaAddr_len);
        msg("SCA Number:[%s]", diallingNum);
@@ -964,10 +939,9 @@ static void __on_noti_3gpp_sms_incoming_msg
 
        if (sca_ton == SMS_TON_INTERNATIONAL) {
                scaAddr[0] = '+';
-               memcpy (&scaAddr[1], diallingNum, scaAddr_len);
-       }
-       else {
-               memcpy (scaAddr, diallingNum, scaAddr_len);
+               memcpy(&scaAddr[1], diallingNum, scaAddr_len);
+       } else {
+               memcpy(scaAddr, diallingNum, scaAddr_len);
        }
 
        msg("Sc address in test app is %s", scaAddr);
@@ -986,76 +960,77 @@ static void __on_noti_3gpp_sms_incoming_msg
 
        tpdu_len = datapackage->MsgLength;
 
-       pTPDU = malloc (sizeof(unsigned char) * tpdu_len);
+       pTPDU = malloc(sizeof(unsigned char) * tpdu_len);
+       if (pTPDU == NULL)
+               return;
 
-       memcpy (pTPDU, &datapackage->szData[position], tpdu_len);
+       memcpy(pTPDU, &datapackage->szData[position], tpdu_len);
 
        if (MTI == SMS_TPDU_DELIVER) {
-               DecodeSmsDeliverTpdu (tpdu_len, pTPDU);
+               DecodeSmsDeliverTpdu(tpdu_len, pTPDU);
 
                msg("dcs_pos : %d", dcs_pos);
 
-               SmsUtilDecodeDCS (&dcs, datapackage->szData[position + dcs_pos]);
+               SmsUtilDecodeDCS(&dcs, datapackage->szData[position + dcs_pos]);
 
                /* Simulating the behaviour of MSG_SERVICE:
                  * Storing only the Class two sms
                  *     @todo:refactoring
                  */
-               if(dcs.class_type == SMS_CLASS_2)
-               {
+               if (dcs.class_type == SMS_CLASS_2) {
                        TelSmsData_t WriteData;
 
                        msg("dcs type is of class2");
 
-                       memset (&WriteData, 0, sizeof(TelSmsData_t));
+                       memset(&WriteData, 0, sizeof(TelSmsData_t));
 
-                       memcpy (WriteData.SmsData.Sca, datapackage->Sca, sca_length+1);
+                       memcpy(WriteData.SmsData.Sca, datapackage->Sca, sca_length+1);
 
                        WriteData.SmsData.MsgLength = datapackage->MsgLength;
 
-                       memcpy (WriteData.SmsData.szData, datapackage->szData, datapackage->MsgLength);
+                       memcpy(WriteData.SmsData.szData, datapackage->szData, datapackage->MsgLength);
 
                        WriteData.MsgStatus = TAPI_NETTEXT_STATUS_READ;
 
-                       returnStatus = tel_write_sms_in_sim (handle, &WriteData, on_resp_save_msg, NULL );
+                       returnStatus = tel_write_sms_in_sim(handle, &WriteData, on_resp_save_msg, NULL);
 
                        msg("returnStatus for tel_write_sms_in_sim(): 0x%x", returnStatus);
                }
 
-       }
-       else if (MTI == SMS_TPDU_STATUS_REPORT) {
-               DecodeSmsStatusReportTpdu (tpdu_len, pTPDU);
+       } else if (MTI == SMS_TPDU_STATUS_REPORT) {
+               DecodeSmsStatusReportTpdu(tpdu_len, pTPDU);
        }
 
-       del_report = malloc (sizeof(TelSmsDatapackageInfo_t));
+       TelSmsDatapackageInfo_t *del_report = NULL;
 
-       memset (del_report, 0, sizeof(TelSmsDatapackageInfo_t));
+       del_report = malloc(sizeof(TelSmsDatapackageInfo_t));
+       if (del_report == NULL) {
+               free(pTPDU);
+               return;
+       }
+       memset(del_report, 0, sizeof(TelSmsDatapackageInfo_t));
 
-       memcpy (del_report->Sca, datapackage->Sca, TAPI_SIM_SMSP_ADDRESS_LEN);
+       memcpy(del_report->Sca, datapackage->Sca, TAPI_SIM_SMSP_ADDRESS_LEN);
 
-       del_report->szData[0] = SMS_TPDU_DELIVER_REPORT;        //TP-UDHI[bit6] : 0
-       del_report->szData[1] = 0;// TP-PI = 0; bit2: TP-UDL bit1: TP-DCS bit0: TP-PID (No option field)
+       del_report->szData[0] = SMS_TPDU_DELIVER_REPORT; /* TP-UDHI[bit6] : 0 */
+       del_report->szData[1] = 0; /* TP-PI = 0; bit2: TP-UDL bit1: TP-DCS bit0: TP-PID (No option field) */
        del_report->MsgLength = 2;
        del_report->format = TAPI_NETTEXT_NETTYPE_3GPP;
 
        msg("***receive message (Api:SendDeliverreport)****");
 
-       returnStatus = tel_send_sms_deliver_report (handle, del_report,
-                       TAPI_NETTEXT_SENDSMS_SUCCESS, on_resp_DeliverReport_msg, NULL );
+       returnStatus = tel_send_sms_deliver_report(handle, del_report,
+                       TAPI_NETTEXT_SENDSMS_SUCCESS, on_resp_DeliverReport_msg, NULL);
 
        msg("returnStatus for tel_send_sms_deliver_report(): 0x%x", returnStatus);
 
-       free (del_report);
+       free(del_report);
 
-       free (pTPDU);
+       free(pTPDU);
 }
 
-static void __on_noti_3gpp2_sms_incoming_msg
-(
-       TapiHandle *handle,
-       TelSmsDatapackageInfo_t *datapackage,
-       void *user_data
-)
+static void __on_noti_3gpp2_sms_incoming_msg(TapiHandle *handle,
+       TelSmsDatapackageInfo_t *datapackage, void *user_data)
 {
        TelSmsDatapackageInfo_t del_report;
        TapiResult_t returnStatus;
@@ -1064,13 +1039,13 @@ static void __on_noti_3gpp2_sms_incoming_msg
 
        memset(&del_report, 0x00, sizeof(del_report));
        del_report.format = TAPI_NETTEXT_NETTYPE_3GPP2;
-       returnStatus = tel_send_sms_deliver_report (handle, &del_report,
-                       TAPI_NETTEXT_SENDSMS_SUCCESS, on_resp_DeliverReport_msg, NULL );
+       returnStatus = tel_send_sms_deliver_report(handle, &del_report,
+                       TAPI_NETTEXT_SENDSMS_SUCCESS, on_resp_DeliverReport_msg, NULL);
 
        msg("returnStatus for tel_send_sms_deliver_report(): 0x%x", returnStatus);
 }
 
-static void on_noti_sms_incom_msg (TapiHandle *handle, const char *noti_id,
+static void on_noti_sms_incom_msg(TapiHandle *handle, const char *noti_id,
                void *data, void *user_data)
 {
        TelSmsDatapackageInfo_t *datapackage = data;
@@ -1085,7 +1060,7 @@ static void on_noti_sms_incom_msg (TapiHandle *handle, const char *noti_id,
                msg("Invalid msg format: %d", datapackage->format);
 }
 
-static void on_noti_sms_cb_incom_msg (TapiHandle *handle, const char *noti_id,
+static void on_noti_sms_cb_incom_msg(TapiHandle *handle, const char *noti_id,
                void *data, void *user_data)
 {
        TelSmsCbMsg_t *cbMsg = data;
@@ -1098,12 +1073,12 @@ static void on_noti_sms_cb_incom_msg (TapiHandle *handle, const char *noti_id,
        length = cbMsg->Length;
        pPDU[0] = cbMsg->CbMsgType;
        pPDU[1] = length;
-       memcpy (& (pPDU[2]), cbMsg->szMsgData, SMS_CB_SIZE_MAX + 1);
+       memcpy(&(pPDU[2]), cbMsg->szMsgData, SMS_CB_SIZE_MAX + 1);
 
-       DecodeCellBroadcastMsg (length, pPDU);
+       DecodeCellBroadcastMsg(length, pPDU);
 }
 
-static void on_noti_sms_etws_incom_msg (TapiHandle *handle, const char *noti_id,
+static void on_noti_sms_etws_incom_msg(TapiHandle *handle, const char *noti_id,
                void *data, void *user_data)
 {
        TelSmsEtwsMsg_t *etwsMsg = data;
@@ -1116,10 +1091,10 @@ static void on_noti_sms_etws_incom_msg (TapiHandle *handle, const char *noti_id,
        length = etwsMsg->Length;
        pPDU[0] = etwsMsg->EtwsMsgType;
        pPDU[1] = length;
-       memcpy (& (pPDU[2]), etwsMsg->szMsgData, TAPI_NETTEXT_ETWS_SIZE_MAX + 1);
+       memcpy(&(pPDU[2]), etwsMsg->szMsgData, TAPI_NETTEXT_ETWS_SIZE_MAX + 1);
 }
 
-static void on_noti_sms_memory_status (TapiHandle *handle, const char *noti_id,
+static void on_noti_sms_memory_status(TapiHandle *handle, const char *noti_id,
                void *data, void *user_data)
 {
        int *memory_status = data;
@@ -1129,7 +1104,7 @@ static void on_noti_sms_memory_status (TapiHandle *handle, const char *noti_id,
        msg(" - memory_status = 0x%x", *memory_status);
 }
 
-static void on_noti_sms_ready_status (TapiHandle *handle, const char *noti_id,
+static void on_noti_sms_ready_status(TapiHandle *handle, const char *noti_id,
                void *data, void *user_data)
 {
        int *device_ready = data;
@@ -1138,18 +1113,17 @@ static void on_noti_sms_ready_status (TapiHandle *handle, const char *noti_id,
        msgb("event(%s) receive !!", TAPI_NOTI_SMS_DEVICE_READY);
        msg(" - device_ready = %d", *device_ready);
 
-       if (TAPI_NETTEXT_READY_STATUS_3GPP == *device_ready) {
+       if (TAPI_NETTEXT_READY_STATUS_3GPP == *device_ready)
                msg("TAPI_NETTEXT_READY_STATUS_3GPP");
-       } else if (TAPI_NETTEXT_READY_STATUS_3GPP2 == *device_ready) {
+       else if (TAPI_NETTEXT_READY_STATUS_3GPP2 == *device_ready)
                msg("TAPI_NETTEXT_READY_STATUS_3GPP");
-       } else if (TAPI_NETTEXT_READY_STATUS_3GPP_AND_3GPP2 == *device_ready) {
+       else if (TAPI_NETTEXT_READY_STATUS_3GPP_AND_3GPP2 == *device_ready)
                msg("TAPI_NETTEXT_READY_STATUS_3GPP_AND_3GPP2");
-       } else {
-               msg("TAPI_NETTEXT_READY_STATUS_NONE")
-       }
+       else
+               msg("TAPI_NETTEXT_READY_STATUS_NONE");
 }
 
-static void on_resp_send_msg (TapiHandle *handle, int result, void *data,
+static void on_resp_send_msg(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        msg("");
@@ -1157,7 +1131,7 @@ static void on_resp_send_msg (TapiHandle *handle, int result, void *data,
        msg(" - result = 0x%x", result);
 }
 
-static void on_resp_send_cdma_msg (TapiHandle *handle, int result, void *data,
+static void on_resp_send_cdma_msg(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        msg("");
@@ -1165,33 +1139,33 @@ static void on_resp_send_cdma_msg (TapiHandle *handle, int result, void *data,
        msg(" - result = 0x%x", result);
 }
 
-static void on_resp_read_msg (TapiHandle *handle, int result, void *data,
+static void on_resp_read_msg(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
-       TelSmsData_t * sim_data;
+       TelSmsData_t *sim_data;
        int scaAddr_len = 0;
-       char * pTPDU;
+       char *pTPDU;
        int tpdu_len = 0;
        char diallingNum[TAPI_NETTEXT_ADDRESS_LEN_MAX + 1] = { 0, };
-       char scaAddr[TAPI_NETTEXT_SCADDRESS_LEN_MAX + 2] = { 0, }; //service center address
+       char scaAddr[TAPI_NETTEXT_SCADDRESS_LEN_MAX + 2] = { 0, }; /* Service Center Address */
        int sca_ton, sca_npi;
        int position;
 
-       if (data == NULL ) {
+       if (data == NULL) {
                msg("data is Null");
                return;
        }
 
-       sim_data = (TelSmsData_t *) data;
+       sim_data = (TelSmsData_t *)data;
 
        if (sim_data->MsgStatus == TAPI_NETTEXT_STATUS_UNREAD)
-               msg("Msg Staus : received unread msg")
+               msg("Msg Staus : received unread msg");
        else if (sim_data->MsgStatus == TAPI_NETTEXT_STATUS_READ)
-               msg("Msg Staus : received read msg")
+               msg("Msg Staus : received read msg");
        else if (sim_data->MsgStatus == TAPI_NETTEXT_STATUS_UNSENT)
-               msg("Msg Staus : unsent msg")
+               msg("Msg Staus : unsent msg");
        else
-               msg("Msg Staus : [%d]", sim_data->MsgStatus)
+               msg("Msg Staus : [%d]", sim_data->MsgStatus);
 
        msg("First Data [%x]", sim_data->SmsData.szData[0]);
        msg("Second Data [%x]", sim_data->SmsData.szData[1]);
@@ -1199,15 +1173,15 @@ static void on_resp_read_msg (TapiHandle *handle, int result, void *data,
        msg("Fourth Data [%x]", sim_data->SmsData.szData[3]);
 
        position = 0;
-       // SCA_ADDR
-       memset (diallingNum, 0, sizeof (diallingNum));
+       /* SCA_ADDR */
+       memset(diallingNum, 0, sizeof(diallingNum));
 
-       SmsUtilDecodeAddrField (diallingNum, (char *) sim_data->SmsData.Sca,
+       SmsUtilDecodeAddrField(diallingNum, (char *)sim_data->SmsData.Sca,
                        &sca_ton, &sca_npi);
 
-       position += 2;  //include Address-Length, Type of Address
+       position += 2;  /* include Address-Length, Type of Address */
 
-       scaAddr_len = strlen ((char *) diallingNum);
+       scaAddr_len = strlen((char *)diallingNum);
        if (scaAddr_len > TAPI_NETTEXT_SCADDRESS_LEN_MAX - 1)
                scaAddr_len = TAPI_NETTEXT_SCADDRESS_LEN_MAX - 1;
 
@@ -1218,30 +1192,29 @@ static void on_resp_read_msg (TapiHandle *handle, int result, void *data,
 
        if (sca_ton == SMS_TON_INTERNATIONAL) {
                scaAddr[0] = '+';
-               memcpy (&scaAddr[1], diallingNum, scaAddr_len);
-       }
-       else {
-               memcpy (scaAddr, diallingNum, scaAddr_len);
+               memcpy(&scaAddr[1], diallingNum, scaAddr_len);
+       } else {
+               memcpy(scaAddr, diallingNum, scaAddr_len);
        }
 
        tpdu_len = sim_data->SmsData.MsgLength;
 
        msg("SCA Number : %s tpdu_len is %d", scaAddr, tpdu_len);
 
-       pTPDU = malloc (sizeof(unsigned char) * tpdu_len);
+       pTPDU = malloc(sizeof(unsigned char) * tpdu_len);
        if (!pTPDU)
                return;
 
        msg("bfor memcopy position is %d", position);
-       memcpy (pTPDU, & (sim_data->SmsData.szData[0]), tpdu_len);
+       memcpy(pTPDU, & (sim_data->SmsData.szData[0]), tpdu_len);
        msg("after memcpy");
 
-       DecodeSmsDeliverTpdu (tpdu_len, pTPDU);
+       DecodeSmsDeliverTpdu(tpdu_len, pTPDU);
 
-       free (pTPDU);
+       free(pTPDU);
 }
 
-static void on_resp_save_msg (TapiHandle *handle, int result, void *data,
+static void on_resp_save_msg(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        int *local_index = data;
@@ -1252,7 +1225,7 @@ static void on_resp_save_msg (TapiHandle *handle, int result, void *data,
        msg(" - local_index = %d", *local_index);
 }
 
-static void on_resp_delete_msg (TapiHandle *handle, int result, void *data,
+static void on_resp_delete_msg(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        int *local_index = data;
@@ -1263,7 +1236,7 @@ static void on_resp_delete_msg (TapiHandle *handle, int result, void *data,
        msg(" - local_index = %d", *local_index);
 }
 
-static void on_resp_DeliverReport_msg (TapiHandle *handle, int result,
+static void on_resp_DeliverReport_msg(TapiHandle *handle, int result,
                void *data, void *user_data)
 {
        int *local_index = data;
@@ -1274,7 +1247,7 @@ static void on_resp_DeliverReport_msg (TapiHandle *handle, int result,
        msg(" - local_index = %d", *local_index);
 }
 
-static void on_resp_set_sms_sca (TapiHandle *handle, int result, void *data,
+static void on_resp_set_sms_sca(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        msg("");
@@ -1282,7 +1255,7 @@ static void on_resp_set_sms_sca (TapiHandle *handle, int result, void *data,
        msg(" - result = 0x%x", result);
 }
 
-static void on_resp_set_sms_cb_config (TapiHandle *handle, int result,
+static void on_resp_set_sms_cb_config(TapiHandle *handle, int result,
                void *data, void *user_data)
 {
        msg("");
@@ -1290,7 +1263,7 @@ static void on_resp_set_sms_cb_config (TapiHandle *handle, int result,
        msg(" - result = 0x%x", result);
 }
 
-static void on_resp_set_sms_params (TapiHandle *handle, int result, void *data,
+static void on_resp_set_sms_params(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        msg("");
@@ -1298,7 +1271,7 @@ static void on_resp_set_sms_params (TapiHandle *handle, int result, void *data,
        msg(" - result = 0x%x", result);
 }
 
-static void on_resp_set_mem_status (TapiHandle *handle, int result, void *data,
+static void on_resp_set_mem_status(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        msg("");
@@ -1306,7 +1279,7 @@ static void on_resp_set_mem_status (TapiHandle *handle, int result, void *data,
        msg(" - result = 0x%x", result);
 }
 
-static void on_resp_get_sms_sca (TapiHandle *handle, int result, void *data,
+static void on_resp_get_sms_sca(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        TelSmsAddressInfo_t *scaInfo = data;
@@ -1327,18 +1300,18 @@ static void on_resp_get_sms_sca (TapiHandle *handle, int result, void *data,
        }
 }
 
-static void on_resp_get_cb_config (TapiHandle *handle, int result, void *data,
+static void on_resp_get_cb_config(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
-       TelSmsCbConfig_t * CBConfig;
+       TelSmsCbConfig_t *CBConfig;
        int i = 0;
 
-       if (data == NULL ) {
-               msg("pData is Null")
+       if (data == NULL) {
+               msg("pData is Null");
                return;
        }
 
-       CBConfig = (TelSmsCbConfig_t *) data;
+       CBConfig = (TelSmsCbConfig_t *)data;
 
        msg("");
        msgb("tel_get_sms_cb_config() response receive");
@@ -1348,9 +1321,9 @@ static void on_resp_get_cb_config (TapiHandle *handle, int result, void *data,
 
        /*** CB Enable/Diable ***/
        if (CBConfig->CBEnabled == TRUE)
-               msg("Cell Broadcast Msg Enabled...")
+               msg("Cell Broadcast Msg Enabled...");
        else
-               msg("Cell Broadcast Msg Disabled...")
+               msg("Cell Broadcast Msg Disabled...");
 
        /*** CBMI  Count ***/
        msg("CBMI Range Count: %d", CBConfig->MsgIdRangeCount);
@@ -1381,17 +1354,17 @@ static void on_resp_get_cb_config (TapiHandle *handle, int result, void *data,
        msg("==================================");
 }
 
-static void on_resp_get_sms_parameters (TapiHandle *handle, int result,
+static void on_resp_get_sms_parameters(TapiHandle *handle, int result,
                void *data, void *user_data)
 {
        TelSmsParams_t *smsp_param;
        int i = 0;
 
-       if (data == NULL ) {
-               msg("data is Null")
+       if (data == NULL) {
+               msg("data is Null");
                return;
        }
-       smsp_param = (TelSmsParams_t *) data;
+       smsp_param = (TelSmsParams_t *)data;
 
        msg("");
        msgb("tel_get_sms_parameters() response receive");
@@ -1399,7 +1372,7 @@ static void on_resp_get_sms_parameters (TapiHandle *handle, int result,
 
        msg("record index is 0x%x", smsp_param->RecordIndex);
        msg("record len  is 0x%x", smsp_param->RecordLen);
-       msg("alpha_id len  is 0x%x ", (int )smsp_param->AlphaIdLen);
+       msg("alpha_id len  is 0x%x ", (int)smsp_param->AlphaIdLen);
        msg("alpha_id is %s ", smsp_param->szAlphaId);
        msg("param indicator is  0x%x", smsp_param->ParamIndicator);
 
@@ -1414,17 +1387,17 @@ static void on_resp_get_sms_parameters (TapiHandle *handle, int result,
        msg("validity is 0x%x", smsp_param->TpValidityPeriod);
 }
 
-static void on_resp_get_paramcnt (TapiHandle *handle, int result, void *data,
+static void on_resp_get_paramcnt(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
-       int * RecordCount;
+       int *RecordCount;
 
-       if (data == NULL ) {
-               msg("data is Null")
+       if (data == NULL) {
+               msg("data is Null");
                return;
        }
 
-       RecordCount = (int *) data;
+       RecordCount = (int *)data;
 
        msg("");
        msgb("tel_get_sms_parameter_count() response receive");
@@ -1432,33 +1405,32 @@ static void on_resp_get_paramcnt (TapiHandle *handle, int result, void *data,
        msg(" - In param_count_noti the record count is %d", *RecordCount);
 }
 
-static void on_resp_get_sms_count (TapiHandle *handle, int result, void *data,
+static void on_resp_get_sms_count(TapiHandle *handle, int result, void *data,
                void *user_data)
 {
        static TelSmsStoredMsgCountInfo_t *countInfo;
        int loop_counter = 0;
        TapiResult_t returnStatus = TAPI_API_SUCCESS;
 
-       if (data == NULL ) {
-               msg("data is Null")
+       if (data == NULL) {
+               msg("data is Null");
                return;
        }
 
-       countInfo = (TelSmsStoredMsgCountInfo_t*) data;
+       countInfo = (TelSmsStoredMsgCountInfo_t *)data;
 
        msg("");
        msgb("tel_get_sms_count() response receive");
        msg(" - result = 0x%x", result);
 
-       if (countInfo->UsedCount != 0x00)       //if used count is not zero
-                       {
+       if (countInfo->UsedCount != 0x00) {     /* if used count is not zero */
                msg("Index LIST..........");
                for (loop_counter = 0; loop_counter < countInfo->UsedCount;
                                loop_counter++) {
                        msg("[%02x]", countInfo->IndexList[loop_counter]);
-                       returnStatus = tel_read_sms_in_sim (handle,
+                       returnStatus = tel_read_sms_in_sim(handle,
                                        countInfo->IndexList[loop_counter], on_resp_read_msg,
-                                       NULL );
+                                       NULL);
                        msg("After read msg: returnstatus %d", returnStatus);
                }
                msg("In MsgCountNotification total cnt is %d, usedcnt is %dapi_err %d",
@@ -1468,9 +1440,9 @@ static void on_resp_get_sms_count (TapiHandle *handle, int result, void *data,
        msg("In MsgCountNotification total cnt is %d, usedcnt is %d",
                        countInfo->TotalCount, countInfo->UsedCount);
 
-}      //Madhavi
+}
 
-static int SendMessage (MManager *mm, struct menu_data *menu)
+static int SendMessage(MManager *mm, struct menu_data *menu)
 {
        int ret;
        int msg_len = 0;
@@ -1479,43 +1451,42 @@ static int SendMessage (MManager *mm, struct menu_data *menu)
        char diallingNum[SMS_ADDRESS_LEN_MAX];
        int diallingNum_len = 0;
 
-       memset (buf, 0, sizeof (buf));
-       memset (diallingNum, 0, sizeof (diallingNum));
+       memset(buf, 0, sizeof(buf));
+       memset(diallingNum, 0, sizeof(diallingNum));
        diallingNum_len = 0;
 
        msg("Enter destination Number: ");
 
-       ret = read (0, buf, sizeof (buf));
+       ret = read(0, buf, sizeof(buf));
        if (ret < 0) {
                if (errno == EINTR)
-                       perror ("read(1)");
+                       perror("read(1)");
                return -1;
-       }
-       else if (ret == 0)
+       } else if (ret == 0)
                return ret;
 
        buf[SMS_ADDRESS_LEN_MAX - 1] = '\0';
-       diallingNum_len = strlen (diallingNum);
-       memcpy (&diallingNum[diallingNum_len], buf, strlen (buf));
+       diallingNum_len = strlen(diallingNum);
+       memcpy(&diallingNum[diallingNum_len], buf, strlen(buf));
 
-       diallingNum_len = strlen (diallingNum); //recalculate
+       diallingNum_len = strlen(diallingNum); /* recalculate */
        msg("dialling num %s and dialling num len is %d", diallingNum,
                        diallingNum_len);
        diallingNum[diallingNum_len] = 0;
        diallingNum_len = diallingNum_len - 1;
 
        msg("Enter Message: ");
-       memset (message, 0, sizeof (message));
+       memset(message, 0, sizeof(message));
 
-       ret = read (0, message, sizeof (message) - 1);
+       ret = read(0, message, sizeof(message) - 1);
 
        if (ret <= 0) {
                msg(" NULL msg can NOT be sent ");
                return -1;
        }
-       message[sizeof (message) - 1] = '\0';
+       message[sizeof(message) - 1] = '\0';
 
-       msg_len = strlen (message);
+       msg_len = strlen(message);
        message[--msg_len] = 0;
 
        msg("==========================");
@@ -1524,7 +1495,7 @@ static int SendMessage (MManager *mm, struct menu_data *menu)
        msg("Dialling number Length : %d", diallingNum_len);
        msg("==========================\n");
 
-       EncodeSmsSubmitTpdu (mm, diallingNum, diallingNum_len, message, msg_len);
+       EncodeSmsSubmitTpdu(mm, diallingNum, diallingNum_len, message, msg_len);
        return 1;
 
 }
@@ -1538,105 +1509,102 @@ static int SendMessageCDMA(MManager *mm, struct menu_data *menu)
        char diallingNum[SMS_ADDRESS_LEN_MAX + 1] = { 0, };
        int diallingNum_len = 0;
 
-       printf ("\n");
-       printf ("Enter destination Number:\n>> ");
-       fflush (stdout);
+       printf("\n");
+       printf("Enter destination Number:\n>> ");
+       fflush(stdout);
 
        memset(buf, 0x0, sizeof(buf));
-       ret = read (0, buf, sizeof (buf));
+       ret = read(0, buf, sizeof(buf));
        if (ret < 0) {
                if (errno == EINTR)
-                       perror ("read(1)");
+                       perror("read(1)");
                return -1;
-       }
-       else if (ret == 0)
+       } else if (ret == 0)
                return ret;
 
 
        buf[strlen(buf)] = '\0';
-       memcpy (diallingNum, buf, strlen (buf)+1);
-       diallingNum_len = strlen (diallingNum);
+       memcpy(diallingNum, buf, strlen(buf)+1);
+       diallingNum_len = strlen(diallingNum);
 
-       printf ("dialling num [%s], dialling num len [%d]\n", diallingNum, diallingNum_len);
-       printf ("Enter Message\n>> ");
-       fflush (stdout);
+       printf("dialling num [%s], dialling num len [%d]\n", diallingNum, diallingNum_len);
+       printf("Enter Message\n>> ");
+       fflush(stdout);
 
        memset(message, 0x0, sizeof(message));
-       ret = read (0, message, sizeof (message) - 1);
+       ret = read(0, message, sizeof(message) - 1);
        if (ret <= 0) {
-               printf (" NULL msg can NOT be sent \n");
+               printf(" NULL msg can NOT be sent \n");
                return -1;
        }
-       message[strlen (message) - 1] = '\0';
+       message[strlen(message) - 1] = '\0';
 
-       msg_len = strlen (message);
+       msg_len = strlen(message);
 
-       printf ("===========================\n");
-       printf ("To: [%s] (len: %d)\n", diallingNum, diallingNum_len);
-       printf ("Message: [%s]\nMsg Length: [%d]\n", message, msg_len);
-       printf ("===========================\n\n");
+       printf("===========================\n");
+       printf("To: [%s] (len: %d)\n", diallingNum, diallingNum_len);
+       printf("Message: [%s]\nMsg Length: [%d]\n", message, msg_len);
+       printf("===========================\n\n");
 
-       if (EncodeCdmaSmsSubmitTpdu (mm, diallingNum, diallingNum_len, message, msg_len) == FALSE) {
+       if (EncodeCdmaSmsSubmitTpdu(mm, diallingNum, diallingNum_len, message, msg_len) == FALSE)
                msg("EncodeCdmaSmsSubmitTpdu() failed.");
-       }
 
        return 1;
 }
 
-static int ReadMessage (MManager *mm, struct menu_data *menu)
+static int ReadMessage(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int selectedNo;
        int ret;
        char buf[100];
        int returnStatus = 0;
 
-       memset (buf, 0, sizeof (buf));
+       memset(buf, 0, sizeof(buf));
 
        msg("*************************************");
        msg("1. SIM Message/RUIM Message");
 
        msg("Select Number:");
 
-       ret = read (0, buf, sizeof (buf));
+       ret = read(0, buf, sizeof(buf));
 
        if (ret < 0) {
                if (errno == EINTR)
-                       perror ("read(1)");
+                       perror("read(1)");
                return -1;
-       }
-       else if (ret == 0)
+       } else if (ret == 0)
                return ret;
 
-       selectedNo = atoi (buf);
+       selectedNo = atoi(buf);
        msg("Selected Num in read message(value is 1) is %d ", selectedNo);
        switch (selectedNo) {
-               case 1:
-                       msg("***Reading the message in SIM***");
-                       returnStatus = tel_get_sms_count (handle, on_resp_get_sms_count, NULL );
-                       msg("tel_get_sms_count():  0x%x", returnStatus);
-
-                       break;
-               default:
-                       msg("Not supported Menu(%d) !!!", selectedNo);
-                       break;
+       case 1:
+               msg("***Reading the message in SIM***");
+               returnStatus = tel_get_sms_count(handle, on_resp_get_sms_count, NULL);
+               msg("tel_get_sms_count():  0x%x", returnStatus);
+       break;
+
+       default:
+               msg("Not supported Menu(%d) !!!", selectedNo);
+       break;
        }
 
        return 1;
 }
 
-static int DeleteMessage (MManager *mm, struct menu_data *menu)
+static int DeleteMessage(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
 
        int ret, selected_num, index;
        char buf[100];
 
        TapiResult_t returnStatus;
 
-       memset (buf, 0, sizeof (buf));
+       memset(buf, 0, sizeof(buf));
 
-       msg("***Deleting the message(Api:DeleteMsg,GetMsgCount)***");
+       msg("***Deleting the message(Api:DeleteMsg, GetMsgCount)***");
 
        msg("Select Number:");
        msg("1. Delete message at a particular index");
@@ -1644,154 +1612,147 @@ static int DeleteMessage (MManager *mm, struct menu_data *menu)
 
        msg("Select Number:");
 
-       ret = read (0, buf, sizeof (buf));
+       ret = read(0, buf, sizeof(buf));
 
-       selected_num = atoi (buf);
-       switch(selected_num) {
-               case 1:
-               {
-                       msg("Enter delete index >>");
-                       ret = read (0, buf, sizeof (buf));
-                       if (ret < 0) {
-                               if (errno == EINTR)
-                                       perror ("read(1)");
-                               return -1;
-                       }
-                       else if (ret == 0)
-                               return ret;
-                       index = atoi (buf);
-                       break;
-               }
-               case 2:
-               {
-                       index = -1;
-                       break;
-               }
-               default:
-                       msg("Invalid Number Selected");
+       selected_num = atoi(buf);
+       switch (selected_num) {
+       case 1: {
+               msg("Enter delete index >>");
+               ret = read(0, buf, sizeof(buf));
+               if (ret < 0) {
+                       if (errno == EINTR)
+                               perror("read(1)");
                        return -1;
-               }
+               } else if (ret == 0)
+                       return ret;
+               index = atoi(buf);
+       }
+       break;
+
+       case 2: {
+               index = -1;
+       }
+       break;
+
+       default:
+               msg("Invalid Number Selected");
+               return -1;
+       }
        msg("index value :%d", index);
 
-       returnStatus = tel_delete_sms_in_sim (handle, index, on_resp_delete_msg, NULL );
+       returnStatus = tel_delete_sms_in_sim(handle, index, on_resp_delete_msg, NULL);
        msg("returnstatus  tel_delete_sms_in_sim()  is for delete%d ", returnStatus);
 
        msg("Getting SMS Count after Deleting SMS");
-       returnStatus = tel_get_sms_count (handle, on_resp_get_sms_count, NULL );
+       returnStatus = tel_get_sms_count(handle, on_resp_get_sms_count, NULL);
        msg("returnStatus for tel_get_sms_count()  %d", returnStatus);
 
        return 1;
 
 }
 
-static int CdmaGetting (MManager *mm, struct menu_data *menu)
+static int CdmaGetting(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int selectedNo;
        int returnStatus = 0;
        int ready_status = 0;
 
-       selectedNo = atoi (menu->key);
+       selectedNo = atoi(menu->key);
        switch (selectedNo) {
-               case 1:
-                       msg("***Getting the CB Configuration(Api: GetCBConfig)***");
-                       returnStatus = tel_get_sms_cb_config (handle, on_resp_get_cb_config, NULL );
-                       msg("ReturnStatus[%d] ", returnStatus);
-
-                       break;
-               case 3:
-                       msg("***Getting the SmsCount(Api:GetSmsCount)***");
-                       returnStatus = tel_get_sms_count (handle, on_resp_get_sms_count, NULL );
-                       msg("ReturnStatus[%d]", returnStatus);
-
-                       break;
-               case 4:
-                       msg("***Getting the Sms Ready status(Api:Check_sms_device_status)***");
-                       returnStatus = tel_check_sms_device_status (handle, &ready_status);
-                       msg("API ReturnStatus[%d]", returnStatus);
-                       msg("Ready status = %d", ready_status);
-                       if (TAPI_NETTEXT_READY_STATUS_3GPP == ready_status) {
-                               msg("TAPI_NETTEXT_READY_STATUS_3GPP");
-                       } else if (TAPI_NETTEXT_READY_STATUS_3GPP2 == ready_status) {
-                               msg("TAPI_NETTEXT_READY_STATUS_3GPP");
-                       } else if (TAPI_NETTEXT_READY_STATUS_3GPP_AND_3GPP2 == ready_status) {
-                               msg("TAPI_NETTEXT_READY_STATUS_3GPP_AND_3GPP2");
-                       } else {
-                               msg("TAPI_NETTEXT_READY_STATUS_NONE")
-                       }
-                       break;
-               default:
-                       return -1;
-
+       case 1:
+               msg("***Getting the CB Configuration(Api: GetCBConfig)***");
+               returnStatus = tel_get_sms_cb_config(handle, on_resp_get_cb_config, NULL);
+               msg("ReturnStatus[%d] ", returnStatus);
+       break;
+
+       case 3:
+               msg("***Getting the SmsCount(Api:GetSmsCount)***");
+               returnStatus = tel_get_sms_count(handle, on_resp_get_sms_count, NULL);
+               msg("ReturnStatus[%d]", returnStatus);
+       break;
+
+       case 4:
+               msg("***Getting the Sms Ready status(Api:Check_sms_device_status)***");
+               returnStatus = tel_check_sms_device_status(handle, &ready_status);
+               msg("API ReturnStatus[%d]", returnStatus);
+               msg("Ready status = %d", ready_status);
+
+               if (TAPI_NETTEXT_READY_STATUS_3GPP == ready_status)
+                       msg("TAPI_NETTEXT_READY_STATUS_3GPP");
+               else if (TAPI_NETTEXT_READY_STATUS_3GPP2 == ready_status)
+                       msg("TAPI_NETTEXT_READY_STATUS_3GPP");
+               else if (TAPI_NETTEXT_READY_STATUS_3GPP_AND_3GPP2 == ready_status)
+                       msg("TAPI_NETTEXT_READY_STATUS_3GPP_AND_3GPP2");
+               else
+                       msg("TAPI_NETTEXT_READY_STATUS_NONE");
+       break;
+
+       default:
+               return -1;
        }
 
        return 1;
 }
 
-static int Getting (MManager *mm, struct menu_data *menu)
+static int Getting(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        int selectedNo;
        int returnStatus = 0;
        int ready_status = 0;
 
-       selectedNo = atoi (menu->key);
+       selectedNo = atoi(menu->key);
 
        switch (selectedNo) {
-               case 1:
-                       msg("***Getting the SCA(Api: GetSCA)****");
-                       returnStatus = tel_get_sms_sca (handle, 0, on_resp_get_sms_sca, NULL );
-                       msg("returnstatus for tel_get_sms_sca(): 0x %x", returnStatus);
-
-                       break;
-
-               case 2:
-                       msg("***Getting the CB Configuration(Api: GetCBConfig)***");
-                       returnStatus = tel_get_sms_cb_config (handle, on_resp_get_cb_config, NULL );
-                       msg("ReturnStatus[%d] ", returnStatus);
-
-                       break;
-
-               case 3:
-                       msg("****Getting the parameter(Api:GetParameter)****");
-                       returnStatus = tel_get_sms_parameters (handle, 0, on_resp_get_sms_parameters, NULL );
-                       msg("ReturnStatus[%d]]", returnStatus);
-
-                       break;
-
-                       break;
-
-               case 5:
-                       msg("***Getting the parameterCount(Api:GetParameterCount)***");
-                       returnStatus = tel_get_sms_parameter_count (handle, on_resp_get_paramcnt, NULL );
-                       msg("ReturnStatus[%d]", returnStatus);
-
-                       break;
-
-               case 6:
-                       msg("***Getting the SmsCount(Api:GetSmsCount)***");
-                       returnStatus = tel_get_sms_count (handle, on_resp_get_sms_count, NULL );
-                       msg("ReturnStatus[%d]", returnStatus);
-
-                       break;
-
-               case 7:
-                       msg("***Getting the Sms Ready status(Api:Check_sms_device_status)***");
-                       returnStatus = tel_check_sms_device_status (handle, &ready_status);
-                       msg("ReturnStatus[%d]", returnStatus);
-                       msg("Ready status = %d", ready_status);
-                       if (TAPI_NETTEXT_READY_STATUS_3GPP == ready_status) {
-                               msg("TAPI_NETTEXT_READY_STATUS_3GPP");
-                       } else if (TAPI_NETTEXT_READY_STATUS_3GPP2 == ready_status) {
-                               msg("TAPI_NETTEXT_READY_STATUS_3GPP");
-                       } else if (TAPI_NETTEXT_READY_STATUS_3GPP_AND_3GPP2 == ready_status) {
-                               msg("TAPI_NETTEXT_READY_STATUS_3GPP_AND_3GPP2");
-                       } else {
-                               msg("TAPI_NETTEXT_READY_STATUS_NONE")
-                       }
-                       break;
-               default:
-                       return -1;
+       case 1:
+               msg("***Getting the SCA(Api: GetSCA)****");
+               returnStatus = tel_get_sms_sca(handle, 0, on_resp_get_sms_sca, NULL);
+               msg("returnstatus for tel_get_sms_sca(): 0x %x", returnStatus);
+       break;
+
+       case 2:
+               msg("***Getting the CB Configuration(Api: GetCBConfig)***");
+               returnStatus = tel_get_sms_cb_config(handle, on_resp_get_cb_config, NULL);
+               msg("ReturnStatus[%d] ", returnStatus);
+       break;
+
+       case 3:
+               msg("****Getting the parameter(Api:GetParameter)****");
+               returnStatus = tel_get_sms_parameters(handle, 0, on_resp_get_sms_parameters, NULL);
+               msg("ReturnStatus[%d]]", returnStatus);
+       break;
+
+       case 5:
+               msg("***Getting the parameterCount(Api:GetParameterCount)***");
+               returnStatus = tel_get_sms_parameter_count(handle, on_resp_get_paramcnt, NULL);
+               msg("ReturnStatus[%d]", returnStatus);
+       break;
+
+       case 6:
+               msg("***Getting the SmsCount(Api:GetSmsCount)***");
+               returnStatus = tel_get_sms_count(handle, on_resp_get_sms_count, NULL);
+               msg("ReturnStatus[%d]", returnStatus);
+       break;
+
+       case 7:
+               msg("***Getting the Sms Ready status(Api:Check_sms_device_status)***");
+               returnStatus = tel_check_sms_device_status(handle, &ready_status);
+               msg("ReturnStatus[%d]", returnStatus);
+               msg("Ready status = %d", ready_status);
+
+               if (TAPI_NETTEXT_READY_STATUS_3GPP == ready_status)
+                       msg("TAPI_NETTEXT_READY_STATUS_3GPP");
+               else if (TAPI_NETTEXT_READY_STATUS_3GPP2 == ready_status)
+                       msg("TAPI_NETTEXT_READY_STATUS_3GPP");
+               else if (TAPI_NETTEXT_READY_STATUS_3GPP_AND_3GPP2 == ready_status)
+                       msg("TAPI_NETTEXT_READY_STATUS_3GPP_AND_3GPP2");
+               else
+                       msg("TAPI_NETTEXT_READY_STATUS_NONE");
+       break;
+
+       default:
+               return -1;
 
        }
 
@@ -1803,270 +1764,267 @@ static int _get_int()
        char buf[255];
        int ret;
 
-       memset (buf, 0, 255);
-       ret = read (0, buf, 254);
+       memset(buf, 0, 255);
+       ret = read(0, buf, 254);
        if (ret <= 0)
                return 0;
 
        return atoi(buf);
 }
 
-static int CdmaSetting (MManager *mm, struct menu_data *menu)
+static int CdmaSetting(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
 
        int settingMenu;
        int ret;
 
-       char MemoryStatus[255] = { 0, }; //2006/8/8
+       char MemoryStatus[255] = {0, };
 
        TapiResult_t returnStatus;
 
-       settingMenu = atoi (menu->key);
+       settingMenu = atoi(menu->key);
 
        switch (settingMenu) {
-               case 2: //Set CB Enable/Disable
-               {
-                       msg("****Setting the CB configuration(Api:SetCbConfig)****");
-                       CdmaCbSetting (mm, menu);
-
-                       break;
+       case 2: { /* Set CB Enable/Disable */
+               msg("****Setting the CB configuration(Api:SetCbConfig)****");
+               CdmaCbSetting(mm, menu);
+       }
+       break;
+
+       case 3: { /* Set Memory Full Notification */
+               msg("Enter Memory Status to be set(1:Memory Available, 2:Memory Full)");
+               memset(MemoryStatus, 0, sizeof(MemoryStatus));
+               ret = read(0, MemoryStatus, sizeof(MemoryStatus));
+               if (ret <= 0) {
+                       msg(" NULL msg can NOT be sent ");
+                       return -1;
                }
-               case 3: //Set Memory Full Notification
-               {
-                       msg("Enter Memory Status to be set(1:Memory Available, 2:Memory Full)");
-                       memset (MemoryStatus, 0, sizeof (MemoryStatus));
-                       ret = read (0, MemoryStatus, sizeof (MemoryStatus));
-                       if (ret <= 0) {
-                               msg(" NULL msg can NOT be sent ");
-                               return -1;
-                       }
-                       msg("Memory Status type is %d ", atoi (MemoryStatus));
-                       returnStatus = tel_set_sms_memory_status (handle,
-                                       atoi (MemoryStatus), on_resp_set_mem_status, NULL ); //Set to full 0x02-Full, 0x01-available
-                       msg("api err after memstatus set is is %d", returnStatus);
 
-                       break;
-               }
-               case 4: //Set Stored MsgStaus
-               {
-                       msg("Not suppored in this Test App !!!");
-                       break;
-               }
-               default:
-                       return -1;
+               msg("Memory Status type is %d ", atoi(MemoryStatus));
+               returnStatus = tel_set_sms_memory_status(handle,
+                               atoi(MemoryStatus), on_resp_set_mem_status, NULL); /* Set to full 0x02-Full, 0x01-available */
+               msg("api err after memstatus set is is %d", returnStatus);
+       }
+       break;
+
+       case 4: { /* Set Stored MsgStaus */
+               msg("Not suppored in this Test App !!!");
+       }
+       break;
+
+       default:
+               return -1;
        }
+
        return 1;
 }
 
-static int Setting (MManager *mm, struct menu_data *menu)
+static int Setting(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
 
        int settingMenu;
        int ret;
        int i;
 
-       char MemoryStatus[255] = { 0, }; //2006/8/8
+       char MemoryStatus[255] = {0, };
 
        TelSmsCbConfig_t *pCBConfig;
 
        TelSmsParams_t smsParameters = { 0, };
        TapiResult_t returnStatus;
 
-       settingMenu = atoi (menu->key);
+       settingMenu = atoi(menu->key);
 
        switch (settingMenu) {
-               case 1:  //Set Service Center Number
-               {
-                       TelSmsAddressInfo_t sca = {0, };
-                       unsigned char sca_num[TAPI_SIM_SMSP_ADDRESS_LEN + 1];
-                       unsigned int sca_length = 0;
-                       unsigned int additional_len = 0;
-                       unsigned local_index, j;
-
-                       msg("*** Setting SCA (API: tel_set_sms_sca()) ****");
+       case 1: { /* Set Service Center Number */
+               TelSmsAddressInfo_t sca = {0, };
+               unsigned char sca_num[TAPI_SIM_SMSP_ADDRESS_LEN + 1];
+               unsigned int sca_length = 0;
+               unsigned int additional_len = 0;
+               unsigned local_index, j;
+
+               msg("*** Setting SCA (API: tel_set_sms_sca()) ****");
+
+RETRY:
+               msg("Enter the SCA NUMBER:");
+               ret = scanf("%s", sca_num);
+               if (ret > TAPI_SIM_SMSP_ADDRESS_LEN) {
+                       msg("Entered SCA is INVALID - SCA length cannot be greater than %d", TAPI_SIM_SMSP_ADDRESS_LEN);
+                       goto RETRY;
+               }
 
-                       RETRY:
-                       msg("Enter the SCA NUMBER:");
-                       ret = scanf("%s", sca_num);
-                       if (ret > TAPI_SIM_SMSP_ADDRESS_LEN) {
-                               msg("Entered SCA is INVALID - SCA length cannot be greater than %d", TAPI_SIM_SMSP_ADDRESS_LEN);
-                               goto RETRY;
-                       }
-                       sca.Npi = TAPI_SIM_NPI_ISDN_TEL;
-                       sca.Ton = TAPI_SIM_TON_UNKNOWN;
-                       if (sca_num[0] == '+') {
-                               sca.Ton = TAPI_SIM_TON_INTERNATIONAL;
-                               additional_len = 1;
-                       }
-                       sca_length = strlen((char *)sca_num) - additional_len;
-                       msg("Sca Length:[%d]", sca_length);
+               sca.Npi = TAPI_SIM_NPI_ISDN_TEL;
+               sca.Ton = TAPI_SIM_TON_UNKNOWN;
+               if (sca_num[0] == '+') {
+                       sca.Ton = TAPI_SIM_TON_INTERNATIONAL;
+                       additional_len = 1;
+               }
 
-                       if (sca_length % 2 == 0) {
-                               for (local_index = additional_len, j = 0; local_index < sca_length; local_index += 2, j++)
+               sca_length = strlen((char *)sca_num) - additional_len;
+               msg("Sca Length:[%d]", sca_length);
+
+               if (sca_length % 2 == 0) {
+                       for (local_index = additional_len, j = 0; local_index < sca_length; local_index += 2, j++)
+                               sca.szDiallingNum[j] = ((sca_num[local_index+1] & 0X0F) << 4) | (sca_num[local_index] & 0x0F);
+                       sca.szDiallingNum[(sca_length/2)] = '\0';
+                       sca.DialNumLen = (sca_length/2);
+               } else {
+                       for (local_index = additional_len, j = 0; local_index < sca_length+1; local_index += 2, j++) {
+                               if (local_index == (sca_length - 1))
+                                       sca.szDiallingNum[j] = ((0xF0) | (sca_num[local_index] & 0x0F));
+                               else
                                        sca.szDiallingNum[j] = ((sca_num[local_index+1] & 0X0F) << 4) | (sca_num[local_index] & 0x0F);
-                               sca.szDiallingNum[(sca_length/2)] = '\0';
-                               sca.DialNumLen = (sca_length/2);
-                       } else {
-                               for (local_index = additional_len, j = 0; local_index < sca_length+1; local_index += 2, j++) {
-                                       if (local_index == (sca_length - 1))
-                                               sca.szDiallingNum[j] = ((0xF0) | (sca_num[local_index] & 0x0F));
-                                       else
-                                               sca.szDiallingNum[j] = ((sca_num[local_index+1] & 0X0F) << 4) | (sca_num[local_index] & 0x0F);
-                               }
-                               sca.szDiallingNum[(sca_length/2)] = sca.szDiallingNum[(sca_length/2)] | 0xF0;
-                               sca.DialNumLen = (sca_length/2)+1;
                        }
-                       msg("%d", sca.DialNumLen);
-                       returnStatus = tel_set_sms_sca (handle, &sca, 0, on_resp_set_sms_sca, NULL);
-                       msg("Return status: [%d]", returnStatus);
-               break;
+                       sca.szDiallingNum[(sca_length/2)] = sca.szDiallingNum[(sca_length/2)] | 0xF0;
+                       sca.DialNumLen = (sca_length/2)+1;
                }
+               msg("%d", sca.DialNumLen);
+               returnStatus = tel_set_sms_sca(handle, &sca, 0, on_resp_set_sms_sca, NULL);
+               msg("Return status: [%d]", returnStatus);
+       }
+       break;
 
-               case 3: //Set Deliver Report
-               {
-                       msg("****Setting  Deliver Report(Api:SetDeliverReport)****");
-                       //EncodeSmsDeliverReportTpdu();
-                       break;
-               }
+       case 3: { /* Set Deliver Report */
+               msg("****Setting  Deliver Report(Api:SetDeliverReport)****");
+       }
+       break;
 
-               case 4: //Set CB Enable/Disable
-               {
-                       msg("****Setting the CB configuration(Api:SetCbConfig)****");
+       case 4: { /* Set CB Enable/Disable */
+               msg("****Setting the CB configuration(Api:SetCbConfig)****");
 
-                       pCBConfig = calloc (1, sizeof(TelSmsCbConfig_t));
-                       if (!pCBConfig)
-                               return -1;
+               pCBConfig = calloc(1, sizeof(TelSmsCbConfig_t));
+               if (!pCBConfig)
+                       return -1;
 
-                       msg("Enter CB ON/OFF (1: Enable, 0:Disable): ");
-                       pCBConfig->CBEnabled = _get_int();
+               msg("Enter CB ON/OFF (1: Enable, 0:Disable): ");
+               pCBConfig->CBEnabled = _get_int();
 
-                       msg("Enter Max ID Count: ");
-                       pCBConfig->MsgIdMaxCount = _get_int();
+               msg("Enter Max ID Count: ");
+               pCBConfig->MsgIdMaxCount = _get_int();
 
-                       msg("Enter MsgIdRangeCount ( < 10 ): ");
-                       pCBConfig->MsgIdRangeCount = _get_int();
+               msg("Enter MsgIdRangeCount (< 10): ");
+               pCBConfig->MsgIdRangeCount = _get_int();
 
-                       if (pCBConfig->MsgIdRangeCount <= 0
-                                       || pCBConfig->MsgIdRangeCount >= TAPI_NETTEXT_SMS_CBMI_LIST_SIZE_MAX) {
-                               msg("Bad Range value");
-                               free (pCBConfig);
-                               return -1;
-                       }
+               if (pCBConfig->MsgIdRangeCount <= 0
+                               || pCBConfig->MsgIdRangeCount >= TAPI_NETTEXT_SMS_CBMI_LIST_SIZE_MAX) {
+                       msg("Bad Range value");
+                       free(pCBConfig);
+                       return -1;
+               }
 
-                       for (i = 0; i < pCBConfig->MsgIdRangeCount; i++) {
-                               msg("Enter %d FromMsgId : ", i + 1);
-                               pCBConfig->MsgIDs[i].Net3gpp.FromMsgId = _get_int();
+               for (i = 0; i < pCBConfig->MsgIdRangeCount; i++) {
+                       msg("Enter %d FromMsgId : ", i + 1);
+                       pCBConfig->MsgIDs[i].Net3gpp.FromMsgId = _get_int();
 
-                               msg("Enter %d ToMsgId : ", i + 1);
-                               pCBConfig->MsgIDs[i].Net3gpp.ToMsgId = _get_int();
+                       msg("Enter %d ToMsgId : ", i + 1);
+                       pCBConfig->MsgIDs[i].Net3gpp.ToMsgId = _get_int();
 
-                               msg("Enter %d Selected : ", i + 1);
-                               pCBConfig->MsgIDs[i].Net3gpp.Selected = _get_int();
-                       }
+                       msg("Enter %d Selected : ", i + 1);
+                       pCBConfig->MsgIDs[i].Net3gpp.Selected = _get_int();
+               }
 
-                       pCBConfig->Net3gppType = 0x01;
+               pCBConfig->Net3gppType = 0x01;
 
-                       msg(
-                                       "from sms test setting the cb configuration:CBEnabled:%d,Net3gppType:%d,msgIdRangeCount:%d,From: %d\t To: %d\t Selected: %d",
-                                       pCBConfig->CBEnabled, pCBConfig->Net3gppType,
-                                       pCBConfig->MsgIdRangeCount,
-                                       pCBConfig->MsgIDs[0].Net3gpp.FromMsgId,
-                                       pCBConfig->MsgIDs[0].Net3gpp.ToMsgId,
-                                       pCBConfig->MsgIDs[0].Net3gpp.Selected);
+               msg("from sms test setting the cb configuration:CBEnabled:%d, Net3gppType:%d, msgIdRangeCount:%d, From: %d\t To: %d\t Selected: %d",
+                       pCBConfig->CBEnabled, pCBConfig->Net3gppType,
+                       pCBConfig->MsgIdRangeCount,
+                       pCBConfig->MsgIDs[0].Net3gpp.FromMsgId,
+                       pCBConfig->MsgIDs[0].Net3gpp.ToMsgId,
+                       pCBConfig->MsgIDs[0].Net3gpp.Selected);
 
-                       returnStatus = tel_set_sms_cb_config (handle, pCBConfig,
-                                       on_resp_set_sms_cb_config, NULL );
-                       msg("returnStatus after cbconfig set is is [%d]", returnStatus);
+               returnStatus = tel_set_sms_cb_config(handle, pCBConfig,
+                               on_resp_set_sms_cb_config, NULL);
+               msg("returnStatus after cbconfig set is is [%d]", returnStatus);
 
-                       free (pCBConfig);
+               free(pCBConfig);
+       }
+       break;
 
-                       break;
-               }
-               case 5: {
-                       unsigned int sca_length;
-                       unsigned char sca_num[TAPI_SIM_SMSP_ADDRESS_LEN + 1];
-                       const char* name = "AlphaID";
+       case 5: {
+               unsigned int sca_length;
+               unsigned char sca_num[TAPI_SIM_SMSP_ADDRESS_LEN + 1];
+               const char *name = "AlphaID";
 
-                       smsParameters.RecordIndex = 0x00;
+               smsParameters.RecordIndex = 0x00;
 
-                       /* Alpha Id */
-                       smsParameters.AlphaIdLen = strlen(name);
-                       memcpy(&smsParameters.szAlphaId, name, strlen(name));
+               /* Alpha Id */
+               smsParameters.AlphaIdLen = strlen(name);
+               memcpy(&smsParameters.szAlphaId, name, strlen(name));
 
-                       /* Param Indicator*/
-                       smsParameters.ParamIndicator = 0xe1;
+               /* Param Indicator*/
+               smsParameters.ParamIndicator = 0xe1;
 
-                       /* Destination Number */
-                       memset(&smsParameters.TpDestAddr, 0x0, sizeof(TelSmsAddressInfo_t));
+               /* Destination Number */
+               memset(&smsParameters.TpDestAddr, 0x0, sizeof(TelSmsAddressInfo_t));
 
-                       smsParameters.TpProtocolId = 3;/* PID */
-                       smsParameters.TpDataCodingScheme = 2;/* DCS */
-                       smsParameters.TpValidityPeriod = 1;/* VP */
+               smsParameters.TpProtocolId = 3;/* PID */
+               smsParameters.TpDataCodingScheme = 2;/* DCS */
+               smsParameters.TpValidityPeriod = 1;/* VP */
 
-                       do {
-                               msg("Enter the SCA NUMBER:");
-                               ret = scanf("%s", sca_num);
-                               if (ret > TAPI_SIM_SMSP_ADDRESS_LEN)
-                                       msg("Entered SCA is INVALID - SCA length cannot be greater than %d", TAPI_SIM_SMSP_ADDRESS_LEN);
-                       } while(ret > TAPI_SIM_SMSP_ADDRESS_LEN);
+               do {
+                       msg("Enter the SCA NUMBER:");
+                       ret = scanf("%s", sca_num);
+                       if (ret > TAPI_SIM_SMSP_ADDRESS_LEN)
+                               msg("Entered SCA is INVALID - SCA length cannot be greater than %d", TAPI_SIM_SMSP_ADDRESS_LEN);
+               } while (ret > TAPI_SIM_SMSP_ADDRESS_LEN);
 
-                       sca_length = SmsUtilEncodeSca(&(smsParameters.TpSvcCntrAddr), sca_num);
-                       msg("Encoded SCA Address Length[%d]", sca_length);
+               sca_length = SmsUtilEncodeSca(&(smsParameters.TpSvcCntrAddr), sca_num);
+               msg("Encoded SCA Address Length[%d]", sca_length);
 
-                       returnStatus = tel_set_sms_parameters (handle, &smsParameters, on_resp_set_sms_params, NULL );
-                       msg("returnstatus after sparam set  is %d", returnStatus);
+               returnStatus = tel_set_sms_parameters(handle, &smsParameters, on_resp_set_sms_params, NULL);
+               msg("returnstatus after sparam set  is %d", returnStatus);
+       }
+       break;
 
-                       break;
+       case 6: { /* Set Memory Full Notification */
+               msg("Enter Memory Status to be set(1:Memory Available, 2:Memory Full)");
+               memset(MemoryStatus, 0, sizeof(MemoryStatus));
+               ret = read(0, MemoryStatus, sizeof(MemoryStatus));
+               if (ret <= 0) {
+                       msg(" NULL msg can NOT be sent ");
+                       return -1;
                }
-               case 6: //Set Memory Full Notification
-               {
-                       msg(
-                                       "Enter Memory Status to be set(1:Memory Available, 2:Memory Full)");
-                       memset (MemoryStatus, 0, sizeof (MemoryStatus));
-                       ret = read (0, MemoryStatus, sizeof (MemoryStatus));
-                       if (ret <= 0) {
-                               msg(" NULL msg can NOT be sent ");
-                               return -1;
-                       }
-                       msg("Memory Status type is %d ", atoi (MemoryStatus));
-                       returnStatus = tel_set_sms_memory_status (handle,
-                                       atoi (MemoryStatus), on_resp_set_mem_status, NULL ); //Set to full 0x02-Full, 0x01-available
-                       msg("api err after memstatus set is is %d", returnStatus);
+               msg("Memory Status type is %d ", atoi(MemoryStatus));
+               returnStatus = tel_set_sms_memory_status(handle,
+                               atoi(MemoryStatus), on_resp_set_mem_status, NULL); /* Set to full 0x02-Full, 0x01-available */
+               msg("api err after memstatus set is is %d", returnStatus);
+       }
+       break;
 
-                       break;
-               }
-               case 7: //Set Stored MsgStaus
-               {
-                       msg("Not suppored in this Test App !!!");
-                       break;
-               }
-               case 8: {
-// JYGU                                returnStatus =tel_set_sms_device_status();
-                       msg("Not suppored in this Test App !!!");
-                       break;
-               }
-               case 9: {
-                       msg("Not suppored in this Test App !!!");
-                       break;
-               }
-               default:
-                       return -1;
+       case 7: { /* Set Stored MsgStaus */
+               msg("Not suppored in this Test App !!!");
+       }
+       break;
+
+       case 8: {
+               msg("Not suppored in this Test App !!!");
+       }
+       break;
+
+       case 9: {
+               msg("Not suppored in this Test App !!!");
        }
+       break;
+
+       default:
+               return -1;
+       }
+
        return 1;
 }
 
-static int CdmaCbSetting (MManager *mm, struct menu_data *menu)
+static int CdmaCbSetting(MManager *mm, struct menu_data *menu)
 {
-       TapiHandle *handle = menu_manager_ref_user_data (mm);
+       TapiHandle *handle = menu_manager_ref_user_data(mm);
        TelSmsCbConfig_t *cb_config;
        int i;
        int return_status = 0;
 
        msg("****Setting the CB configuration(Api:SetCbConfig)****");
 
-       cb_config = calloc (1, sizeof(TelSmsCbConfig_t));
+       cb_config = calloc(1, sizeof(TelSmsCbConfig_t));
        if (!cb_config)
                return -1;
 
@@ -2076,12 +2034,12 @@ static int CdmaCbSetting (MManager *mm, struct menu_data *menu)
        msg("Enter Max ID Count: ");
        cb_config->MsgIdMaxCount = _get_int();
 
-       msg("Enter MsgIdRangeCount ( < 10 ): ");
+       msg("Enter MsgIdRangeCount (< 10): ");
        cb_config->MsgIdRangeCount = _get_int();
 
        if (cb_config->MsgIdRangeCount <= 0 || cb_config->MsgIdRangeCount >= TAPI_NETTEXT_SMS_CBMI_LIST_SIZE_MAX) {
                msg("Bad Range value");
-               free (cb_config);
+               free(cb_config);
                return -1;
        }
 
@@ -2096,15 +2054,15 @@ static int CdmaCbSetting (MManager *mm, struct menu_data *menu)
                cb_config->MsgIDs[i].Net3gpp2.Selected = _get_int();
        }
 
-       cb_config->Net3gppType= 0x02;/* CDMA */
+       cb_config->Net3gppType = 0x02; /* CDMA */
 
-       msg("CBEnabled:%d,Net3gppType:%d,msgIdRangeCount:%d",
+       msg("CBEnabled:%d, Net3gppType:%d, msgIdRangeCount:%d",
                        cb_config->CBEnabled, cb_config->Net3gppType, cb_config->MsgIdRangeCount);
 
-       return_status = tel_set_sms_cb_config (handle, cb_config, on_resp_set_sms_cb_config, NULL );
+       return_status = tel_set_sms_cb_config(handle, cb_config, on_resp_set_sms_cb_config, NULL);
        msg("returnStatus after cbconfig set is [%d]", return_status);
 
-       free (cb_config);
+       free(cb_config);
        return 1;
 }
 
@@ -2157,38 +2115,33 @@ static struct menu_data menu_sms_cdma[] = {
 struct menu_data menu_sms[] = { { "1", "3GPP[GSM/WCDMA]", menu_sms_wcdma, NULL, NULL }, {
                "2", "3GPP2[CDMA/1xEV-DO]", menu_sms_cdma, NULL, NULL }, { NULL, NULL , }, };
 
-void register_sms_event (TapiHandle *handle)
+void register_sms_event(TapiHandle *handle)
 {
        int ret;
 
        /* SMS */
-       ret = tel_register_noti_event (handle, TAPI_NOTI_SMS_INCOM_MSG,
-                       on_noti_sms_incom_msg, NULL );
-       if (ret != TAPI_API_SUCCESS) {
+       ret = tel_register_noti_event(handle, TAPI_NOTI_SMS_INCOM_MSG,
+                       on_noti_sms_incom_msg, NULL);
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle, TAPI_NOTI_SMS_CB_INCOM_MSG,
-                       on_noti_sms_cb_incom_msg, NULL );
-       if (ret != TAPI_API_SUCCESS) {
+       ret = tel_register_noti_event(handle, TAPI_NOTI_SMS_CB_INCOM_MSG,
+                       on_noti_sms_cb_incom_msg, NULL);
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle, TAPI_NOTI_SMS_ETWS_INCOM_MSG,
-                       on_noti_sms_etws_incom_msg, NULL );
-       if (ret != TAPI_API_SUCCESS) {
+       ret = tel_register_noti_event(handle, TAPI_NOTI_SMS_ETWS_INCOM_MSG,
+                       on_noti_sms_etws_incom_msg, NULL);
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle, TAPI_NOTI_SMS_MEMORY_STATUS,
-                       on_noti_sms_memory_status, NULL );
-       if (ret != TAPI_API_SUCCESS) {
+       ret = tel_register_noti_event(handle, TAPI_NOTI_SMS_MEMORY_STATUS,
+                       on_noti_sms_memory_status, NULL);
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
-       ret = tel_register_noti_event (handle, TAPI_NOTI_SMS_DEVICE_READY,
-                       on_noti_sms_ready_status, NULL );
-       if (ret != TAPI_API_SUCCESS) {
+       ret = tel_register_noti_event(handle, TAPI_NOTI_SMS_DEVICE_READY,
+                       on_noti_sms_ready_status, NULL);
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 }
index 8e214914f034e95c0ef8b0d6852497a2f50aeda9..90a715b8690c50fcaff6247945c95d6c93d8cdc9 100644 (file)
 #include "sms_util.h"
 #include "menu.h"
 
-void  reverse(charx, int len)
+void  reverse(char *x, int len)
 {
        int i, j = len - 1;
 
-       for (i = 0; i < j; i++)
-       {
+       for (i = 0; i < j; i++) {
                int t = x[i];
                x[i] = x[j];
                x[j--] = t;
        }
 }
 
-char*  AcItoa(int n, char* str, int b)
+char *AcItoa(int n, char *str, int b)
 {
        int i = 0;
 
@@ -52,10 +51,10 @@ char*  AcItoa(int n, char* str, int b)
 
 int  AcToupper(int ch)
 {
-       return (('a' <= (ch) && (ch) <= 'z')? ((ch) - ('a'-'A')) : (ch));
+       return (('a' <= (ch) && (ch) <= 'z') ? ((ch) - ('a'-'A')) : (ch));
 }
 
-char* SmsUtilUnpackGSMCode(char* szData, const char* pIn, int in_len )
+char *SmsUtilUnpackGSMCode(char *szData, const char *pIn, int in_len)
 {
        int i;
        int pos = 0;
@@ -63,76 +62,66 @@ char* SmsUtilUnpackGSMCode(char* szData, const char* pIn, int in_len )
 
        /* If the number of fill bits != 0, then it would cause an additional shift */
        /*
-       if ( shift != 0 )
+       if (shift != 0)
                pos = pos + 1;
 
-       if ( shift ==7 )
+       if (shift ==7)
                shift = 0;
        */
 
-       for ( i = 0; i < in_len; i++, pos++ )
-       {
-               szData[i] = ( pIn[pos] << shift ) & 0x7F;
+       for (i = 0; i < in_len; i++, pos++) {
+               szData[i] = (pIn[pos] << shift) & 0x7F;
 
-               if ( pos != 0 )
-               {
-                       /* except the first byte, a character contains some bits
-                       ** from the previous byte.
-                       */
+               if (pos != 0) {
+                       /*
+                        * except the first byte, a character contains some bits
+                        * from the previous byte.
+                        */
                        szData[i] |= pIn[pos-1] >> (8-shift);
                }
 
-               shift ++;
+               shift++;
 
-               if ( shift == 7 )
-               {
+               if (shift == 7) {
                        shift = 0;
 
                        /* a possible extra complete character is available */
                        i++;
                        szData[i] = pIn[pos] >> 1;
 
-                       if( szData[i] == 0 )
-                       {
+                       if (szData[i] == 0)
                                /* this is the end of the input, quit */
                                break;
-                       }
                }
        }
 
        return szData;
 }
 
-int SmsUtilPackGSMCode( unsigned char *pOut, const char* szData, int in_len )
+int SmsUtilPackGSMCode(unsigned char *pOut, const char *szData, int in_len)
 {
        int i;
        int pos;
        int shift = 0;
-       //shift = fill_bits;
-
-       //  memset( out, 0, out_len_max );
 
        /* pack the ASCII characters
        */
        /*
-       if ( shift == 7 )
+       if (shift == 7)
                shift = 0;
        */
 
-       for( pos = 0, i = 0; /*pos < out_len_max &&*/ i < in_len; pos++, i++ )
-       {
+       for (pos = 0, i = 0; /*pos < out_len_max &&*/ i < in_len; pos++, i++) {
                /* pack the low bits */
                pOut[pos] = szData[i] >> shift;
 
-               if ( i + 1 < in_len )
-               {
+               if (i + 1 < in_len) {
                        /* pack the high bits using the low bits of the next character */
-                       pOut[pos] |= szData[i+1] << ( 7 - shift );
+                       pOut[pos] |= szData[i+1] << (7 - shift);
 
                        shift++;
 
-                       if( shift == 7 )
-                       {
+                       if (shift == 7) {
                                shift = 0;
                                i++;
                        }
@@ -144,162 +133,141 @@ int SmsUtilPackGSMCode( unsigned char *pOut, const char* szData, int in_len )
 }
 
 
-void SmsUtilConvertBCD2Digit( char* pDigits, char* pBCD, int digitLen )
+void SmsUtilConvertBCD2Digit(char *pDigits, char *pBCD, int digitLen)
 {
        int             i, bcdLen;
        char    c[2];
        unsigned char   higher, lower;
 
-       if ( pBCD == NULL || pDigits == NULL )
-       {
-               printf("__SmsConvertBCD2Digit: pBCD == NULL || pDigits == NULL. return.\n"  );
+       if (pBCD == NULL || pDigits == NULL) {
+               printf("__SmsConvertBCD2Digit: pBCD == NULL || pDigits == NULL. return.\n");
                return;
        }
 
-       if ( digitLen == 0 )
-       {
-               //printf("__SmsConvertBCD2Digit: digitLen == 0. return.\n" );
-
+       if (digitLen == 0) {
                pDigits[0] = 0x00;
 
                return;
        }
 
-       if ( digitLen % 2 )
+       if (digitLen % 2)
                bcdLen = digitLen / 2 + 1;
        else
                bcdLen = digitLen / 2;
 
-       memset( pDigits, 0, bcdLen * 2 );
+       memset(pDigits, 0, bcdLen * 2);
 
-       for ( i = 0; i < bcdLen; i++ )
-       {
-               lower = pBCD[i] & 0x0F;                                 // get low nibble
+       for (i = 0; i < bcdLen; i++) {
+               lower = pBCD[i] & 0x0F; /* get low nibble */
 
-               if ( lower == 0x0A )
+               if (lower == 0x0A) {
                        lower = '*';
-               else if ( lower == 0x0B )
+               } else if (lower == 0x0B) {
                        lower = '#';
-               else if ( lower == 0x0C )
-                       lower = 'p';                    //DTMF Control pDigits seperator
-               else if ( lower == 0x0F )
+               } else if (lower == 0x0C) {
+                       lower = 'p';    /* DTMF Control pDigits seperator */
+               } else if (lower == 0x0F) {
                        lower = 0;
-               else
-               {
-                       AcItoa( lower, c, 16 );
+               } else {
+                       AcItoa(lower, c, 16);
                        lower = (char) AcToupper(c[0]);
                }
 
-               higher = ( pBCD[i] >> 4 ) & 0x0F;                       // get high nibble
-
-               if ( higher == 0x0A )
-                       higher = '*';           // =0x2A
-               else if ( higher == 0x0B )
-                       higher = '#';           // =0x23
-               else if ( higher == 0x0C )
-                       higher = 'p';           // =0x70, DTMF Control pDigits seperator
-               else if ( higher == 0x0F ) // if higher semi-octet is 0x0F, filled bits.
-               {
-                       //higher = 0;
-                       sprintf(pDigits + strlen(pDigits), "%c", lower);
-                       pDigits[/*digitLen-1*/bcdLen*2-1] = '\0';
+               higher = (pBCD[i] >> 4) & 0x0F; /* get high nibble */
 
-                       //printf("__SmsConvertBCD2Digit: pDigits [%s].\n", pDigits  );
+               if (higher == 0x0A) {
+                       higher = '*';           /* 0x2A */
+               } else if (higher == 0x0B) {
+                       higher = '#';           /* 0x23 */
+               } else if (higher == 0x0C) {
+                       higher = 'p';           /* 0x70, DTMF Control pDigits seperator */
+               } else if (higher == 0x0F) { /* if higher semi-octet is 0x0F, filled bits. */
+                       snprintf(pDigits + strlen(pDigits), 2, "%c", lower);
+                       pDigits[/*digitLen-1*/bcdLen*2-1] = '\0';
 
                        return;
-               }
-               else
-               {
+               } else {
                        AcItoa(higher, c, 16);
-                       higher = (char) AcToupper(c[0]);
+                       higher = (char)AcToupper(c[0]);
                }
 
-               //sprintf(pDigits, "%s%c%c", pDigits, lower, higher);
-               sprintf(pDigits + strlen(pDigits), "%c%c", lower, higher);
+               snprintf(pDigits + strlen(pDigits), 3, "%c%c", lower, higher);
        }
 
        pDigits[digitLen] = '\0';
-
-       //printf("__SmsConvertBCD2Digit: pDigits [%s].\n", pDigits  );
 }
 
-
-void SmsUtilConvertDigit2BCD( char* pBCD, char* pDigits, int digitLen )
+void SmsUtilConvertDigit2BCD(char *pBCD, char *pDigits, int digitLen)
 {
        int     i, j, digit;
 
        unsigned char   higher, lower;
 
-       if ( pBCD == NULL || pDigits == NULL )
+       if (pBCD == NULL || pDigits == NULL)
                return;
 
-       // 0123456789 -> 1032547698
-       for ( i = 0, j = 0; i < digitLen; i = i + 2, j++ )
-       {
-               if ( pDigits[i] == '*' )
+       /* 0123456789 -> 1032547698 */
+       for (i = 0, j = 0; i < digitLen; i = i + 2, j++) {
+               if (pDigits[i] == '*')
                        digit = 0x0A;
-               else if ( pDigits[i] == '#' )
+               else if (pDigits[i] == '#')
                        digit = 0x0B;
-               else if ( AcToupper( pDigits[i] ) == 'P' )
+               else if (AcToupper(pDigits[i]) == 'P')
                        digit = 0x0C;
                else
-                       digit = (int) ( pDigits[i] - '0' );
+                       digit = (int) (pDigits[i] - '0');
 
                lower = digit & 0x0F;
 
-               if ( digitLen != i + 1 )
-               {
-                       if ( pDigits[i+1] == '*' )
+               if (digitLen != i + 1) {
+                       if (pDigits[i+1] == '*')
                                digit = 0x0A;
-                       else if ( pDigits[i+1] == '#' )
+                       else if (pDigits[i+1] == '#')
                                digit = 0x0B;
-                       else if ( AcToupper( pDigits[i+1] ) == 'P' )
+                       else if (AcToupper(pDigits[i+1]) == 'P')
                                digit = 0x0C;
                        else
-                               digit = (int) ( pDigits[i+1] - '0' );
+                               digit = (int) (pDigits[i+1] - '0');
 
                        higher = digit & 0x0F;
-               }
-               else
-               {
+               } else {
                        higher = 0xFF;
                }
 
-               pBCD[j] = ( higher << 4 ) | lower;
+               pBCD[j] = (higher << 4) | lower;
        }
 }
 
 
-TmDateTime* SmsUtilDecodeTimeStamp(char * pTimeStamp, TmDateTime *tmDateTime )
+TmDateTime *SmsUtilDecodeTimeStamp(char *pTimeStamp, TmDateTime *tmDateTime)
 {
-       //TmDateTime tmDateTime;
        char szBuf[3];
-       //TS_UINT32     time;
 
-       if ( pTimeStamp == NULL )
+       if (pTimeStamp == NULL)
                return NULL;
 
-       SmsUtilConvertBCD2Digit( szBuf, (char*) &pTimeStamp[0], 2 );
-       tmDateTime->year = atoi( szBuf ) + 2000;
-       if ( ( tmDateTime->year >= 1900 + MAX_YEAR )/* && ( tmDateTime->year < 2000 + BASE_YEAR )*/ )
+       SmsUtilConvertBCD2Digit(szBuf, (char *)&pTimeStamp[0], 2);
+       tmDateTime->year = atoi(szBuf) + 2000;
+       if ((tmDateTime->year >= 1900 + MAX_YEAR))
                tmDateTime->year -= 100;
-       SmsUtilConvertBCD2Digit( szBuf, (char*) &pTimeStamp[1], 2 );
-       tmDateTime->month = atoi( szBuf );
-       SmsUtilConvertBCD2Digit( szBuf, (char*) &pTimeStamp[2], 2 );
-       tmDateTime->day = atoi( szBuf );
-       SmsUtilConvertBCD2Digit( szBuf, (char*) &pTimeStamp[3], 2 );
-       tmDateTime->hour = atoi( szBuf );
-       SmsUtilConvertBCD2Digit( szBuf, (char*) &pTimeStamp[4], 2 );
-       tmDateTime->minute = atoi( szBuf );
-       SmsUtilConvertBCD2Digit( szBuf, (char*) &pTimeStamp[5], 2 );
-       tmDateTime->second = atoi( szBuf );
-
-       if ( ( tmDateTime->year < 1900 + BASE_YEAR ) || ( tmDateTime->year > 1900 + MAX_YEAR ) )
+
+       SmsUtilConvertBCD2Digit(szBuf, (char *)&pTimeStamp[1], 2);
+       tmDateTime->month = atoi(szBuf);
+       SmsUtilConvertBCD2Digit(szBuf, (char *)&pTimeStamp[2], 2);
+       tmDateTime->day = atoi(szBuf);
+       SmsUtilConvertBCD2Digit(szBuf, (char *)&pTimeStamp[3], 2);
+       tmDateTime->hour = atoi(szBuf);
+       SmsUtilConvertBCD2Digit(szBuf, (char *)&pTimeStamp[4], 2);
+       tmDateTime->minute = atoi(szBuf);
+       SmsUtilConvertBCD2Digit(szBuf, (char *)&pTimeStamp[5], 2);
+       tmDateTime->second = atoi(szBuf);
+
+       if ((tmDateTime->year < 1900 + BASE_YEAR) || (tmDateTime->year > 1900 + MAX_YEAR))
                tmDateTime->year = 1900 + BASE_YEAR;
 
        /*
-       time = TmDateTimeToSeconds( &tmDateTime );
-       if ( time > MAX_SECONDS )
+       time = TmDateTimeToSeconds(&tmDateTime);
+       if (time > MAX_SECONDS)
                time = MAX_SECONDS;
 
        */
@@ -307,233 +275,202 @@ TmDateTime* SmsUtilDecodeTimeStamp(char * pTimeStamp, TmDateTime *tmDateTime )
        return tmDateTime;
 }
 
-unsigned char* SmsUtilEncodeTimeStamp( TmDateTime* tmDateTime, unsigned char* pTimeStamp )
+unsigned char *SmsUtilEncodeTimeStamp(TmDateTime *tmDateTime, unsigned char *pTimeStamp)
 {
-       //TmDateTime tmDateTime;
        char szBuf[3];
-       int     year;
+       int year;
 
-       if ( pTimeStamp == NULL )
+       if (pTimeStamp == NULL)
                return NULL;
 
-       memset( (void*) pTimeStamp, 0x00, sizeof ( unsigned char ) * 7 );
-
-       //TmSecondsToDateTime( timeStamp, &tmDateTime );
+       memset((void *)pTimeStamp, 0x00, sizeof(unsigned char) * 7);
 
        year = tmDateTime->year - 2000;
-       if ( year < 0 )
+       if (year < 0)
                year += 100;
-       sprintf( szBuf, "%02d", year );
-       SmsUtilConvertDigit2BCD( (char*) &pTimeStamp[0], szBuf, 2 );
-       sprintf( szBuf, "%02d", tmDateTime->month );
-       SmsUtilConvertDigit2BCD( (char*) &pTimeStamp[1], szBuf, 2 );
-       sprintf( szBuf, "%02d", tmDateTime->day );
-       SmsUtilConvertDigit2BCD( (char*) &pTimeStamp[2], szBuf, 2 );
-       sprintf( szBuf, "%02d", tmDateTime->hour );
-       SmsUtilConvertDigit2BCD( (char*) &pTimeStamp[3], szBuf, 2 );
-       sprintf( szBuf, "%02d", tmDateTime->minute );
-       SmsUtilConvertDigit2BCD( (char*) &pTimeStamp[4], szBuf, 2 );
-       sprintf( szBuf, "%02d", tmDateTime->second );
-       SmsUtilConvertDigit2BCD( (char*) &pTimeStamp[5], szBuf, 2 );
+       snprintf(szBuf, 3, "%02d", year);
+       SmsUtilConvertDigit2BCD((char *)&pTimeStamp[0], szBuf, 2);
+       snprintf(szBuf, 3, "%02d", tmDateTime->month);
+       SmsUtilConvertDigit2BCD((char *)&pTimeStamp[1], szBuf, 2);
+       snprintf(szBuf, 3, "%02d", tmDateTime->day);
+       SmsUtilConvertDigit2BCD((char *)&pTimeStamp[2], szBuf, 2);
+       snprintf(szBuf, 3, "%02d", tmDateTime->hour);
+       SmsUtilConvertDigit2BCD((char *)&pTimeStamp[3], szBuf, 2);
+       snprintf(szBuf, 3, "%02d", tmDateTime->minute);
+       SmsUtilConvertDigit2BCD((char *)&pTimeStamp[4], szBuf, 2);
+       snprintf(szBuf, 3, "%02d", tmDateTime->second);
+       SmsUtilConvertDigit2BCD((char *)&pTimeStamp[5], szBuf, 2);
 
 
        /*      ignore Time zone (assume it is using 0x00 as default)
        timeZone = TmGetTimeZoneOffset() /15;
-       if ( timeZone < 0 )
+       if (timeZone < 0)
                absTimeZone = -timeZone;
        else
                absTimeZone = timeZone;
        */
 
-       sprintf( szBuf, "%02d", 0);
-       SmsUtilConvertDigit2BCD( (char*) &pTimeStamp[6], szBuf, 2 );
-
-       //if ( timeZone < 0 )
-       //      pTimeStamp[6] |= 0x80;
+       snprintf(szBuf, 3, "%02d", 0);
+       SmsUtilConvertDigit2BCD((char *)&pTimeStamp[6], szBuf, 2);
 
        return pTimeStamp;
 }
 
 
 
-int  SmsUtilDecodeAddrField(char *diallingNum, char* pAddrField, int *result_ton, int *result_npi )
+int  SmsUtilDecodeAddrField(char *diallingNum, char *pAddrField, int *result_ton, int *result_npi)
 {
        int local_index = 0;
-       int  ton,npi;
-       int DialNumLen=0;
+       int  ton, npi;
+       int DialNumLen = 0;
 
-       ton = ( pAddrField[local_index+1] & 0x70 ) >> 4;
+       ton = (pAddrField[local_index+1] & 0x70) >> 4;
        npi = pAddrField[local_index+1] & 0x0F;
 
-       if ( ton != SMS_TON_ALPHA_NUMERIC )
-       {
-               // Origination/Destination address ï¿½Êµå¿¡ï¿½ï¿½ï¿½ï¿½ length�� ï¿½ï¿½ï¿½ï¿½ address length
-               // origination/destination address ï¿½Êµï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ length�� 0 ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ number type/plan ï¿½Êµï¿½ï¿½ 0xFF ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½Â´ï¿½.
+       if (ton != SMS_TON_ALPHA_NUMERIC) {
+               /*
+                * Origination/Destination address ï¿½Êµå¿¡ï¿½ï¿½ï¿½ï¿½ length�� ï¿½ï¿½ï¿½ï¿½ address length
+                *
+                * origination/destination address ï¿½Êµï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ length�� 0 ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ number type/plan ï¿½Êµï¿½ï¿½ 0xFF ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½Â´ï¿½.
+                */
                DialNumLen = pAddrField[local_index++];
+       } else {
+               DialNumLen = (((pAddrField[local_index++] + 1) / 2) * 8) / 7;
        }
-       else
-       {
-               DialNumLen = ( ( ( pAddrField[local_index++] + 1 ) / 2 ) * 8 ) / 7;
-       }
-
-
-
 
-       // SIM_SMSP_ADDRESS_LEN ï¿½ï¿½ï¿½ï¿½ address length ï¿½ï¿½ Å©ï¿½ï¿½ SIM_SMSP_ADDRESS_LEN ï¿½ï¿½Å­ï¿½ï¿½ ï¿½ï¿½È¯ï¿½ï¿½ ï¿½Ñ´ï¿½.
-
-       if ( DialNumLen > SMS_ADDRESS_LEN_MAX )
-       {
+       /* SIM_SMSP_ADDRESS_LEN ï¿½ï¿½ï¿½ï¿½ address length ï¿½ï¿½ Å©ï¿½ï¿½ SIM_SMSP_ADDRESS_LEN ï¿½ï¿½Å­ï¿½ï¿½ ï¿½ï¿½È¯ï¿½ï¿½ ï¿½Ñ´ï¿½. */
+       if (DialNumLen > SMS_ADDRESS_LEN_MAX)
                DialNumLen = SMS_ADDRESS_LEN_MAX;
-       }
 
-       printf(" DialNumLen = %d\n", DialNumLen  );
+       printf(" DialNumLen = %d\n", DialNumLen);
 
        local_index++; /* ignore Type of Address field */
 
-       if (ton != SMS_TON_ALPHA_NUMERIC )
-       {
-               SmsUtilConvertBCD2Digit( diallingNum, (char*) &pAddrField[local_index],DialNumLen );
-       }
+       if (ton != SMS_TON_ALPHA_NUMERIC)
+               SmsUtilConvertBCD2Digit(diallingNum, (char *)&pAddrField[local_index], DialNumLen);
        else
-       {
-               SmsUtilUnpackGSMCode( diallingNum, &pAddrField[local_index],DialNumLen );
-       }
+               SmsUtilUnpackGSMCode(diallingNum, &pAddrField[local_index], DialNumLen);
 
-       printf(  "__SmsDecodeAddrField: diallingNum [%s].\n", (char*) diallingNum  );
+       printf("__SmsDecodeAddrField: diallingNum [%s].\n", (char *)diallingNum);
 
-       *result_ton=ton;
-       *result_npi=npi;
+       *result_ton = ton;
+       *result_npi = npi;
 
-       printf("ton %d npi %d\n",ton,npi);
+       printf("ton %d npi %d\n", ton, npi);
 
        return DialNumLen;
 
 
 }
 
-int  SmsUtilEncodeAddrField(unsigned char* pAddrField, char* diallingNum, int DialNumLen, int ton, int npi )
+int  SmsUtilEncodeAddrField(unsigned char *pAddrField, char *diallingNum, int DialNumLen, int ton, int npi)
 {
        int local_index = 0;
 
-       if ( diallingNum == NULL || pAddrField == NULL )
+       if (diallingNum == NULL || pAddrField == NULL)
                return -1;
 
-       if ( diallingNum[0] == '+' )
-       {
+       if (diallingNum[0] == '+') {
                diallingNum++;
                DialNumLen--;
                ton = SMS_TON_INTERNATIONAL;
        }
 
-       if ( ton != SMS_TON_ALPHA_NUMERIC )
-       {
-               // Origination/Destination address ï¿½Êµå¿¡ï¿½ï¿½ï¿½ï¿½ length�� ï¿½ï¿½ï¿½ï¿½ address length
+       if (ton != SMS_TON_ALPHA_NUMERIC) {
+               /* Origination/Destination address ï¿½Êµå¿¡ï¿½ï¿½ï¿½ï¿½ length�� ï¿½ï¿½ï¿½ï¿½ address length */
                pAddrField[local_index++] = (unsigned char)DialNumLen;
-               //printf(" addr len packet: %d\n", pAddrField[local_index]);
-       }
-       else
-       {
-               pAddrField[local_index] = (unsigned char) ( ( ( DialNumLen * 7 + 7 ) / 8 ) * 2 );
+       } else {
+               pAddrField[local_index] = (unsigned char) (((DialNumLen * 7 + 7) / 8) * 2);
 
-               // ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½Æ®ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ 4��Ʈ�� ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ length ï¿½Êµå°ªï¿½ï¿½ -1�� ï¿½Ñ´ï¿½.
-               if ( ( ( DialNumLen * 7 ) % 8 ) <= 4 )
+               /* ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½Æ®ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ 4��Ʈ�� ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ length ï¿½Êµå°ªï¿½ï¿½ -1�� ï¿½Ñ´ï¿½. */
+               if (((DialNumLen * 7) % 8) <= 4)
                        pAddrField[local_index]--;
 
-               printf(" addr len packet: %d out of SMS_TON_ALPAHA\n", pAddrField[local_index]);
+               printf(" addr len packet: %d out of SMS_TON_ALPAHA\n", pAddrField[local_index]);
 
                local_index++;
        }
 
-       SET_TON_NPI( pAddrField[local_index], ton, npi );
+       SET_TON_NPI(pAddrField[local_index], ton, npi);
 
-       local_index++; // SET_TON_NPI ï¿½ï¿½ MACRO ï¿½Ì¹Ç·ï¿½ ï¿½ï¿½ï¿½Î¿ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Å°ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½
+       local_index++; /* SET_TON_NPI ï¿½ï¿½ MACRO ï¿½Ì¹Ç·ï¿½ ï¿½ï¿½ï¿½Î¿ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Å°ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ */
 
-       if ( ton != SMS_TON_ALPHA_NUMERIC )
-       {
-               SmsUtilConvertDigit2BCD( (char*) &pAddrField[local_index], (char*) diallingNum, DialNumLen );
+       if (ton != SMS_TON_ALPHA_NUMERIC) {
+               SmsUtilConvertDigit2BCD((char *)&pAddrField[local_index], (char *) diallingNum, DialNumLen);
 
-               if ( DialNumLen % 2 )
+               if (DialNumLen % 2)
                        local_index += DialNumLen / 2 + 1;
                else
                        local_index += DialNumLen / 2;
-       }
-       else
-       {
-               local_index += SmsUtilPackGSMCode( &pAddrField[local_index], diallingNum, (int) DialNumLen );
+       } else {
+               local_index += SmsUtilPackGSMCode(&pAddrField[local_index], diallingNum, (int) DialNumLen);
        }
 
        return local_index;
 }
-int SmsUtilDecodeScAddrField( SmsAddressInfo_t* pSmsAddrField, unsigned char* pAddrField )
+
+int SmsUtilDecodeScAddrField(SmsAddressInfo_t *pSmsAddrField, unsigned char *pAddrField)
 {
        int local_index = 0;
        int length = 0;
 
        printf("SmsUtilDecodeScAddrField\n");
 
-       if ( pSmsAddrField == NULL || pAddrField == NULL )
-       {
-               printf( "SmsUtilDecodeScAddrField: pSimAddrField or pAddrField is NULL.\n"  );
+       if (pSmsAddrField == NULL || pAddrField == NULL) {
+               printf("SmsUtilDecodeScAddrField: pSimAddrField or pAddrField is NULL.\n");
 
                return 0;
        }
 
-       // Service Center address ï¿½Êµå¿¡ï¿½ï¿½ï¿½ï¿½ length�� ï¿½Ú¿ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ byte�� ï¿½ï¿½
-       // -> ï¿½ï¿½ï¿½ï¿½ address ï¿½ï¿½ï¿½Ì´ï¿½ TON/API ï¿½ï¿½ï¿½ï¿½Æ®ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½Ï°ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½Æ®ï¿½ï¿½ 2�� or 2�� - 1(���� ï¿½ï¿½ï¿½Ì°ï¿½ È¦ï¿½ï¿½ï¿½Î°ï¿½ï¿½)
+       /* Service Center address ï¿½Êµå¿¡ï¿½ï¿½ï¿½ï¿½ length�� ï¿½Ú¿ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ byte�� ï¿½ï¿½ */
+       /* -> ï¿½ï¿½ï¿½ï¿½ address ï¿½ï¿½ï¿½Ì´ï¿½ TON/API ï¿½ï¿½ï¿½ï¿½Æ®ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½Ï°ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½Æ®ï¿½ï¿½ 2�� or 2�� - 1(���� ï¿½ï¿½ï¿½Ì°ï¿½ È¦ï¿½ï¿½ï¿½Î°ï¿½ï¿½) */
        length = pAddrField[local_index];
-       // ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ ï¿½Þ½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ì¿¡ï¿½ï¿½ service center address�� ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ ï¿½Ö´ï¿½.
-       // ï¿½ï¿½ ï¿½ï¿½ì¿¡ length ï¿½ï¿½ 0 ï¿½Ì¸ï¿½ number type, plan ï¿½ï¿½ ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½
-       // length ï¿½ï¿½ 1 ï¿½Ì¸ï¿½ type, plan ï¿½ï¿½ ï¿½Ö´ï¿½ ï¿½ï¿½ï¿½
-       if ( length > 1 )
-       {
-               pSmsAddrField->DialNumLen = ( pAddrField[local_index++] - 1 ) * 2; // -1�� TON/API ï¿½Êµï¿½
-
-               // SMS_SMSP_ADDRESS_LEN ï¿½ï¿½ï¿½ï¿½ address length ï¿½ï¿½ Å©ï¿½ï¿½ SMS_SMSP_ADDRESS_LEN ï¿½ï¿½Å­ï¿½ï¿½ ï¿½ï¿½È¯ï¿½ï¿½ ï¿½Ñ´ï¿½.
-               if ( pSmsAddrField->DialNumLen > SMS_ADDRESS_LEN_MAX )
-               {
+       /* ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ ï¿½Þ½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ì¿¡ï¿½ï¿½ service center address�� ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ ï¿½Ö´ï¿½. */
+       /* ï¿½ï¿½ ï¿½ï¿½ì¿¡ length ï¿½ï¿½ 0 ï¿½Ì¸ï¿½ number type, plan ï¿½ï¿½ ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ */
+       /* length ï¿½ï¿½ 1 ï¿½Ì¸ï¿½ type, plan ï¿½ï¿½ ï¿½Ö´ï¿½ ï¿½ï¿½ï¿½ */
+       if (length > 1) {
+               pSmsAddrField->DialNumLen = (pAddrField[local_index++] - 1) * 2; /* -1�� TON/API ï¿½Êµï¿½ */
+
+               /* SMS_SMSP_ADDRESS_LEN ï¿½ï¿½ï¿½ï¿½ address length ï¿½ï¿½ Å©ï¿½ï¿½ SMS_SMSP_ADDRESS_LEN ï¿½ï¿½Å­ï¿½ï¿½ ï¿½ï¿½È¯ï¿½ï¿½ ï¿½Ñ´ï¿½. */
+               if (pSmsAddrField->DialNumLen > SMS_ADDRESS_LEN_MAX)
                        pSmsAddrField->DialNumLen = SMS_ADDRESS_LEN_MAX;
-               }
 
-               pSmsAddrField->Ton = ( pAddrField[local_index] & 0x70 ) >> 4;
+               pSmsAddrField->Ton = (pAddrField[local_index] & 0x70) >> 4;
                pSmsAddrField->Npi = pAddrField[local_index] & 0x0F;
 
                local_index++; /* ignore Type of Address field */
 
-               SmsUtilConvertBCD2Digit( (char*) pSmsAddrField->szDiallingNum, (char*) &pAddrField[local_index], pSmsAddrField->DialNumLen );
+               SmsUtilConvertBCD2Digit((char *) pSmsAddrField->DialNumLen, (char *)&pAddrField[local_index], pSmsAddrField->DialNumLen);
 
-               printf( "SmsUtilDecodeScAddrField: diallingNum [%s].\n", (char*) pSmsAddrField->szDiallingNum  );
+               printf("SmsUtilDecodeScAddrField: diallingNum [%s].\n", (char *)pSmsAddrField->DialNumLen);
 
-               printf( "length=%d , ton %d, npi =%d\n",pSmsAddrField->DialNumLen, pSmsAddrField->Ton,pSmsAddrField->Npi );
+               printf("length=%d , ton %d, npi =%d\n", pSmsAddrField->DialNumLen, pSmsAddrField->Ton, pSmsAddrField->Npi);
        }
 
        return ++length;
 }
 
- int  SmsUtilEncodeScAddrField( unsigned char* pAddrField, SmsAddressInfo_t * pSmsAddrField )
+int  SmsUtilEncodeScAddrField(unsigned char *pAddrField, SmsAddressInfo_t *pSmsAddrField)
 {
        int local_index = 0;
 
-       if ( pSmsAddrField == NULL || pAddrField == NULL )
+       if (pSmsAddrField == NULL || pAddrField == NULL)
                return -1;
 
-       // Service Center address ï¿½Êµå¿¡ï¿½ï¿½ï¿½ï¿½ length�� ï¿½Ú¿ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ byte�� ï¿½ï¿½
-       // -> ï¿½ï¿½ï¿½ï¿½ address ï¿½ï¿½ï¿½Ì´ï¿½ TON/API ï¿½ï¿½ï¿½ï¿½Æ®ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½Ï°ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½Æ®ï¿½ï¿½ 2�� or 2�� - 1(���� ï¿½ï¿½ï¿½Ì°ï¿½ È¦ï¿½ï¿½ï¿½Î°ï¿½ï¿½)
-       if ( pSmsAddrField->DialNumLen % 2 )
-       {
-               pAddrField[local_index++] = pSmsAddrField->DialNumLen / 2 + 1 + 1; // +1 ï¿½ï¿½ TON/NPI ï¿½Êµï¿½, È¦ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ß±ï¿½ ï¿½ï¿½ï¿½ï¿½ ï¿½Ñ¹ï¿½ ï¿½ï¿½ +1
-       }
+       /* Service Center address ï¿½Êµå¿¡ï¿½ï¿½ï¿½ï¿½ length�� ï¿½Ú¿ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ byte�� ï¿½ï¿½ */
+       /* -> ï¿½ï¿½ï¿½ï¿½ address ï¿½ï¿½ï¿½Ì´ï¿½ TON/API ï¿½ï¿½ï¿½ï¿½Æ®ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½Ï°ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½Æ®ï¿½ï¿½ 2�� or 2�� - 1(���� ï¿½ï¿½ï¿½Ì°ï¿½ È¦ï¿½ï¿½ï¿½Î°ï¿½ï¿½) */
+       if (pSmsAddrField->DialNumLen % 2)
+       pAddrField[local_index++] = pSmsAddrField->DialNumLen / 2 + 1 + 1; /* +1 ï¿½ï¿½ TON/NPI ï¿½Êµï¿½, È¦ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ß±ï¿½ ï¿½ï¿½ï¿½ï¿½ ï¿½Ñ¹ï¿½ ï¿½ï¿½ +1 */
        else
-       {
-               pAddrField[local_index++] = pSmsAddrField->DialNumLen / 2 + 1; // +1 ï¿½ï¿½ TON/NPI ï¿½Êµï¿½
-       }
+               pAddrField[local_index++] = pSmsAddrField->DialNumLen / 2 + 1; /* +1 ï¿½ï¿½ TON/NPI ï¿½Êµï¿½ */
 
-       SET_TON_NPI( pAddrField[local_index], pSmsAddrField->Ton, pSmsAddrField->Npi );
+       SET_TON_NPI(pAddrField[local_index], pSmsAddrField->Ton, pSmsAddrField->Npi);
 
-       local_index++; // SET_TON_NPI ï¿½ï¿½ MACRO ï¿½Ì¹Ç·ï¿½ ï¿½ï¿½ï¿½Î¿ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Å°ï¿½ï¿½ ï¿½ï¿½ï¿½×¹ß»ï¿½
+       local_index++; /* SET_TON_NPI ï¿½ï¿½ MACRO ï¿½Ì¹Ç·ï¿½ ï¿½ï¿½ï¿½Î¿ï¿½ï¿½ï¿½ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Å°ï¿½ï¿½ ï¿½ï¿½ï¿½×¹ß»ï¿½ */
 
-       SmsUtilConvertDigit2BCD( (char*) &pAddrField[local_index], (char*) pSmsAddrField->szDiallingNum, pSmsAddrField->DialNumLen );
+       SmsUtilConvertDigit2BCD((char *)&pAddrField[local_index], (char *) pSmsAddrField->DialNumLen, pSmsAddrField->DialNumLen);
 
-       if ( pSmsAddrField->DialNumLen % 2 )
+       if (pSmsAddrField->DialNumLen % 2)
                local_index += pSmsAddrField->DialNumLen / 2 + 1;
        else
                local_index += pSmsAddrField->DialNumLen / 2;
@@ -541,359 +478,349 @@ int SmsUtilDecodeScAddrField( SmsAddressInfo_t* pSmsAddrField, unsigned char* pA
        return local_index;
 }
 
-void SmsUtilDecodeDCS( Sms_coding_scheme* pCodingScheme,   unsigned char dcs )
+void SmsUtilDecodeDCS(Sms_coding_scheme *pCodingScheme,   unsigned char dcs)
 {
-       assert( pCodingScheme != NULL );
+       assert(pCodingScheme != NULL);
 
-       memset( pCodingScheme, 0, sizeof ( Sms_coding_scheme ) );
+       memset(pCodingScheme, 0, sizeof(Sms_coding_scheme));
 
-       if ( dcs < 0x40 ) // bits 7..4 = 00xx : general data coding indication
-       {
+       if (dcs < 0x40) {
+               /* bits 7..4 = 00xx : general data coding indication */
                pCodingScheme->coding_group_type = SMS_CODGRP_SM_GENERAL_DCS;
 
-               if ( dcs & 0x20 ) // bit 5 = 1 : indicates the text is compressed
+               if (dcs & 0x20) /* bit 5 = 1 : indicates the text is compressed */
                        pCodingScheme->bCompressed = TRUE;
 
-               if ( dcs & 0x10 ) // bit 4 = 1 : indicates that bits  1 to 0 have a message class meaning
-               {
+               if (dcs & 0x10) {
+                       /* bit 4 = 1 : indicates that bits  1 to 0 have a message class meaning */
                        pCodingScheme->bmsg_class_set = TRUE;
 
-                       switch ( dcs & 0x03 ) // bits 1 to 0 : message class
-                       {
-                               case 0x00:
-                                       pCodingScheme->class_type = SMS_CLASS_0;
-                                       break;
-                               case 0x01:
-                                       pCodingScheme->class_type = SMS_CLASS_1;
-                                       break;
-                               case 0x02:
-                                       pCodingScheme->class_type = SMS_CLASS_2;
-                                       break;
-                               case 0x03:
-                                       pCodingScheme->class_type = SMS_CLASS_3;
-                                       break;
-                               default :
-                                       /*Do Nothing*/
-                                       msg("Default case executed. Invalid option.");
-                                       break;
+                       switch (dcs & 0x03) { /* bits 1 to 0 : message class */
+                       case 0x00:
+                               pCodingScheme->class_type = SMS_CLASS_0;
+                       break;
+
+                       case 0x01:
+                               pCodingScheme->class_type = SMS_CLASS_1;
+                       break;
+
+                       case 0x02:
+                               pCodingScheme->class_type = SMS_CLASS_2;
+                       break;
+
+                       case 0x03:
+                               pCodingScheme->class_type = SMS_CLASS_3;
+                       break;
+
+                       default:
+                               /* Do Nothing */
+                               msg("Default case executed. Invalid option.");
+                       break;
                        }
-               }
-               else // bit 4 = 0 : indicates that bits 1 to 0 are reserved and have no message class meaning
+               } else {
+                       /* bit 4 = 0 : indicates that bits 1 to 0 are reserved and have no message class meaning */
                        pCodingScheme->class_type = SMS_CLASS_NONE;
+               }
 
-               switch ( dcs & 0x0C ) // bits 4 to 3 : character set
-               {
-                       case 0x00:
-                               pCodingScheme->alphabet_type = SMS_ALPHABET_DEFAULT;
-                               break;
-                       case 0x04:
-                               pCodingScheme->alphabet_type = SMS_ALPHABET_8BIT;
-                               break;
-                       case 0x08:
-                               pCodingScheme->alphabet_type = SMS_ALPHABET_UCS2;
-                               break;
-                       case 0x0C:
-                               pCodingScheme->alphabet_type = SMS_ALPHABET_MAX;
-                               break;
-                       default :
-                               /*Do Nothing*/
-                               msg("Default case executed. Invalid option.");
-                               break;
+               switch (dcs & 0x0C) { /* bits 4 to 3 : character set */
+               case 0x00:
+                       pCodingScheme->alphabet_type = SMS_ALPHABET_DEFAULT;
+               break;
+
+               case 0x04:
+                       pCodingScheme->alphabet_type = SMS_ALPHABET_8BIT;
+               break;
+
+               case 0x08:
+                       pCodingScheme->alphabet_type = SMS_ALPHABET_UCS2;
+               break;
+
+               case 0x0C:
+                       pCodingScheme->alphabet_type = SMS_ALPHABET_MAX;
+               break;
+
+               default:
+                       /* Do Nothing */
+                       msg("Default case executed. Invalid option.");
+               break;
                }
-       }
-       else if ( dcs >= 0x40 && dcs < 0x80 ) // bits 7..4 = 01xx : message marked for automatic deletion group. bits 5..0 are coded exactly the same as group 00xx
-       {
+       } else if (dcs >= 0x40 && dcs < 0x80) {
+               /* bits 7..4 = 01xx : message marked for automatic deletion group. bits 5..0 are coded exactly the same as group 00xx */
                pCodingScheme->coding_group_type = SMS_CODGRP_SM_AUTO_DELETION;
 
-               if ( dcs & 0x20 ) // bit 5 = 1 : indicates the text is compressed
+               if (dcs & 0x20) /* bit 5 = 1 : indicates the text is compressed */
                        pCodingScheme->bCompressed = TRUE;
 
-               if ( dcs & 0x10 ) // bit 4 = 1 : indicates that bits  1 to 0 have a message class meaning
-               {
+               if (dcs & 0x10)  {
+                       /* bit 4 = 1 : indicates that bits  1 to 0 have a message class meaning */
                        pCodingScheme->bmsg_class_set = TRUE;
 
-                       switch ( dcs & 0x03 ) // bits 1 to 0 : message class
-                       {
-                               case 0x00:
-                                       pCodingScheme->class_type = SMS_CLASS_0;
-                                       break;
-                               case 0x01:
-                                       pCodingScheme->class_type = SMS_CLASS_1;
-                                       break;
-                               case 0x02:
-                                       pCodingScheme->class_type = SMS_CLASS_2;
-                                       break;
-                               case 0x03:
-                                       pCodingScheme->class_type = SMS_CLASS_3;
-                                       break;
-                               default :
-                                       /*Do Nothing*/
-                                       msg("Default case executed. Invalid option.");
-                                       break;
+                       switch (dcs & 0x03) { /* bits 1 to 0 : message class */
+                       case 0x00:
+                               pCodingScheme->class_type = SMS_CLASS_0;
+                       break;
+
+                       case 0x01:
+                               pCodingScheme->class_type = SMS_CLASS_1;
+                       break;
+
+                       case 0x02:
+                               pCodingScheme->class_type = SMS_CLASS_2;
+                       break;
+
+                       case 0x03:
+                               pCodingScheme->class_type = SMS_CLASS_3;
+                       break;
+
+                       default:
+                               /* Do Nothing */
+                               msg("Default case executed. Invalid option.");
+                       break;
                        }
-               }
-               else // bit 4 = 0 : indicates that bits 1 to 0 are reserved and have no message class meaning
+               } else  {
+                       /* bit 4 = 0 : indicates that bits 1 to 0 are reserved and have no message class meaning */
                        pCodingScheme->class_type = SMS_CLASS_NONE;
+               }
 
-               switch ( dcs & 0x0C ) // bits 4 to 3 : character set
-               {
-                       case 0x00:
-                               pCodingScheme->alphabet_type = SMS_ALPHABET_DEFAULT;
-                               break;
-                       case 0x04:
-                               pCodingScheme->alphabet_type = SMS_ALPHABET_8BIT;
-                               break;
-                       case 0x08:
-                               pCodingScheme->alphabet_type = SMS_ALPHABET_UCS2;
-                               break;
-                       case 0x0C:
-                               pCodingScheme->alphabet_type = SMS_ALPHABET_MAX;
-                               break;
-                       default :
-                               /*Do Nothing*/
-                               msg("Default case executed. Invalid option.");
-                               break;
+               switch (dcs & 0x0C) { /* bits 4 to 3 : character set */
+               case 0x00:
+                       pCodingScheme->alphabet_type = SMS_ALPHABET_DEFAULT;
+               break;
+
+               case 0x04:
+                       pCodingScheme->alphabet_type = SMS_ALPHABET_8BIT;
+               break;
+
+               case 0x08:
+                       pCodingScheme->alphabet_type = SMS_ALPHABET_UCS2;
+               break;
+
+               case 0x0C:
+                       pCodingScheme->alphabet_type = SMS_ALPHABET_MAX;
+               break;
+
+               default:
+                       /* Do Nothing */
+                       msg("Default case executed. Invalid option.");
+               break;
                }
-       }
-       // bits 7..4 = 1000 ~ 1011 : reserved
-       else if ( dcs == 0xC0 ) // bits 7..4 = 1100 : message waiting indication group, discard message
-       {
+       } else if (dcs == 0xC0) {
+               /* bits 7..4 = 1100 : message waiting indication group, discard message */
                pCodingScheme->coding_group_type = SMS_CODGRP_SM_WAITING_DISCARD;
-       }
-       else if ( dcs < 0xE0 )
-       {
+       } else if (dcs < 0xE0) {
                pCodingScheme->coding_group_type = SMS_CODGRP_SM_WAITING_STORE;
 
-               if ( dcs & 0x08 )
+               if (dcs & 0x08)
                        pCodingScheme->bmsg_ind_active = TRUE;
 
-               switch ( dcs & 0x03 )
-               {
-                       case 0x00:
-                               pCodingScheme->waiting_type = SMS_WAITING_VOICE_MSG;
-                               break;
-                       case 0x01:
-                               pCodingScheme->waiting_type = SMS_WAITING_FAX_MSG;
-                               break;
-                       case 0x02:
-                               pCodingScheme->waiting_type = SMS_WAITING_EMAIL_MSG;
-                               break;
-                       case 0x03:
-                               pCodingScheme->waiting_type = SMS_WAITING_OTHER_MSG;
-                               break;
-                       default :
-                               /*Do Nothing*/
-                               msg("Default case executed. Invalid option.");
-                               break;
+               switch (dcs & 0x03) {
+               case 0x00:
+                       pCodingScheme->waiting_type = SMS_WAITING_VOICE_MSG;
+               break;
+
+               case 0x01:
+                       pCodingScheme->waiting_type = SMS_WAITING_FAX_MSG;
+               break;
+
+               case 0x02:
+                       pCodingScheme->waiting_type = SMS_WAITING_EMAIL_MSG;
+               break;
+
+               case 0x03:
+                       pCodingScheme->waiting_type = SMS_WAITING_OTHER_MSG;
+               break;
+
+               default:
+                       /* Do Nothing */
+                       msg("Default case executed. Invalid option.");
+               break;
                }
-       }
-       else if ( dcs < 0xF0 )
-       {
+       } else if (dcs < 0xF0) {
                pCodingScheme->coding_group_type = SMS_CODGRP_SM_WAITING_STORE_UCS2;
 
-               if ( dcs & 0x08 )
+               if (dcs & 0x08)
                        pCodingScheme->bmsg_ind_active = TRUE;
 
-               switch ( dcs & 0x03 )
-               {
-                       case 0x00:
-                               pCodingScheme->waiting_type = SMS_WAITING_VOICE_MSG;
-                               break;
-                       case 0x01:
-                               pCodingScheme->waiting_type = SMS_WAITING_FAX_MSG;
-                               break;
-                       case 0x02:
-                               pCodingScheme->waiting_type = SMS_WAITING_EMAIL_MSG;
-                               break;
-                       case 0x03:
-                               pCodingScheme->waiting_type = SMS_WAITING_OTHER_MSG;
-                               break;
-                       default :
-                               /*Do Nothing*/
-                               msg("Default case executed. Invalid option.");
-                               break;
+               switch (dcs & 0x03) {
+               case 0x00:
+                       pCodingScheme->waiting_type = SMS_WAITING_VOICE_MSG;
+               break;
+
+               case 0x01:
+                       pCodingScheme->waiting_type = SMS_WAITING_FAX_MSG;
+               break;
+
+               case 0x02:
+                       pCodingScheme->waiting_type = SMS_WAITING_EMAIL_MSG;
+               break;
+
+               case 0x03:
+                       pCodingScheme->waiting_type = SMS_WAITING_OTHER_MSG;
+               break;
+
+               default:
+                       /* Do Nothing */
+                       msg("Default case executed. Invalid option.");
+               break;
                }
-       }
-       else
-       {
+       } else {
                pCodingScheme->coding_group_type = SMS_CODGRP_SM_CLASS_CODING;
 
-               if ( dcs & 0x04 )
+               if (dcs & 0x04)
                        pCodingScheme->alphabet_type = SMS_ALPHABET_8BIT;
 
-               switch ( dcs & 0x03 )
-               {
-                       case 0x00:
-                               pCodingScheme->class_type = SMS_CLASS_0;
-                               break;
-                       case 0x01:
-                               pCodingScheme->class_type = SMS_CLASS_1;
-                               break;
-                       case 0x02:
-                               pCodingScheme->class_type = SMS_CLASS_2;
-                               break;
-                       case 0x03:
-                               pCodingScheme->class_type = SMS_CLASS_3;
-                               break;
-                       default :
-                               /*Do Nothing*/
-                               msg("Default case executed. Invalid option.");
-                               break;
+               switch (dcs & 0x03) {
+               case 0x00:
+                       pCodingScheme->class_type = SMS_CLASS_0;
+               break;
+
+               case 0x01:
+                       pCodingScheme->class_type = SMS_CLASS_1;
+               break;
+
+               case 0x02:
+                       pCodingScheme->class_type = SMS_CLASS_2;
+               break;
+
+               case 0x03:
+                       pCodingScheme->class_type = SMS_CLASS_3;
+               break;
+
+               default:
+                       /* Do Nothing */
+                       msg("Default case executed. Invalid option.");
+               break;
                }
        }
 }
 
-void SmsUtilEncodeDCS( unsigned char* pDCS, Sms_coding_scheme* pCodingScheme )
+void SmsUtilEncodeDCS(unsigned char *pDCS, Sms_coding_scheme *pCodingScheme)
 {
        unsigned char dcs = 0x00;
 
        printf("SmsUtilEncodeDCS Start\n");
 
-       assert( pCodingScheme != NULL );
+       assert(pCodingScheme != NULL);
 
-       if( pCodingScheme->coding_group_type == SMS_CODGRP_SM_GENERAL_DCS ) // bit 7..4 is 00xx
-       {
-               if ( pCodingScheme->bCompressed )
-                               dcs |= 0x20; // bit 5 is 1
+       if (pCodingScheme->coding_group_type == SMS_CODGRP_SM_GENERAL_DCS) {
+               /* bit 7..4 is 00xx */
+               if (pCodingScheme->bCompressed)
+                       dcs |= 0x20; /* bit 5 is 1 */
 
-                       if ( pCodingScheme->bmsg_class_set )
-                       {
-                               dcs |= 0x10; // bit 4 is 1
+                       if (pCodingScheme->bmsg_class_set) {
+                               dcs |= 0x10; /* bit 4 is 1 */
 
-                               if( pCodingScheme->class_type== SMS_CLASS_0 )
+                               if (pCodingScheme->class_type == SMS_CLASS_0)
                                        dcs |= 0x00;
-
-                               else if ( pCodingScheme->class_type == SMS_CLASS_1 )
+                               else if (pCodingScheme->class_type == SMS_CLASS_1)
                                        dcs |= 0x01;
-
-                               else if ( pCodingScheme->class_type == SMS_CLASS_2 )
+                               else if (pCodingScheme->class_type == SMS_CLASS_2)
                                        dcs |= 0x02;
-
-                               else if ( pCodingScheme->class_type == SMS_CLASS_3 )
+                               else if (pCodingScheme->class_type == SMS_CLASS_3)
                                        dcs |= 0x03;
                        }
 
-                       switch ( pCodingScheme->alphabet_type )
-                       {
-                               case SMS_ALPHABET_DEFAULT: // bit 3..2 is 00
-                               {
+                       switch (pCodingScheme->alphabet_type) {
+                               case SMS_ALPHABET_DEFAULT: { /* bit 3..2 is 00 */
                                        dcs |= 0x00;
-                                       break;
                                }
-                               case SMS_ALPHABET_8BIT: // bit 3..2 is 01
-                               {
+                               break;
+
+                               case SMS_ALPHABET_8BIT: { /* bit 3..2 is 01 */
                                        dcs |= 0x04;
-                                       break;
                                }
-                               case SMS_ALPHABET_UCS2: // bit 3..2 is 10
-                               {
+                               break;
+
+                               case SMS_ALPHABET_UCS2: { /* bit 3..2 is 10 */
                                        dcs |= 0x08;
-                                       break;
                                }
-                               default: // bit 3..2 is 11
-                               {
+                               break;
+
+                               default: { /* bit 3..2 is 11 */
                                        dcs |= 0x0C;
-                                       break;
                                }
+                               break;
                        }
-       }
-       else if ( pCodingScheme->coding_group_type == SMS_CODGRP_SM_WAITING_DISCARD ) // bit 7..4 is 1100
-       {
+       } else if (pCodingScheme->coding_group_type == SMS_CODGRP_SM_WAITING_DISCARD) {
+               /* bit 7..4 is 1100 */
                dcs |= 0xC0;
-       }
-       else if ( pCodingScheme->coding_group_type == SMS_CODGRP_SM_WAITING_STORE ) // bit 7..4 is 1101
-       {
+       } else if (pCodingScheme->coding_group_type == SMS_CODGRP_SM_WAITING_STORE) {
+               /* bit 7..4 is 1101 */
                dcs |= 0xD0;
 
-               if ( pCodingScheme->bmsg_ind_active ) // bit 3..2 is 10
+               if (pCodingScheme->bmsg_ind_active) /* bit 3..2 is 10 */
                        dcs |= 0x08;
-
-               else if( pCodingScheme->waiting_type == SMS_WAITING_VOICE_MSG)
+               else if (pCodingScheme->waiting_type == SMS_WAITING_VOICE_MSG)
                        dcs |= 0x00;
-
-               else if( pCodingScheme->waiting_type == SMS_WAITING_FAX_MSG)
+               else if (pCodingScheme->waiting_type == SMS_WAITING_FAX_MSG)
                        dcs |= 0x01;
-
-               else if( pCodingScheme->waiting_type == SMS_WAITING_EMAIL_MSG)  // bit 1..0 is 10
+               else if (pCodingScheme->waiting_type == SMS_WAITING_EMAIL_MSG) /* bit 1..0 is 10 */
                        dcs |= 0x02;
-
-               else if( pCodingScheme->waiting_type == SMS_WAITING_OTHER_MSG)  // bit 1..0 is 11
+               else if (pCodingScheme->waiting_type == SMS_WAITING_OTHER_MSG)  /* bit 1..0 is 11 */
                        dcs |= 0x03;
-
-       }
-       else if ( pCodingScheme->coding_group_type == SMS_CODGRP_SM_WAITING_STORE_UCS2 ) // bit 7..4 is 1110
-       {
+       } else if (pCodingScheme->coding_group_type == SMS_CODGRP_SM_WAITING_STORE_UCS2) {
+               /* bit 7..4 is 1110 */
                dcs |= 0xE0;
 
-               if ( pCodingScheme->bmsg_ind_active ) // bit 3..2 is 10
+               if (pCodingScheme->bmsg_ind_active) /* bit 3..2 is 10 */
                        dcs |= 0x08;
 
-               if( pCodingScheme->waiting_type == SMS_WAITING_VOICE_MSG ) // bit 1..0 is 00
+               if (pCodingScheme->waiting_type == SMS_WAITING_VOICE_MSG) /* bit 1..0 is 00 */
                        dcs |= 0x00;
-
-               else if( pCodingScheme->waiting_type == SMS_WAITING_FAX_MSG )
+               else if (pCodingScheme->waiting_type == SMS_WAITING_FAX_MSG)
                        dcs |= 0x01;
-
-               else if( pCodingScheme->waiting_type == SMS_WAITING_EMAIL_MSG )
+               else if (pCodingScheme->waiting_type == SMS_WAITING_EMAIL_MSG)
                        dcs |= 0x02;
-
-               else if( pCodingScheme->waiting_type == SMS_WAITING_OTHER_MSG )
+               else if (pCodingScheme->waiting_type == SMS_WAITING_OTHER_MSG)
                        dcs |= 0x03;
-       }
-       else if ( pCodingScheme->coding_group_type == SMS_CODGRP_SM_CLASS_CODING )      // bit 7..4 is 1111
-       {
+       } else if (pCodingScheme->coding_group_type == SMS_CODGRP_SM_CLASS_CODING) {
+               /* bit 7..4 is 1111 */
                dcs |= 0xF0;
 
-               if( pCodingScheme->alphabet_type == SMS_ALPHABET_DEFAULT )      // bit 2 is 0
+               if (pCodingScheme->alphabet_type == SMS_ALPHABET_DEFAULT) /* bit 2 is 0 */
                        dcs |= 0x00;
-               else if( pCodingScheme->alphabet_type == SMS_ALPHABET_8BIT ) // bit 2 is 1
+               else if (pCodingScheme->alphabet_type == SMS_ALPHABET_8BIT) /* bit 2 is 1 */
                        dcs |= 0x04;
 
-               if( pCodingScheme->class_type == SMS_CLASS_0) // bit 1..0 is 00
+               if (pCodingScheme->class_type == SMS_CLASS_0) /* bit 1..0 is 00 */
                        ;
-
-               else if( pCodingScheme->class_type == SMS_CLASS_1) // bit 1..0 is 01
+               else if (pCodingScheme->class_type == SMS_CLASS_1) /* bit 1..0 is 01 */
                        dcs |= 0x01;
-
-               else if( pCodingScheme->class_type == SMS_CLASS_2) // bit 1..0 is 10
+               else if (pCodingScheme->class_type == SMS_CLASS_2) /* bit 1..0 is 10 */
                        dcs |= 0x02;
-
-               else if( pCodingScheme->class_type == SMS_CLASS_3) // bit 1..0 is 11
+               else if (pCodingScheme->class_type == SMS_CLASS_3) /* bit 1..0 is 11 */
                        dcs |= 0x03;
        }
 
-       memcpy( pDCS, &dcs, sizeof ( unsigned char ) );
+       memcpy(pDCS, &dcs, sizeof(unsigned char));
 
        printf("SmsUtilEncodeDCS End\n");
 }
 
-unsigned char SmsUtilEncodeValidity( unsigned char* pValidity, Sms_vp* pVP )
+unsigned char SmsUtilEncodeValidity(unsigned char *pValidity, Sms_vp* pVP)
 {
        unsigned char pos = 0;
 
-       switch( pVP->vp_type )
-       {
-               case SMS_VP_NOT_USED:
-                       break;
+       switch (pVP->vp_type) {
+       case SMS_VP_NOT_USED:
+       break;
 
-               case SMS_VP_RELATIVE:
-                       pValidity[pos] = (unsigned char) pVP->vpValue;
-                       pos ++;
-                       break;
+       case SMS_VP_RELATIVE:
+               pValidity[pos] = (unsigned char) pVP->vpValue;
+               pos++;
+       break;
 
-               case SMS_VP_ABSOLUTE:
-                       //TO DO
-                       //SmsUtilEncodeTimeStamp( pValidity, pVP->vpValue );
-                       pos += 7;
-                       break;
+       case SMS_VP_ABSOLUTE:
+               pos += 7;
+       break;
 
-               case SMS_VP_ENHANCED:
-                       break;
+       case SMS_VP_ENHANCED:
+       break;
 
-               default :
-                       /*Do Nothing*/
-                       msg("Default Case executed. Invalid Option.");
-                       break;
+       default:
+               /* Do Nothing */
+               msg("Default Case executed. Invalid Option.");
+       break;
        }
 
        return pos;
@@ -914,7 +841,7 @@ void __util_hex_dump(const char *pad, int size, const void *data)
        p = (unsigned char *)data;
 
        g_snprintf(buf, 255, "%s%04X: ", pad, 0);
-       for (i = 0; i<size; i++) {
+       for (i = 0; i < size; i++) {
                g_snprintf(hex, 4, "%02X ", p[i]);
                memcpy(buf+strlen(buf), hex, 4);
 
@@ -923,8 +850,7 @@ void __util_hex_dump(const char *pad, int size, const void *data)
                                msg("%s", buf);
                                memset(buf, 0, 255);
                                snprintf(buf, 255, "%s%04X: ", pad, i + 1);
-                       }
-                       else {
+                       } else {
                                strcat(buf, "  ");
                        }
                }
@@ -937,20 +863,19 @@ unsigned char __sms_hexchar_to_int(char ch)
 {
        msg("Entered with character [%c]", ch);
 
-       if (ch >= '0' && ch <= '9')
+       if (ch >= '0' && ch <= '9') {
                return (ch - '0');
-       else if (ch >= 'A' && ch <= 'F')
+       } else if (ch >= 'A' && ch <= 'F') {
                return (ch - 'A' + 10);
-       else if (ch >= 'a' && ch <= 'f')
+       } else if (ch >= 'a' && ch <= 'f') {
                return (ch - 'a' + 10);
-       else {
+       else {
                msg("Invalid Charater");
                return -1;
        }
 }
 gboolean __sms_asciistring_to_hex(const char *ascii_string,
-                                       unsigned char *hex_string,
-                                       int ascii_len)
+       unsigned char *hex_string, int ascii_len)
 {
        int i;
        if (ascii_string == NULL || hex_string == NULL) {
@@ -971,127 +896,125 @@ gboolean __sms_asciistring_to_hex(const char *ascii_string,
        } else {                /* Odd ASCII len */
                for (i = 0; i < ascii_len; i += 2) {
                        if (i == ascii_len - 1) {
-                               hex_string[i/2 ] =
+                               hex_string[i/2] =
                                    (char)((__sms_hexchar_to_int(ascii_string[i]) << 4) | 0x0F);
                                                msg("[%02x]", hex_string[i/2]);
                        } else {
                                hex_string[i/2] =
                                    (char)(((__sms_hexchar_to_int(ascii_string[i]) << 4) |
                                            __sms_hexchar_to_int(ascii_string[i+1])));
-                                               msg("[%02x]", hex_string[i/2 ]);
+                                               msg("[%02x]", hex_string[i/2]);
                        }
                }
        }
+
        return TRUE;
 }
 
-/*Bit Array Copy for Cdma Encoding*/
-#define PREPARE_FIRST_COPY()                                      \
-    do {                                                          \
-    if (src_len >= (CHAR_BIT - dst_offset_modulo)) {              \
-        *dst     &= reverse_mask[dst_offset_modulo];              \
-        src_len -= CHAR_BIT - dst_offset_modulo;                  \
-    } else {                                                      \
-        *dst     &= reverse_mask[dst_offset_modulo]               \
-              | reverse_mask_xor[dst_offset_modulo + src_len + 1];\
-         c       &= reverse_mask[dst_offset_modulo + src_len    ];\
-        src_len = 0;                                              \
-    } } while (0)
+/* Bit Array Copy for Cdma Encoding */
+#define PREPARE_FIRST_COPY()   do { \
+       if (src_len >= (CHAR_BIT - dst_offset_modulo)) { \
+               *dst &= reverse_mask[dst_offset_modulo]; \
+               src_len -= CHAR_BIT - dst_offset_modulo; \
+       } else { \
+               *dst &= reverse_mask[dst_offset_modulo] \
+                       | reverse_mask_xor[dst_offset_modulo + src_len + 1]; \
+               c &= reverse_mask[dst_offset_modulo + src_len]; \
+               src_len = 0; \
+       } \
+} while (0)
 
 void bitarray_copy(const unsigned char *src_org, int src_offset, int src_len,  unsigned char *dst_org, unsigned int dst_offset)
 {
-    //static const unsigned char mask[] =
-        //{ 0x55, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };
-    static const unsigned char reverse_mask[] =
-        { 0x55, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff };
-    static const unsigned char reverse_mask_xor[] =
-        { 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00 };
-
-    if (src_len) {
-        const unsigned char *src;
-              unsigned char *dst;
-        int                  src_offset_modulo,
-                             dst_offset_modulo;
-
-        src = src_org + (src_offset / CHAR_BIT);
-        dst = dst_org + (dst_offset / CHAR_BIT);
-
-        src_offset_modulo = src_offset % CHAR_BIT;
-        dst_offset_modulo = dst_offset % CHAR_BIT;
-
-        if (src_offset_modulo == dst_offset_modulo) {
-            int              byte_len;
-            int              src_len_modulo;
-            if (src_offset_modulo) {
-                unsigned char   c;
-
-                c = reverse_mask_xor[dst_offset_modulo]     & *src++;
-
-                PREPARE_FIRST_COPY();
-                *dst++ |= c;
-            }
-
-            byte_len = src_len / CHAR_BIT;
-            src_len_modulo = src_len % CHAR_BIT;
-
-            if (byte_len) {
-                memcpy(dst, src, byte_len);
-                src += byte_len;
-                dst += byte_len;
-            }
-            if (src_len_modulo) {
-                *dst     &= reverse_mask_xor[src_len_modulo];
-                *dst |= reverse_mask[src_len_modulo]     & *src;
-            }
-        } else {
-            int             bit_diff_ls,
-                            bit_diff_rs;
-            int             byte_len;
-            int             src_len_modulo;
-            unsigned char   c;
-            /*
-             * Begin: Line things up on destination.
-             */
-            if (src_offset_modulo > dst_offset_modulo) {
-                bit_diff_ls = src_offset_modulo - dst_offset_modulo;
-                bit_diff_rs = CHAR_BIT - bit_diff_ls;
-
-                c = *src++ << bit_diff_ls;
-                c |= *src >> bit_diff_rs;
-                c     &= reverse_mask_xor[dst_offset_modulo];
-            } else {
-                bit_diff_rs = dst_offset_modulo - src_offset_modulo;
-                bit_diff_ls = CHAR_BIT - bit_diff_rs;
-
-                c = *src >> bit_diff_rs     &
-                    reverse_mask_xor[dst_offset_modulo];
-            }
-            PREPARE_FIRST_COPY();
-            *dst++ |= c;
-
-            /*
-             * Middle: copy with only shifting the source.
-             */
-            byte_len = src_len / CHAR_BIT;
-
-            while (--byte_len >= 0) {
-                c = *src++ << bit_diff_ls;
-                c |= *src >> bit_diff_rs;
-                *dst++ = c;
-            }
-
-            /*
-             * End: copy the remaing bits;
-             */
-            src_len_modulo = src_len % CHAR_BIT;
-            if (src_len_modulo) {
-                c = *src++ << bit_diff_ls;
-                c |= *src >> bit_diff_rs;
-                c     &= reverse_mask[src_len_modulo];
-
-                *dst     &= reverse_mask_xor[src_len_modulo];
-                *dst |= c;
-            }
-        }
-    }
+       static const unsigned char reverse_mask[] = {0x55, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff};
+       static const unsigned char reverse_mask_xor[] = {0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00};
+
+       if (src_len) {
+               const unsigned char *src;
+               unsigned char *dst;
+               int src_offset_modulo,
+               dst_offset_modulo;
+
+               src = src_org + (src_offset / CHAR_BIT);
+               dst = dst_org + (dst_offset / CHAR_BIT);
+
+               src_offset_modulo = src_offset % CHAR_BIT;
+               dst_offset_modulo = dst_offset % CHAR_BIT;
+
+               if (src_offset_modulo == dst_offset_modulo) {
+                       int byte_len;
+                       int src_len_modulo;
+                       if (src_offset_modulo) {
+                               unsigned char c;
+
+                               c = reverse_mask_xor[dst_offset_modulo] & *src++;
+
+                               PREPARE_FIRST_COPY();
+                               *dst++ |= c;
+                       }
+
+                       byte_len = src_len / CHAR_BIT;
+                       src_len_modulo = src_len % CHAR_BIT;
+
+                       if (byte_len) {
+                               memcpy(dst, src, byte_len);
+                               src += byte_len;
+                               dst += byte_len;
+                       }
+
+                       if (src_len_modulo) {
+                               *dst &= reverse_mask_xor[src_len_modulo];
+                               *dst |= reverse_mask[src_len_modulo] & *src;
+                       }
+               } else {
+                       int bit_diff_ls,
+                       bit_diff_rs;
+                       int byte_len;
+                       int src_len_modulo;
+                       unsigned char   c;
+                       /*
+                        * Begin: Line things up on destination.
+                        */
+                       if (src_offset_modulo > dst_offset_modulo) {
+                               bit_diff_ls = src_offset_modulo - dst_offset_modulo;
+                               bit_diff_rs = CHAR_BIT - bit_diff_ls;
+
+                               c = *src++ << bit_diff_ls;
+                               c |= *src >> bit_diff_rs;
+                               c &= reverse_mask_xor[dst_offset_modulo];
+                       } else {
+                               bit_diff_rs = dst_offset_modulo - src_offset_modulo;
+                               bit_diff_ls = CHAR_BIT - bit_diff_rs;
+
+                               c = *src >> bit_diff_rs &
+                               reverse_mask_xor[dst_offset_modulo];
+                       }
+                       PREPARE_FIRST_COPY();
+                       *dst++ |= c;
+
+                       /*
+                        * Middle: copy with only shifting the source.
+                        */
+                       byte_len = src_len / CHAR_BIT;
+
+                       while (--byte_len >= 0) {
+                               c = *src++ << bit_diff_ls;
+                               c |= *src >> bit_diff_rs;
+                               *dst++ = c;
+                       }
+
+                       /*
+                        * End: copy the remaing bits;
+                        */
+                       src_len_modulo = src_len % CHAR_BIT;
+                       if (src_len_modulo) {
+                               c = *src++ << bit_diff_ls;
+                               c |= *src >> bit_diff_rs;
+                               c &= reverse_mask[src_len_modulo];
+
+                               *dst &= reverse_mask_xor[src_len_modulo];
+                               *dst |= c;
+                       }
+               }
+       }
 }
index 3139bb83d07306f009d6900946d6fc5878e47a2e..f40ad641b4644ff3408e557f258c10a049ba84a9 100644 (file)
@@ -39,7 +39,7 @@ static unsigned char __read_bits(const unsigned char *bytes, unsigned short star
 
        /* Read only from the first byte */
        if (start + len <= 8)
-               return (bytes[0] >> (8 - start - len)) & ((1 << len) -1);
+               return (bytes[0] >> (8 - start - len)) & ((1 << len) - 1);
 
        /* Read (8 - start) from the first byte, (len - (8 - start)) from the second */
        first = 8 - start;
@@ -253,20 +253,20 @@ static void __log_address(const struct sms_3gpp2_parameter *param)
        char *number = NULL;
        unsigned int iter;
 
-#define UPDATE_OFFSETS(num_bits)       \
-       do {                                                            \
-               bit_offset += num_bits;         \
-               if (bit_offset >= 8) {                  \
-                       bit_offset -= 8;                        \
-                       byte_offset += 1;                       \
-               }                                                       \
-       } while(0)                                              \
-
-#define SIZE_CHECK(req_size)                   \
-       if (param->len < req_size) {            \
-               msg("Unable to read Address");  \
-               return;                                         \
-       }                                                               \
+#define UPDATE_OFFSETS(num_bits) do { \
+       bit_offset += num_bits; \
+       if (bit_offset >= 8) { \
+               bit_offset -= 8; \
+               byte_offset += 1; \
+       } \
+} while (0)
+
+#define SIZE_CHECK(req_size) do { \
+       if (param->len < req_size) { \
+               msg("Unable to read Address"); \
+               return; \
+       } \
+} while (0)
 
        /*
         * 1 bit: Digit Mode
@@ -274,7 +274,7 @@ static void __log_address(const struct sms_3gpp2_parameter *param)
         * 3 bits: Number Type - If Digit Mode is DTMF, field is omitted
         * 4 bits: Number Plan - If Digit Mode is DTMF OR Number Mode is DNA, field is omitted
         * 8 bits: Num Fields
-       */
+        */
 
        SIZE_CHECK(1);
 
@@ -283,13 +283,15 @@ static void __log_address(const struct sms_3gpp2_parameter *param)
        switch (digit_mode) {
        case SMS_3GPP2_DIGIT_MODE_DTMF:
                msg("--Digit Mode: 4-bit DTMF code");
-               break;
+       break;
+
        case SMS_3GPP2_DIGIT_MODE_ASCII:
                msg("--Digit Mode: 8-bit DTMF code");
-               break;
+       break;
+
        default:
                msg("--Digit Mode: Unknown (%u)", digit_mode);
-               return;
+       return;
        }
 
        number_mode = __read_bits(&param->val[byte_offset], bit_offset, 1);
@@ -297,13 +299,15 @@ static void __log_address(const struct sms_3gpp2_parameter *param)
        switch (number_mode) {
        case SMS_3GPP2_NUMBER_MODE_ANSI:
                msg("--Number Mode: ANSI T1.607-1990");
-               break;
+       break;
+
        case SMS_3GPP2_NUMBER_MODE_DNA:
                msg("--Number Mode: Data Network Address");
-               break;
+       break;
+
        default:
                msg("--Number Mode: Unknown (%u)", number_mode);
-               return;
+       return;
        }
 
        if (digit_mode == SMS_3GPP2_DIGIT_MODE_ASCII) {
@@ -379,32 +383,38 @@ static void __log_bearer_data_message_identifier
        unsigned short msg_id;
        unsigned char header_id;
 
-       if (subparam->len !=3)
+       if (subparam->len != 3)
                return;
 
        msg_type = __read_bits(&subparam->val[0], 0, 4);
        switch (msg_type) {
        case SMS_3GPP2_BSUB_TELSERVICE_MSG_TYPE_DELIVER:
                msg("      Deliver (mobile-terminated only)");
-               break;
+       break;
+
        case SMS_3GPP2_BSUB_TELSERVICE_MSG_TYPE_SUBMIT:
                msg("      Submit (mobile-originated only)");
-               break;
+       break;
+
        case SMS_3GPP2_BSUB_TELSERVICE_MSG_TYPE_CANCEL:
                msg("      Cancellation (mobile-originated only)");
-               break;
+       break;
+
        case SMS_3GPP2_BSUB_TELSERVICE_MSG_TYPE_DACK:
                msg("      Delivery Acknowledgment (mobile-terminated only)");
-               break;
+       break;
+
        case SMS_3GPP2_BSUB_TELSERVICE_MSG_TYPE_UACK:
                msg("      User Acknowledgment (either direction)");
-               break;
+       break;
+
        case SMS_3GPP2_BSUB_TELSERVICE_MSG_TYPE_RACK:
                msg("      Read Acknowledgment (either direction)");
-               break;
+       break;
+
        default:
                msg("      Unknown msg_type (%u)", msg_type);
-               break;
+       break;
        } /* End Switch */
 
        msg_id = ((__read_bits(&subparam->val[0], 4, 8) << 8) | (__read_bits(&subparam->val[1], 4, 8)));
@@ -424,20 +434,20 @@ static void __log_bearer_data_user_data
        unsigned int byte_offset = 0;
        unsigned int bit_offset = 0;
 
-#define UPDATE_OFFSETS(num_bits)       \
-       do {                                                            \
-               bit_offset += num_bits;         \
-               if (bit_offset >= 8) {                  \
-                       bit_offset -= 8;                        \
-                       byte_offset += 1;                       \
-               }                                                       \
-       } while(0)                                              \
-
-#define SIZE_CHECK(req_size)                   \
-       if (subparam->len < req_size) {         \
-               msg("Unable to read Address");  \
-               return;                                         \
-       }                                                               \
+#define UPDATE_OFFSETS(num_bits) do { \
+       bit_offset += num_bits; \
+       if (bit_offset >= 8) { \
+               bit_offset -= 8; \
+               byte_offset += 1; \
+       } \
+} while (0)
+
+#define SIZE_CHECK(req_size) do { \
+       if (subparam->len < req_size) { \
+               msg("Unable to read Address"); \
+               return; \
+       } \
+} while (0)
 
        SIZE_CHECK(1);
        msg_encoding = __read_bits(&subparam->val[byte_offset], bit_offset, 5);
@@ -445,40 +455,51 @@ static void __log_bearer_data_user_data
        switch (msg_encoding) {
        case SMS_3GPP2_BSUB_UD_OCTET_ENCODING:
                msg("      Encoding: Octet, unspecified");
-               break;
+       break;
+
        case SMS_3GPP2_BSUB_UD_EPM_ENCODING:
                msg("      Encoding: Extended Protocol Message");
-               break;
+       break;
+
        case SMS_3GPP2_BSUB_UD_ASCII7BIT_ENCODING:
                msg("      Encoding: 7-bit ASCII");
-               break;
+       break;
+
        case SMS_3GPP2_BSUB_UD_IA5_ENCODING:
                msg("      Encoding: IA5");
-               break;
+       break;
+
        case SMS_3GPP2_BSUB_UD_UNICODE_ENCODING:
                msg("      Encoding: UNICODE");
-               break;
+       break;
+
        case SMS_3GPP2_BSUB_UD_SHIFTJIS_ENCODING:
                msg("      Encoding: Shift-JIS");
-               break;
+       break;
+
        case SMS_3GPP2_BSUB_UD_KOREAN_ENCODING:
                msg("      Encoding: Korean");
-               break;
+       break;
+
        case SMS_3GPP2_BSUB_UD_HEBREW_ENCODING:
                msg("      Encoding: Latin/Hebrew");
-               break;
+       break;
+
        case SMS_3GPP2_BSUB_UD_LATIN_ENCODING:
                msg("      Encoding: Latin");
-               break;
+       break;
+
        case SMS_3GPP2_BSUB_UD_GSM7BIT_ENCODING:
                msg("      Encoding: GSM 7-bit default alphabet");
-               break;
+       break;
+
        case SMS_3GPP2_BSUB_UD_GSMDCS_ENCODING:
                msg("      Encoding: GSM Data-Coding-Scheme");
-               break;
+       break;
+
        default:
                msg("      Unknown msg_encoding (%u)", msg_encoding);
-               break;
+       break;
        } /* End Switch */
 
        if (msg_encoding == SMS_3GPP2_BSUB_UD_EPM_ENCODING) {
@@ -495,12 +516,10 @@ static void __log_bearer_data_user_data
        msg("      Num Fields (%u)", num_fields);
 
        if (msg_encoding == SMS_3GPP2_BSUB_UD_OCTET_ENCODING) {
-               //TODO
-       }
-       else if (msg_encoding == SMS_3GPP2_BSUB_UD_EPM_ENCODING) {
-               //TODO
-       }
-       else if (msg_encoding == SMS_3GPP2_BSUB_UD_ASCII7BIT_ENCODING) {
+               /* TODO */
+       } else if (msg_encoding == SMS_3GPP2_BSUB_UD_EPM_ENCODING) {
+               /* TODO */
+       } else if (msg_encoding == SMS_3GPP2_BSUB_UD_ASCII7BIT_ENCODING) {
                char *message;
                unsigned int iter;
 
@@ -516,30 +535,22 @@ static void __log_bearer_data_user_data
                        msg("      Message (%s)", message);
                        free(message);
                }
-       }
-       else if (msg_encoding == SMS_3GPP2_BSUB_UD_IA5_ENCODING) {
-               //TODO
-       }
-       else if (msg_encoding == SMS_3GPP2_BSUB_UD_UNICODE_ENCODING) {
-               //TODO
-       }
-       else if (msg_encoding == SMS_3GPP2_BSUB_UD_SHIFTJIS_ENCODING) {
-               //TODO
-       }
-       else if (msg_encoding == SMS_3GPP2_BSUB_UD_KOREAN_ENCODING) {
-               //TODO
-       }
-       else if (msg_encoding == SMS_3GPP2_BSUB_UD_HEBREW_ENCODING) {
-               //TODO
-       }
-       else if (msg_encoding == SMS_3GPP2_BSUB_UD_LATIN_ENCODING) {
-               //TODO
-       }
-       else if (msg_encoding == SMS_3GPP2_BSUB_UD_GSM7BIT_ENCODING) {
-               //TODO
-       }
-       else if (msg_encoding == SMS_3GPP2_BSUB_UD_GSMDCS_ENCODING) {
-               //TODO
+       } else if (msg_encoding == SMS_3GPP2_BSUB_UD_IA5_ENCODING) {
+               /* TODO */
+       } else if (msg_encoding == SMS_3GPP2_BSUB_UD_UNICODE_ENCODING) {
+               /* TODO */
+       } else if (msg_encoding == SMS_3GPP2_BSUB_UD_SHIFTJIS_ENCODING) {
+               /* TODO */
+       } else if (msg_encoding == SMS_3GPP2_BSUB_UD_KOREAN_ENCODING) {
+               /* TODO */
+       } else if (msg_encoding == SMS_3GPP2_BSUB_UD_HEBREW_ENCODING) {
+               /* TODO */
+       } else if (msg_encoding == SMS_3GPP2_BSUB_UD_LATIN_ENCODING) {
+               /* TODO */
+       } else if (msg_encoding == SMS_3GPP2_BSUB_UD_GSM7BIT_ENCODING) {
+               /* TODO */
+       } else if (msg_encoding == SMS_3GPP2_BSUB_UD_GSMDCS_ENCODING) {
+               /* TODO */
        }
 
 #undef UPDATE_OFFSETS
@@ -550,11 +561,12 @@ static void __log_bearer_data(const struct sms_3gpp2_parameter *param)
 {
        unsigned int offset = 0;
 
-#define SIZE_CHECK(req_size)                   \
-       if (param->len < req_size) {            \
-               msg("Unable to read Address");  \
-               return;                                         \
-       }                                                               \
+#define SIZE_CHECK(req_size) do { \
+       if (param->len < req_size) { \
+               msg("Unable to read Address"); \
+               return; \
+       } \
+} while (0)
 
        while (offset < param->len) {
                const struct sms_3gpp2_parameter *subparam;
@@ -570,71 +582,92 @@ static void __log_bearer_data(const struct sms_3gpp2_parameter *param)
                case SMS_3GPP2_BSUB_ID_MESSAGE_IDENTIFIER:
                        msg("--Bearer Data: Message Identifier");
                        __log_bearer_data_message_identifier(subparam);
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_USER_DATA:
                        msg("--Bearer Data: User Data");
                        __log_bearer_data_user_data(subparam);
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_USER_RESPONSE_CODE:
                        msg("--(TODO)Bearer Data: User Response Code");
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_MESSAGE_CENTER_TIMESTAMP:
                        msg("--(TODO)Bearer Data: Message Center Time Stamp");
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_VP_ABSOLUTE:
                        msg("--(TODO)Bearer Data: Validity Period - Absolute");
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_VP_RELATIVE:
                        msg("--(TODO)Bearer Data: Validity Period - Relative");
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_DDT_ABSOLUTE:
                        msg("--(TODO)Bearer Data: Deferred Delivery Time - Absolute");
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_DDT_RELATIVE:
                        msg("--(TODO)Bearer Data: Deferred Delivery Time - Relative");
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_PRIORITY_INDICATOR:
                        msg("--(TODO)Bearer Data: Priority Indicator");
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_PRIVACY_INDICATOR:
                        msg("--(TODO)Bearer Data: Privacy Indicator");
-                       break;
+               break;\r
+
                case SMS_3GPP2_BSUB_ID_REPLY_OPTION:
                        msg("--(TODO)Bearer Data: Reply Option");
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_MESSAGES_NUMBER:
                        msg("--(TODO)Bearer Data: Number of Messages");
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_MESSAGE_DELIVERY_ALERT:
                        msg("--(TODO)Bearer Data: Alert on Message Delivery");
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_LANGUAGE_INDICATOR:
                        msg("--(TODO)Bearer Data: Language Indicator");
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_CALLBACK_NUMBER:
                        msg("--(TODO)Bearer Data: Call-Back Number");
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_MESSAGE_DISPLAY_MODE:
                        msg("--(TODO)Bearer Data: Message Display Mode");
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_MULTI_ENCODING_UD:
                        msg("--(TODO)Bearer Data: Multiple Encoding User Data");
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_DEPOSIT_INDEX:
                        msg("--(TODO)Bearer Data: Message Deposit Index");
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_SERVICE_PROGRAM_DATA:
                        msg("--(TODO)Bearer Data: Service Category Program Data");
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_SERVICE_PROGRAM_RESULTS:
                        msg("--(TODO)Bearer Data: Service Category Program Results");
-                       break;
+               break;
+
                case SMS_3GPP2_BSUB_ID_MESSAGE_STATUS:
                        msg("--(TODO)Bearer Data: Message Status");
-                       break;
+               break;
+
                default:
                        msg("--Bearer Data: Unknown (%u)", subparam->id);
-                       break;
+               break;
                } /* End Switch */
        }
 
@@ -646,11 +679,12 @@ void sms_util_decode_3gpp2(unsigned int pdu_len, unsigned char *pdu)
        unsigned int offset = 0;
        unsigned int msg_type;
 
-#define SIZE_CHECK(req_size, err_log)  \
-       if (pdu_len < req_size) {                       \
-               msg("%s", #err_log);                    \
-               return;                                         \
-       }
+#define SIZE_CHECK(req_size, err_log) do { \
+       if (pdu_len < req_size) { \
+               msg("%s", #err_log); \
+               return; \
+       } \
+} while (0)
 
        /* Message Type */
        SIZE_CHECK(offset + 1, "Unbale to read Message Type");
@@ -658,16 +692,19 @@ void sms_util_decode_3gpp2(unsigned int pdu_len, unsigned char *pdu)
        switch (msg_type) {
        case SMS_3GPP2_POINT_TO_POINT:
                msg("--new 3GPP2 Point to Point message");
-               break;
+       break;
+
        case SMS_3GPP2_ACKNOWLEDGE:
                msg("--new 3GPP2 ACK message");
-               break;
+       break;
+
        case SMS_3GPP2_BROADCAST:
                msg("--new 3GPP2 Broadcast message");
-               break;
+       break;
+
        default:
                msg("Unknown Message Type");
-               return;
+       return;
        }
 
        /* Rest all are sms_3gpp2_parameter */
@@ -681,55 +718,46 @@ void sms_util_decode_3gpp2(unsigned int pdu_len, unsigned char *pdu)
                SIZE_CHECK(offset + param->len, "Unable to read Parameter Value");
                offset += param->len;
 
-               switch(param->id) {
+               switch (param->id) {
                case SMS_3GPP2_PARAM_ID_TELESERVICE_ID:
-               {
                        __log_teleservice_id(param);
-               break;
+               break;
 
                case SMS_3GPP2_PARAM_ID_SERVICE_CATEGORY:
-               {
                        __log_service_category(param);
-               break;
+               break;
 
                case SMS_3GPP2_PARAM_ID_ORIGINATING_ADDRESS:
-               {
                        __log_address(param);
-               break;
+               break;
 
                case SMS_3GPP2_PARAM_ID_ORIGINATING_SUBADDRESS:
-               {
                        msg("TODO: Originating Sub-Address");
-               break;
+               break;
 
                case SMS_3GPP2_PARAM_ID_DESTINATION_ADDRESS:
-               {
                        __log_address(param);
-               break;
+               break;
 
                case SMS_3GPP2_PARAM_ID_DESTINATION_SUBADDRESS:
-               {
                        msg("TODO: Originating Sub-Address");
-               break;
+               break;
 
                case SMS_3GPP2_PARAM_ID_BEARER_REPLY_OPTION:
-               {
                        __log_bearer_reply_option(param);
-               break;
+               break;
 
                case SMS_3GPP2_PARAM_ID_CAUSE_CODES:
-               {
                        __log_cause_codes(param);
-               break;
+               break;
 
                case SMS_3GPP2_PARAM_ID_BEARER_DATA:
-               {
                        __log_bearer_data(param);
-               break;
+               break;
 
                default:
                        msg("Unhandled Parameter ID 0x%x", param->id);
-                       break;
+               break;
                } /* End Switch */
        }
 
index 90723fb4a7feeefb659e9ff16029a18eae0ea4bc..89c82e07dff9ed1f47ed00b599bf0031c85b2a43 100644 (file)
@@ -90,19 +90,18 @@ static void on_noti_ss_release_complete(TapiHandle *handle, const char *noti_id,
 
        msg(" - info->RelCompMsgLen = 0x%x", info->RelCompMsgLen);
        msg(" - info->szRelCompMsg = ");
-       for ( i=0; i<info->RelCompMsgLen; i++ ) {
+       for (i = 0; i < info->RelCompMsgLen; i++)
                msg("%d : [%x]", i, info->szRelCompMsg[i]);
-       }
 }
 
 static void on_noti_ss_forwarding_status(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        TelSsForwardNoti_t *noti = data;
-       int i =0;
+       int i = 0;
 
        msg("SS Forwarding Status Noti");
 
-       for ( i=0; i<noti->record_num; i++ ) {
+       for (i = 0; i < noti->record_num; i++) {
                msg("class : %d", noti->record[i].Class);
                msg("status : %d", noti->record[i].Status);
                msg("condition : %d", noti->record[i].ForwardCondition);
@@ -119,11 +118,11 @@ static void on_noti_ss_forwarding_status(TapiHandle *handle, const char *noti_id
 static void on_noti_ss_barring_status(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        TelSsBarringNoti_t *noti = data;
-       int i =0;
+       int i = 0;
 
        msg("SS Barring Status Noti");
 
-       for ( i=0; i<noti->record_num; i++ ) {
+       for (i = 0; i < noti->record_num; i++) {
                msg("class : %d", noti->record[i].Class);
                msg("status : %d", noti->record[i].Status);
                msg("type : %d", noti->record[i].Flavour);
@@ -135,11 +134,11 @@ static void on_noti_ss_barring_status(TapiHandle *handle, const char *noti_id, v
 static void on_noti_ss_waiting_status(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
 {
        TelSsWaitingNoti_t *noti = data;
-       int i =0;
+       int i = 0;
 
        msg("SS Waiting Status Noti");
 
-       for ( i=0; i<noti->record_num; i++ ) {
+       for (i = 0; i < noti->record_num; i++) {
                msg("class : %d", noti->record[i].Class);
                msg("status : %d", noti->record[i].Status);
                msg("");
@@ -290,12 +289,10 @@ static int run_ss_set_barring(MManager *mm, struct menu_data *menu)
        g_strlcpy(info.szPassword, data_ss_set_barring_password, TAPI_SS_GSM_BARR_PW_LEN_MAX+1);
 
        msg("info.szPassword - %s data_ss_set_barring_password- %s\n", info.szPassword, data_ss_set_barring_password);
-       msg("Call barring Mode [%d]\n", info.Mode);
 
        result = tel_set_ss_barring(handle, &info, on_ss_barring, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return 0;
 }
@@ -313,9 +310,8 @@ static int run_ss_get_barring_status(MManager *mm, struct menu_data *menu)
        type = atoi(data_ss_get_barring_status_type);
 
        result = tel_get_ss_barring_status(handle, class, type, on_ss_barring, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return 0;
 }
@@ -332,9 +328,8 @@ static int run_ss_change_barring_password(MManager *mm, struct menu_data *menu)
                        data_ss_change_barring_password_new,
                        data_ss_change_barring_password_new,
                        on_ss_change_barring_password, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return 0;
 }
@@ -361,13 +356,12 @@ static int run_ss_set_forward(MManager *mm, struct menu_data *menu)
        info.Mode = atoi(data_ss_set_forward_mode);
        info.Ton = 0x01;
        info.Npi = 0x01;
-       strncpy((char*)info.szPhoneNumber, data_ss_set_forward_number, len);
+       strncpy((char *)info.szPhoneNumber, data_ss_set_forward_number, len);
        info.szPhoneNumber[len] = '\0';
 
        result = tel_set_ss_forward(handle, &info, on_ss_forward, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return 0;
 }
@@ -385,9 +379,8 @@ static int run_ss_get_forward_status(MManager *mm, struct menu_data *menu)
        condition = atoi(data_ss_get_forward_status_condition);
 
        result = tel_get_ss_forward_status(handle, class, condition, on_ss_forward, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return 0;
 }
@@ -405,9 +398,8 @@ static int run_ss_set_waiting(MManager *mm, struct menu_data *menu)
        info.Mode = atoi(data_ss_set_waiting_mode);
 
        result = tel_set_ss_waiting(handle, &info, on_ss_waiting, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return 0;
 }
@@ -423,9 +415,8 @@ static int run_ss_get_waiting_status(MManager *mm, struct menu_data *menu)
        class = atoi(data_ss_get_waiting_status_class);
 
        result = tel_get_ss_waiting_status(handle, class, on_ss_waiting, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return 0;
 }
@@ -443,9 +434,8 @@ static int run_ss_set_cli_status(MManager *mm, struct menu_data *menu)
        status  = atoi(data_ss_set_cli_status);
 
        result = tel_set_ss_cli_status(handle, type, status, on_ss_set_cli_status, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return 0;
 }
@@ -462,9 +452,8 @@ static int run_ss_get_cli_status(MManager *mm, struct menu_data *menu)
        type = atoi(data_ss_get_cli_status_type);
 
        result = tel_get_ss_cli_status(handle, type, on_ss_get_cli_status, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return 0;
 }
@@ -488,9 +477,8 @@ static int run_ss_send_ussd_request(MManager *mm, struct menu_data *menu)
        strncpy(info.szString, data_ss_ussd_request_string, TAPI_SS_USSD_DATA_SIZE_MAX - 1);
 
        result = tel_send_ss_ussd_request(handle, &info, on_ss_send_ussd_request, NULL);
-       if (result != TAPI_API_SUCCESS) {
+       if (result != TAPI_API_SUCCESS)
                msg("failed. (result = %d)", result);
-       }
 
        return 0;
 }
@@ -622,32 +610,26 @@ void register_ss_event(TapiHandle *handle)
        int ret;
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_SS_USSD, on_noti_ss_ussd, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_SS_RELEASE_COMPLETE, on_noti_ss_release_complete, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_SS_FORWARD_STATUS, on_noti_ss_forwarding_status, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_SS_BARRING_STATUS, on_noti_ss_barring_status, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_SS_WAITING_STATUS, on_noti_ss_waiting_status, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 
        ret = tel_register_noti_event(handle, TAPI_NOTI_SS_INFO, on_noti_ss_sups_info, NULL);
-       if (ret != TAPI_API_SUCCESS) {
+       if (ret != TAPI_API_SUCCESS)
                msg("event register failed(%d)", ret);
-       }
 }