source: remove build warning on server source file

Second. I remove build warnings on server source files.

There are many problems about code convention like indentations,
whitespaces, tabs, and so on. These should be aligned later, not this
commit.

Change-Id: Ia50bd2ac2f592693f7722ddf8c6c17874f566bab
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

diff --git a/vmodem/server/client.c b/vmodem/server/client.c
index 3724e38..60e3089 100644 (file)
--- a/vmodem/server/client.c
+++ b/vmodem/server/client.c
@@ -784,7 +784,9 @@ static void do_sms(PhoneServer * ps, TClientInfo * ci, LXT_MESSAGE * packet)
             if((int)p[0] == MMS_SEND_OK || (int)p[0] == MMS_SEND_FAIL){
                 sprintf(vconf_cmd, "vconftool set -t int memory/telephony/mms_sent_status %d -i -f", ((int)p[0] - MMS_MODIFIER));
                 TRACE(MSGL_VGSM_INFO, "system : %s\n", vconf_cmd);
-                system(vconf_cmd);
+                if (system(vconf_cmd) == -1) {
+                    TRACE(MSGL_WARN, "system(%s) has failed\n", vconf_cmd);
+                }
             } else {
                 smsSentStatus = (int)p[0];
             }
@@ -949,7 +951,7 @@ static int client_callback(PhoneServer * ps, int fd, EloopCondition cond, void *
     action = packet.action;
     length = packet.length;
 
-    TRACE(MSGL_VGSM_INFO, "in client_callback, group : %x\n", group);
+    TRACE(MSGL_VGSM_INFO, "in client_callback, group: %x, length: %d\n", group, length);
 
     if(vconf_get_int(VCONFKEY_TELEPHONY_RSSI, &rssi)) {
         TRACE(MSGL_WARN, "vconf_get_int(%s) fail\n", VCONFKEY_TELEPHONY_RSSI);

diff --git a/vmodem/server/func_ps.c b/vmodem/server/func_ps.c
index caf3235..f92e600 100644 (file)
--- a/vmodem/server/func_ps.c
+++ b/vmodem/server/func_ps.c
@@ -118,6 +118,9 @@ static void svr_svrmgr_write_state(LXT_PHONE_STATE stateBefore, LXT_PHONE_STATE
     if(fd >=0)
     {
        rc = write(fd, data, strlen(data));
+        if (rc < 0) {
+            TRACE(MSGL_WARN, "write() has failed.\n");
+        }
        close(fd);
     }
 }

diff --git a/vmodem/server/main.c b/vmodem/server/main.c
index 91001b7..3862085 100644 (file)
--- a/vmodem/server/main.c
+++ b/vmodem/server/main.c
@@ -167,6 +167,7 @@ int main(int argc, char *argv[])
     }
 
     phone_power = GSM_PhonePowerStatus();
+    TRACE(MSGL_VGSM_INFO, "Phone Power Status: %d\n", phone_power);
 
 #ifdef __arm__
     error = GSM_PhonePowerOn(1);

diff --git a/vmodem/server/server.c b/vmodem/server/server.c
index 9359bee..41f016f 100644 (file)
--- a/vmodem/server/server.c
+++ b/vmodem/server/server.c
@@ -58,7 +58,7 @@ typedef struct _msg_info {
     unsigned int cclisn;
 } msg_info;
 
-int q_vmodem_device_init()
+static int q_vmodem_device_init(void)
 {
     TRACE(MSGL_VGSM_INFO, "\n");
 
@@ -494,7 +494,7 @@ static void server_cast_missed_message(PhoneServer * ps, int klass, int clientfd
             }
 
             server->mmsg.mmsg_info[ii].klass = LXT_ID_CLIENT_RESERVED;
-            TRACE(MSGL_VGSM_INFO, "removed missed cast index: %d by client(0x%x)\n", ii, klass);
+            TRACE(MSGL_VGSM_INFO, "removed missed cast index: %d by client(0x%x), rc: %d\n", ii, klass, rc);
 
             // clear message
             TAPIMessageFree(&(server->mmsg.mmsg_info[ii].mmsg));

diff --git a/vmodem/server/server_common_network.c b/vmodem/server/server_common_network.c
index 70f2b49..1dd87f5 100644 (file)
--- a/vmodem/server/server_common_network.c
+++ b/vmodem/server/server_common_network.c
@@ -237,7 +237,7 @@ gsm_network_reg_t *get_network_registration()
 
 void set_plmn_selection( gsm_net_sel_e_type mode, unsigned char plmn[], gsm_net_act_e_type act )
 {
-    int i = 0, find = 0;
+    int i = 0; //, find = 0; //XXX check why
 
     g_network_sel_mode = mode;
 
@@ -249,7 +249,7 @@ void set_plmn_selection( gsm_net_sel_e_type mode, unsigned char plmn[], gsm_net_
            if( memcmp( g_plmn_list.precord[i].plmn, plmn, 6 ) == 0 )
            {
                g_plmn_list.precord[i].status = GSM_NET_PLMN_STATUS_CURRENT;
-               find = 1;
+               //find = 1;
            }
            else if( g_plmn_list.precord[i].status == GSM_NET_PLMN_STATUS_CURRENT )
                g_plmn_list.precord[i].status = GSM_NET_PLMN_STATUS_AVAIL;

diff --git a/vmodem/server/server_rx_call.c b/vmodem/server/server_rx_call.c
index 7ed6854..eea6e3d 100644 (file)
--- a/vmodem/server/server_rx_call.c
+++ b/vmodem/server/server_rx_call.c
@@ -68,6 +68,7 @@ int server_rx_call_answer_exec(void)
 
     /*   check general response error & call status error    */
     call_gen_resp_err = check_call_error();
+    TRACE(MSGL_VGSM_INFO, "call_gen_resp_err: %d\n", call_gen_resp_err);
 
     data[0] = 0x02;            //The object is simulator,   0x01 : Outgoing Call, 0x02 : Answer Call, 0x03 : Release Call
 
@@ -95,7 +96,7 @@ int server_rx_call_originate_exec(void *ptr_data, int data_len )
     unsigned char clir_status;
     unsigned char num_len;
     unsigned char num_type;
-    const unsigned char *number;
+    char *number;
     unsigned char call_id;
     STATE next;
 
@@ -109,7 +110,7 @@ int server_rx_call_originate_exec(void *ptr_data, int data_len )
 
     ret = strtok(call_data+1, token);
     if(ret)
-       strcpy((char*)number, ret);
+       strcpy(number, ret);
 
     // DOCUMENTATION ERROR
     //
@@ -125,8 +126,9 @@ int server_rx_call_originate_exec(void *ptr_data, int data_len )
     assert(valid_call_type(call_type));
 
     clir_status = GSM_CALL_STATUS_DIALING;
-    num_len = strlen((char*)number);
+    num_len = strlen(number);
     num_type = GSM_NUM_TYPE_INTERNATIONAL;
+    TRACE(MSGL_VGSM_INFO, "num_type: %u\n", (unsigned int)num_type);
 
     assert(num_len <= MAX_GSM_DIALED_DIGITS_NUM);
 
@@ -175,7 +177,7 @@ int server_rx_call_originate_exec(void *ptr_data, int data_len )
 
     FuncServer->Cast(&GlobalPS, LXT_ID_CLIENT_EVENT_INJECTOR, &packet);
 
-    set_call_list( GSM_CALL_DIR_MO, GSM_CALL_STATUS_DIALING, call_type, (char*)number, num_len );
+    set_call_list( GSM_CALL_DIR_MO, GSM_CALL_STATUS_DIALING, call_type, number, num_len );
 
     callback_callist();
 
@@ -206,6 +208,7 @@ int server_rx_call_release_exec(void) // for all call release case. one call rel
 
     /* check general response error & call status error */
     call_gen_resp_err = check_call_error();
+    TRACE(MSGL_VGSM_INFO, "call_gen_resp_err: %d\n", call_gen_resp_err);
     server_tx_call_all_release();
     return 1;
 }

diff --git a/vmodem/server/server_rx_network.c b/vmodem/server/server_rx_network.c
index afb2d9d..a65e451 100644 (file)
--- a/vmodem/server/server_rx_network.c
+++ b/vmodem/server/server_rx_network.c
@@ -135,6 +135,8 @@ int server_rx_net_reg_get(void)
  */
 static const unsigned char default_plmn[PLMN_SIZE] = { '1','1','1','1','1','#' };
 
+/* XXX: These functions are not used, now.
+ *      But should check why.
 static void find_plmn( unsigned char *plmn, unsigned char *act)
 {
     gsm_network_plmn_list_t *plmn_list = get_plmn_list();
@@ -154,6 +156,7 @@ static void find_plmn( unsigned char *plmn, unsigned char *act)
     *act = GSM_NET_ACT_UTRAN;
     memcpy(plmn, default_plmn, sizeof default_plmn);
 }
+*/
 
 int server_rx_net_current_plmn_get(void)
 {

diff --git a/vmodem/server/server_rx_security.c b/vmodem/server/server_rx_security.c
index 2da07b5..4831349 100644 (file)
--- a/vmodem/server/server_rx_security.c
+++ b/vmodem/server/server_rx_security.c
@@ -598,6 +598,7 @@ int server_rx_sim_sec_check_password_req(void* ptr_data, int data_len)
 
     recv_type = GSM_SEC_LOCK_TYPE_SC;
     lock_type = GSM_SIM_PIN2_REQ;
+    SIM_DEBUG("%02x\n", recv_type);
 
     result = server_sec_verify_password(password,lock_type,length_p);
     /* fail case    */

diff --git a/vmodem/server/server_rx_ss.c b/vmodem/server/server_rx_ss.c
index bf31085..ee3c14d 100644 (file)
--- a/vmodem/server/server_rx_ss.c
+++ b/vmodem/server/server_rx_ss.c
@@ -76,6 +76,9 @@ int server_rx_ss_cw_get(int tel_class)
            , cw_entry->tel_class, cw_entry->ss_mode, ss_status);
 
     ret = oem_tx_ss_cw_resp(data, strlen(data));
+    if (ret < 0) {
+        log_msg(MSGL_WARN, "oem_tx_ss_cf_resp() has failed.\n");
+    }
 
     free(data);
     return 1;
@@ -90,6 +93,9 @@ int server_rx_ss_cb_get(int tel_class, int cb_type)
     log_msg(MSGL_VGSM_INFO,"tel_class = %d, cb_type = %d \n", tel_class, cb_type);
 
     cb_entry = find_call_barring_entry(tel_class, cb_type);
+    if (cb_entry == NULL) {
+        log_msg(MSGL_VGSM_INFO, "cb_entry is null.\n");
+    }
 
     return at_gen_resp_send(AT_GEN_ERR_NO_ERROR);
 }
@@ -122,6 +128,9 @@ int server_rx_ss_cf_get(int tel_class, int cf_type)
     strcat(sndbuf, CRLF);
 
     ret = oem_tx_ss_cf_resp(sndbuf, strlen(sndbuf));
+    if (ret < 0) {
+        log_msg(MSGL_WARN, "oem_tx_ss_cf_resp() has failed.\n");
+    }
 
     return 1;
 }
@@ -470,7 +479,7 @@ int server_rx_ss_cb_passwd_set(char* curr_passwd, char* new_passwd)
        else
            gen_resp_err = SS_ERR_NEGATIVE_PW_CHECK; // NegativePasswordCheck
 
-       oem_tx_ss_gen_resp(gen_resp_err);
+       oem_tx_ss_gen_resp(AT_CME_ERR_INCORRECT_PWD);
        return 1;
     }
 
