Fix coding rule error

Change-Id: Ibc590b607b9ffcf7b475d1c7763740f9443c0758

diff --git a/packaging/tel-plugin-manager.spec b/packaging/tel-plugin-manager.spec
index 6f40296..4f238ad 100644 (file)
--- a/packaging/tel-plugin-manager.spec
+++ b/packaging/tel-plugin-manager.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 1
-%define patchlevel 0
+%define patchlevel 1
 
 Name:           tel-plugin-manager
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/manager_call.c b/src/manager_call.c
index 9b8567a..8fe054d 100644 (file)
--- a/src/manager_call.c
+++ b/src/manager_call.c
@@ -1369,7 +1369,7 @@ enum tcore_manager_return manager_call_process_notification(Manager *manager, Co
                call_obj_sub_other = tcore_call_object_current_on_mo_processing(co_call_other);
 
                /* Check for calls in MO setup state in both the subscriptions */
-               if (call_obj_sub_mo ||call_obj_sub_other ) {
+               if (call_obj_sub_mo || call_obj_sub_other) {
                        info("MO call in setup state present on current/other subscription ");
                        is_reject_incoming = TRUE;
                }
@@ -1468,7 +1468,7 @@ enum tcore_manager_return manager_call_process_notification(Manager *manager, Co
                                PrivateData *priv_data = tcore_plugin_ref_user_data(manager_plugin);
                                priv_data->is_end_all_initiated = TRUE;
                                info("Dispatching flight mode request");
-                               tcore_server_dispatch_request(tcore_plugin_ref_server(manager_plugin),ur);
+                               tcore_server_dispatch_request(tcore_plugin_ref_server(manager_plugin), ur);
                        }
                }
 

diff --git a/src/manager_modem.c b/src/manager_modem.c
index 775aa9a..469dcf7 100644 (file)
--- a/src/manager_modem.c
+++ b/src/manager_modem.c
@@ -99,7 +99,7 @@ static enum tcore_manager_return __handle_flight_mode_end(Server *server, UserRe
        if (priv_data->is_end_all_initiated == FALSE) {
                if (tcore_call_object_total_length(co_call) > 0) {
                        end_all_calls = TRUE;
-               } else if (tcore_call_object_total_length(co_call_other) > 0 ) {
+               } else if (tcore_call_object_total_length(co_call_other) > 0) {
                        end_all_calls = TRUE;
                        co_call = co_call_other;
                        plugin_subs = plugin_subs_other;
@@ -108,7 +108,7 @@ static enum tcore_manager_return __handle_flight_mode_end(Server *server, UserRe
                priv_data->is_end_all_initiated = FALSE;
        }
 
-       if(end_all_calls == TRUE) {
+       if (end_all_calls == TRUE) {
 
                UserRequest *new_ur = tcore_user_request_new(NULL, tcore_server_get_cp_name_by_plugin(plugin_subs));
                struct treq_call_end req = { 0, };
@@ -119,7 +119,7 @@ static enum tcore_manager_return __handle_flight_mode_end(Server *server, UserRe
 
                tcore_user_request_set_command(new_ur, TREQ_CALL_END);
                tcore_user_request_set_data(new_ur, sizeof(struct treq_call_end), &req);
-               if (TCORE_RETURN_SUCCESS != tcore_server_dispatch_request(server,new_ur)) {
+               if (TCORE_RETURN_SUCCESS != tcore_server_dispatch_request(server, new_ur)) {
                        err("END_ALL request failed!!r");
                        tcore_user_request_free(new_ur);
                } else {
@@ -173,7 +173,7 @@ enum tcore_manager_return manager_modem_process_request(Server *server,
                        if (manager_call_is_during_call(modem_plugin)) {
                                info("Call is in progress. Hold ur(%p)", ur);
                                tcore_server_add_notification_hook(server, TNOTI_CALL_STATUS_IDLE,
-                                                                        on_noti_hook_manager_call_status_idle, ur);
+                                                                                                       on_noti_hook_manager_call_status_idle, ur);
                                return TCORE_MANAGER_RETURN_STOP;
                        }
                }

diff --git a/src/manager_queue.c b/src/manager_queue.c
index 0747496..2d9a5cd 100644 (file)
--- a/src/manager_queue.c
+++ b/src/manager_queue.c
@@ -143,7 +143,7 @@ gboolean manager_queue_probe_command(Manager *manager,
 
        peek_index = __get_peek_index(manager_queue, command);
 
-       return(peek_index == INVALID_PEEK_INDEX ? FALSE : TRUE);
+       return (peek_index == INVALID_PEEK_INDEX ? FALSE : TRUE);
 }
 
 guint manager_get_queue_length(Manager *manager,

diff --git a/src/manager_sim.c b/src/manager_sim.c
index 04ea831..44da662 100644 (file)
--- a/src/manager_sim.c
+++ b/src/manager_sim.c
@@ -286,8 +286,8 @@ static gboolean __are_both_sims_ready_after_boot(Manager *manager)
        GSList *list = NULL;
        TcorePlugin *manager_plugin = tcore_manager_get_plugin(manager);
        PrivateData *priv_data = tcore_plugin_ref_user_data(manager_plugin);
-       enum tel_sim_status sim_status[2] ={};
-       enum modem_state modem_status[2] = {MODEM_STATE_UNKNOWN,MODEM_STATE_UNKNOWN};
+       enum tel_sim_status sim_status[2] = {};
+       enum modem_state modem_status[2] = {MODEM_STATE_UNKNOWN, MODEM_STATE_UNKNOWN};
        gboolean ret = FALSE;
 
        dbg("Enter");
@@ -316,20 +316,20 @@ static gboolean __are_both_sims_ready_after_boot(Manager *manager)
        }
        dbg("sim_status1[%d], sim_status2[%d], ret[%s]", sim_status[0], sim_status[1], ret ? "TRUE" : "FALSE");
        dbg("modem_status1[%d], modem_status2[%d]", modem_status[0], modem_status[1]);
-       if(ret && (modem_status[0] == MODEM_STATE_UNKNOWN || modem_status[1] == MODEM_STATE_UNKNOWN))
+       if (ret && (modem_status[0] == MODEM_STATE_UNKNOWN || modem_status[1] == MODEM_STATE_UNKNOWN))
                ret = FALSE;
-       if(ret) {
+       if (ret) {
                dbg("sim_status for both cards recieved");
-               if ( SIM_STATUS_INIT_COMPLETED ==  sim_status[0] && SIM_STATUS_INIT_COMPLETED == sim_status[1])
+               if (SIM_STATUS_INIT_COMPLETED ==  sim_status[0] && SIM_STATUS_INIT_COMPLETED == sim_status[1])
                        ret = TRUE;
-               else if(SIM_STATUS_INIT_COMPLETED == sim_status[1]  && __expect_other_sim_init(sim_status[0]))
+               else if (SIM_STATUS_INIT_COMPLETED == sim_status[1]  && __expect_other_sim_init(sim_status[0]))
                        ret = FALSE;
-               else if(SIM_STATUS_INIT_COMPLETED ==  sim_status[0] && __expect_other_sim_init(sim_status[1]))
+               else if (SIM_STATUS_INIT_COMPLETED ==  sim_status[0] && __expect_other_sim_init(sim_status[1]))
                        ret = FALSE;
        }
-       if(ret)
+       if (ret)
                priv_data->boot_config_completed = TRUE;
-       dbg("ret[%d]",ret);
+       dbg("ret[%d]", ret);
        return ret;
 }
 
@@ -359,7 +359,7 @@ static char *__find_imsi_hash(CoreObject *co_sim)
        struct tel_sim_imsi *imsi_info = NULL;
        char *imsi = NULL;
        char *imsi_db_key = NULL;
-       if(!co_sim) {
+       if (!co_sim) {
                err("co_sim is NULL");
                return NULL;
        }
@@ -497,7 +497,7 @@ static gboolean __add_nw_mode(TcorePlugin *modem_plugin, int nw_mode)
 #else
        info("SIM PREFERRED SUBSCRIPTION on DB is not supported");
        return TRUE;
-#endif 
+#endif
 }
 
 #if 0
@@ -553,8 +553,7 @@ static void __on_resp_get_netmode(UserRequest *ur,
 
        if (!resp || resp->result != TCORE_RETURN_SUCCESS) {
                warn("GET_MODE fail");
-       }
-       else
+       } else
                existing_mode = resp->mode;
 
        info("req_nw_mode = [%d], existing_network_mode:[%d]", req_nw_mode, existing_mode);
@@ -814,7 +813,7 @@ static int __find_ds_rank(TcorePlugin *modem_plugin)
        s = tcore_plugin_ref_server(modem_plugin);
        imsi_db_key = __find_imsi_hash(tcore_plugin_ref_core_object(modem_plugin, CORE_OBJECT_TYPE_SIM));
 
-       ds_rank = __find_ds_rank_with_hash( s, imsi_db_key);
+       ds_rank = __find_ds_rank_with_hash(s, imsi_db_key);
        return ds_rank;
 }
 
@@ -870,7 +869,7 @@ static int __find_max_ds_rank(Server *s)
        return ds_rank;
 }
 
-static gboolean __update_ds_rank_for_key(Server *s, char *key,int ds_rank)
+static gboolean __update_ds_rank_for_key(Server *s, char *key, int ds_rank)
 {
        GHashTable *in_param;
        Storage *strg_db = NULL;
@@ -915,11 +914,10 @@ static gboolean __add_ds_rank(TcorePlugin *modem_plugin, int ds_rank)
 
        s = tcore_plugin_ref_server(modem_plugin);
        imsi_db_key = __find_imsi_hash(tcore_plugin_ref_core_object(modem_plugin, CORE_OBJECT_TYPE_SIM));
-       if(imsi_db_key) {
-               rv = __update_ds_rank_for_key( s, imsi_db_key, ds_rank);
+       if (imsi_db_key) {
+               rv = __update_ds_rank_for_key(s, imsi_db_key, ds_rank);
                g_free(imsi_db_key);
-       }
-       else
+       } else
                dbg("imsi_db_key is NULL");
        return rv;
 }
@@ -963,7 +961,7 @@ static int __find_max_ds_rank(Server *s)
        return 0;
 }
 
-static gboolean __update_ds_rank_for_key(Server *s, char *key,int ds_rank)
+static gboolean __update_ds_rank_for_key(Server *s, char *key, int ds_rank)
 {
        info("SIM PREFERRED SUBSCRIPTION on DB is not supported");
        return FALSE;
@@ -1044,13 +1042,12 @@ void manager_network_resp_hook_set_ds(UserRequest *ur,
                        info("updating rank for [%d], max_ds_rank [%d]", pref_subs, max_ds_rank);
                        if (pref_subs == CALL_PREFERRED_VOICE_SUBS_ASK_ALWAYS) {
                                char *always_ask_hash = __generate_hash(CALL_MSG_PREF_ALWAYS_ASK);
-                               if(always_ask_hash) {
+                               if (always_ask_hash) {
                                        __update_ds_rank_for_key(server, always_ask_hash, max_ds_rank+1);
                                        info("updated rank for always ask with hash -%s", always_ask_hash);
                                        g_free(always_ask_hash);
                                }
-                       }
-                       else{
+                       } else{
                                TcorePlugin *modem_plugin;
                                enum telephony_subscription_type subs_type;
 
@@ -1064,7 +1061,7 @@ void manager_network_resp_hook_set_ds(UserRequest *ur,
                dbg("resp->error is %d", resp->err);
 }
 
-static void __send_dds_request(TcorePlugin *plugin )
+static void __send_dds_request(TcorePlugin *plugin)
 {
        UserRequest *ur = NULL;
        Server *s = tcore_plugin_ref_server(plugin);
@@ -1091,7 +1088,7 @@ static void __send_ds_request(Server *s, enum telephony_call_preferred_voice_sub
        UserRequest *ur = NULL;
        TReturn ret = TCORE_RETURN_EINVAL;
        struct treq_call_set_preferred_voice_subscription req_data;
-       const char *modem_name = tcore_server_get_cp_name_by_plugin( manager_util_get_modem_plugin_by_subs_type(s, 0));
+       const char *modem_name = tcore_server_get_cp_name_by_plugin(manager_util_get_modem_plugin_by_subs_type(s, 0));
        if (!modem_name) {
                err("modem name is null !!");
                return;
@@ -1107,9 +1104,9 @@ static void __send_ds_request(Server *s, enum telephony_call_preferred_voice_sub
        if (ret != TCORE_RETURN_SUCCESS) {
                err("Request cmd(0x%x) failed ret: [%d]", TREQ_CALL_SET_PREFERRED_VOICE_SUBSCRIPTION, ret);
                tcore_user_request_unref(ur);
-       }
-       else
+       } else {
                info("sent ds request to [%d]", preferred_subs);
+       }
 }
 
 
@@ -1141,23 +1138,23 @@ static void __network_mode_set_on_boot(Manager *manager)
        }
 
        /*if both sim cards are present*/
-       if (nw_mode[0] !=-2 && nw_mode[1] !=-2) {
+       if (nw_mode[0] != -2 && nw_mode[1] != -2) {
                /* if both sims are new in DB*/
-               if(nw_mode[0] == -1 && nw_mode[1] == -1) {
+               if (nw_mode[0] == -1 && nw_mode[1] == -1) {
                        nw_mode[0] = NETWORK_MODE_GSM | NETWORK_MODE_WCDMA | NETWORK_MODE_LTE;
                        nw_mode[1] = NETWORK_MODE_GSM;
                }
                /* if SIM1 is new in DB*/
-               else if(nw_mode[0] == -1) {
+               else if (nw_mode[0] == -1) {
                        /*if SIM2 is not GSM set SIM1 is set to GSM*/
-                       if(nw_mode[1] != NETWORK_MODE_GSM )
+                       if (nw_mode[1] != NETWORK_MODE_GSM)
                                nw_mode[0] = NETWORK_MODE_GSM;
                        else
                                nw_mode[0] = NETWORK_MODE_GSM | NETWORK_MODE_WCDMA | NETWORK_MODE_LTE;
                }
                /* Similar to above case */
-               else if(nw_mode[1] == -1) {
-                       if(nw_mode[0] != NETWORK_MODE_GSM )
+               else if (nw_mode[1] == -1) {
+                       if (nw_mode[0] != NETWORK_MODE_GSM)
                                nw_mode[1] = NETWORK_MODE_GSM;
                        else
                                nw_mode[1] = NETWORK_MODE_GSM | NETWORK_MODE_WCDMA | NETWORK_MODE_LTE;
@@ -1168,7 +1165,7 @@ static void __network_mode_set_on_boot(Manager *manager)
                }
        }
        /*if SIM1 is not present and SIM2 is new, default is AUTO LTE*/
-       else if ( nw_mode[0] == -2) {
+       else if (nw_mode[0] == -2) {
                if (nw_mode[1] == -1)
                        nw_mode[1] = NETWORK_MODE_GSM | NETWORK_MODE_WCDMA | NETWORK_MODE_LTE;
        }
@@ -1236,7 +1233,7 @@ static void __dds_set_on_boot(Manager *manager)
        else if (dds_rank[TELEPHONY_SUBSCRIPTION_TYPE_PRIMARY] && dds_rank[TELEPHONY_SUBSCRIPTION_TYPE_SECONDARY]) {
                if (dds_rank[TELEPHONY_SUBSCRIPTION_TYPE_PRIMARY] > dds_rank[TELEPHONY_SUBSCRIPTION_TYPE_SECONDARY])
                        subs_id = TELEPHONY_SUBSCRIPTION_TYPE_PRIMARY;
-               else if(dds_rank[TELEPHONY_SUBSCRIPTION_TYPE_PRIMARY] < dds_rank[TELEPHONY_SUBSCRIPTION_TYPE_SECONDARY])
+               else if (dds_rank[TELEPHONY_SUBSCRIPTION_TYPE_PRIMARY] < dds_rank[TELEPHONY_SUBSCRIPTION_TYPE_SECONDARY])
                        subs_id = TELEPHONY_SUBSCRIPTION_TYPE_SECONDARY;
                //In case of same rank, setting DDS based on previous boot setting.
                else {
@@ -1273,8 +1270,8 @@ static void __ds_set_on_boot(Manager *manager)
 
        dbg("Both SIM status received, process ds...");
        always_ask_hash = __generate_hash(CALL_MSG_PREF_ALWAYS_ASK);
-       if(always_ask_hash) {
-               always_ask_ds_rank = __find_ds_rank_with_hash( s, always_ask_hash);
+       if (always_ask_hash) {
+               always_ask_ds_rank = __find_ds_rank_with_hash(s, always_ask_hash);
                dbg("always_ask_ds_rank = [%d]", always_ask_ds_rank);
                g_free(always_ask_hash);
        }
@@ -1298,21 +1295,22 @@ static void __ds_set_on_boot(Manager *manager)
        info("ds_rank[0]=[%d] && ds_rank[1]=[%d] && always_ask_ds_rank = [%d]", ds_rank[0], ds_rank[1], always_ask_ds_rank);
        if (ds_rank[0] == -1 && ds_rank[1] == -1) {
                /*TODO: what if both sims are not present*/
-       } else if (ds_rank[TELEPHONY_SUBSCRIPTION_TYPE_PRIMARY] == -1)
+       } else if (ds_rank[TELEPHONY_SUBSCRIPTION_TYPE_PRIMARY] == -1) {
                preferred_subs = CALL_PREFERRED_VOICE_SUBS_SIM2;
-       else if (ds_rank[TELEPHONY_SUBSCRIPTION_TYPE_SECONDARY] == -1)
+       } else if (ds_rank[TELEPHONY_SUBSCRIPTION_TYPE_SECONDARY] == -1) {
                preferred_subs = CALL_PREFERRED_VOICE_SUBS_SIM1;
-       else if (ds_rank[TELEPHONY_SUBSCRIPTION_TYPE_PRIMARY] > ds_rank[TELEPHONY_SUBSCRIPTION_TYPE_SECONDARY]){
-               if(ds_rank[TELEPHONY_SUBSCRIPTION_TYPE_PRIMARY] > always_ask_ds_rank)
+       } else if (ds_rank[TELEPHONY_SUBSCRIPTION_TYPE_PRIMARY] > ds_rank[TELEPHONY_SUBSCRIPTION_TYPE_SECONDARY]) {
+               if (ds_rank[TELEPHONY_SUBSCRIPTION_TYPE_PRIMARY] > always_ask_ds_rank) {
                        preferred_subs = CALL_PREFERRED_VOICE_SUBS_SIM1;
-               else
+               } else {
                        preferred_subs = CALL_PREFERRED_VOICE_SUBS_ASK_ALWAYS;
-       }
-       else{
-               if(ds_rank[TELEPHONY_SUBSCRIPTION_TYPE_SECONDARY] > always_ask_ds_rank)
+               }
+       } else {
+               if (ds_rank[TELEPHONY_SUBSCRIPTION_TYPE_SECONDARY] > always_ask_ds_rank) {
                        preferred_subs = CALL_PREFERRED_VOICE_SUBS_SIM2;
-               else
+               } else {
                        preferred_subs = CALL_PREFERRED_VOICE_SUBS_ASK_ALWAYS;
+               }
        }
 
        info("preferred_subs= [%d]", preferred_subs);
@@ -1363,12 +1361,12 @@ void set_nw_dds_ds_on_boot(Manager *manager)
                        if (modem_plugin && manager_call_is_during_call(modem_plugin)) {
                                info("Call is in progress. Hold setting of nw, dds, ds");
                                tcore_server_add_notification_hook(server, TNOTI_CALL_STATUS_IDLE,
-                                                                        on_noti_hook_manager_call_status_idle, manager);
+                                                                                               on_noti_hook_manager_call_status_idle, manager);
                                is_call_in_progress = TRUE;
                                break;
                        }
                }
-               if(!is_call_in_progress) {
+               if (!is_call_in_progress) {
                        info("There are no calls in progress");
                        __set_nw_dds_ds_on_boot(manager);
                }

diff --git a/src/manager_sms.c b/src/manager_sms.c
index b913349..5f1cd6a 100644 (file)
--- a/src/manager_sms.c
+++ b/src/manager_sms.c
@@ -468,7 +468,7 @@ static void __sms_on_resp_get_sca_for_envelop(UserRequest *ur, enum tcore_respon
        if (resp->result == TCORE_RETURN_SUCCESS) {
                tcore_util_hex_dump("[SCA] ", data_len, resp);
 
-               ton = 0x80 + (resp->scaAddress.typeOfNum<< 4) + resp->scaAddress.numPlanId;
+               ton = 0x80 + (resp->scaAddress.typeOfNum << 4) + resp->scaAddress.numPlanId;
 
                /* Send ENVELOPE_CMD to SIM */
                __send_smspp_envelop_cmd(rp_data->modem_plugin, rp_data->msg_data, resp->scaAddress.dialNumLen+1, (unsigned char *)resp->scaAddress.diallingNum, ton, rp_data->dcs, rp_data->pid);