@@ -481,7 +490,7 @@ int server_rx_ss_cb_passwd_set(char* curr_passwd, char* new_passwd)
     /* gen resp */
     set_ss_current_general_response_error( get_ss_general_response_error() );
     gen_resp_err = get_ss_current_general_response_error();
-    oem_tx_ss_gen_resp(gen_resp_err);
+    oem_tx_ss_gen_resp(AT_GEN_ERR_NO_ERROR);
     if(gen_resp_err != 0x8000)
     {
        log_msg(MSGL_WARN,"gen_resp_err : %d \n", gen_resp_err);

diff --git a/vmodem/server/server_tx_call.c b/vmodem/server/server_tx_call.c
index e939f72..cf6e907 100644 (file)
--- a/vmodem/server/server_tx_call.c
+++ b/vmodem/server/server_tx_call.c
@@ -161,7 +161,8 @@ int server_tx_call_status(void) // it means call state.
 
     unsigned char pdata[128];
     int at_stat = change_stat_for_at(callList->CallInfo[get_call_id()].stat);
-    TRACE(MSGL_VGSM_INFO, "call id:%d, orignal stat: %d, send stat: %d\n", get_call_id(), callList->CallInfo[get_call_id()].stat, at_stat);
+    TRACE(MSGL_VGSM_INFO, "call id:%d, orignal stat: %d, send stat: %d, call state: %d\n",
+         get_call_id(), callList->CallInfo[get_call_id()].stat, at_stat, call_state);
 
     if(strcmp(callList->CallInfo[get_call_id()].number, ""))
     {
@@ -188,7 +189,7 @@ int server_tx_call_list_noti(void)
 {
     _ENTER();
 
-    int i = 0, j = 0, ret = 0;
+    int i = 0, ret = 0;
     int CallCount = 0;
     int len = 0;
     unsigned char *data = NULL;
@@ -201,7 +202,6 @@ int server_tx_call_list_noti(void)
     len = 32 + (8+MAX_GSM_DIALED_DIGITS_NUMBER);
     data = malloc(len*2);
     log_msg(MSGL_VGSM_INFO,"CallCount %d\n", CallCount);
-    j = 1;
     for (i=0; i < MAX_CALL_COUNT; i++) {
        if( callList->CallInfo[i].stat == GSM_CALL_STATUS_NONE )
            continue;
@@ -520,6 +520,7 @@ int server_tx_call_release_exec(LXT_MESSAGE * packet )
     {
        // general error send
        call_gen_resp_err = check_call_error();
+        log_msg(MSGL_VGSM_INFO,"call_gen_resp_err: %d\n", call_gen_resp_err);
        //oem_tx_call_gen_resp(call_gen_resp_err);
        set_general_response_error(0x8000);
     }
@@ -627,7 +628,7 @@ int server_tx_call_alert_ind(void *ptr_data, int data_len )
     //send noti ( outgoing  )to Phone
     // set_current_state( STATE_STANDBY, GSM_CALL_CMD, GSM_CALL_OUTGOING);
 
-    /* 
+    /*
        if( find_next_state( &next, STATE_FLAG_ALL ) ) {
     // call server_tx_call_msg()
     set_state_machine( next );
@@ -636,10 +637,11 @@ int server_tx_call_alert_ind(void *ptr_data, int data_len )
      */
 
     //send noti ( alert  )to Phone
-    unsigned short call_type = get_call_type();
+    int call_type = get_call_type();
     int i = 0;
     int dialing_id = -1;
 
+    TRACE(MSGL_VGSM_INFO, "call_type: %d\n", call_type);
     gsm_call_list_t * callList = malloc(sizeof(gsm_call_list_t));
 
     if(!callList) {

diff --git a/vmodem/server/server_tx_power.c b/vmodem/server/server_tx_power.c
index 1aa87dd..41fcbf1 100644 (file)
--- a/vmodem/server/server_tx_power.c
+++ b/vmodem/server/server_tx_power.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <assert.h>
 
+#include "server_common.h"
 #include "phoneserver.h"
 #include "vgsm_phone.h"
 #include "linuxtapi.h"

diff --git a/vmodem/server/server_tx_security.c b/vmodem/server/server_tx_security.c
index f517b87..d28c053 100644 (file)
--- a/vmodem/server/server_tx_security.c
+++ b/vmodem/server/server_tx_security.c
@@ -274,7 +274,7 @@ int server_tx_sim_sec_pin_status_noti(STATE_TYPE before_state, STATE_TYPE curren
     int data_size = 2;
     unsigned char *pdata = 0;
 
-    int send_sim_init_msg      =       0;
+    // int send_sim_init_msg   =       0;
 
     // STATE current;
     // STATE prev;
@@ -372,8 +372,8 @@ int server_tx_sim_sec_pin_status_noti(STATE_TYPE before_state, STATE_TYPE curren
                        {
                            pdata[0]    =       GSM_SEC_SIM_INIT_COMPLETED;
                            pdata[1]    =       GSM_SEC_LOCK_KEY_UNLOCKED;
-                           send_sim_init_msg   =       1;
                            /*
+                           send_sim_init_msg   =       1;
                               oem_tx_sim_sec_pin_status_noti(pdata, data_size);
 
                               pdata[0] =       GSM_SEC_PB_INIT_COMPLETED;