Fix build errors

Change-Id: I341638db29aa4d3422ffa9be735d3f8f0c18e287
Signed-off-by: Wootak Jung <wootak.jung@samsung.com>

diff --git a/include/s_common.h b/include/s_common.h
index 85835d7e0257fe7d593c7fa22eb7fb574cb02625..70ba12c5b33e5f1c0cb2f63f5122af887b0133a5 100644 (file)
--- a/include/s_common.h
+++ b/include/s_common.h
@@ -121,6 +121,6 @@ char*               util_hexStringToBytes(char * s);
 gboolean util_byte_to_hex(const char *byte_pdu, char *hex_pdu, int num_bytes);
 
 void           on_send_at_request(TcorePending *p,
-                       TReturn send_status, void *user_data);
+                       gboolean send_status, void *user_data);
 
 #endif

diff --git a/src/s_call.c b/src/s_call.c
index 45843d469a79ecf09429c00b43e424d8878c7423..905a6d6c81ab0fd18b613499f577d64c69f2b40a 100644 (file)
--- a/src/s_call.c
+++ b/src/s_call.c
@@ -128,7 +128,7 @@ static void _call_branch_by_status(CoreObject *co,
                case TCORE_CALL_STATUS_ACTIVE: {
                        struct tnoti_call_status_active data = {0, };
 
-                       data.type = call_type;
+                       data.type = CALL_TYPE_VOICE;
                        data.handle = call_handle;
 
                        /* Send notification */
@@ -141,7 +141,7 @@ static void _call_branch_by_status(CoreObject *co,
                case TCORE_CALL_STATUS_HELD: {
                        struct tnoti_call_status_held data = {0, };
 
-                       data.type = call_type;
+                       data.type = CALL_TYPE_VOICE;
                        data.handle = call_handle;
 
                        /* Send notification */
@@ -154,7 +154,7 @@ static void _call_branch_by_status(CoreObject *co,
                case TCORE_CALL_STATUS_DIALING: {
                        struct tnoti_call_status_dialing data = {0, };
 
-                       data.type = call_type;
+                       data.type = CALL_TYPE_VOICE;
                        data.handle = call_handle;
 
                        /* Send notification */
@@ -167,7 +167,7 @@ static void _call_branch_by_status(CoreObject *co,
                case TCORE_CALL_STATUS_ALERT: {
                        struct tnoti_call_status_alert data = {0, };
 
-                       data.type = call_type;
+                       data.type = CALL_TYPE_VOICE;
                        data.handle = call_handle;
 
                        /* Send notification */
@@ -181,7 +181,7 @@ static void _call_branch_by_status(CoreObject *co,
                case TCORE_CALL_STATUS_WAITING: {
                        struct tnoti_call_status_incoming data = {0, };
 
-                       data.type = call_type;
+                       data.type = CALL_TYPE_VOICE;
                        data.handle = call_handle;
                        tcore_call_object_get_number(call_obj, data.cli.number);
                        data.cli.mode = tcore_call_object_get_cli_mode(call_obj);
@@ -203,7 +203,7 @@ static void _call_branch_by_status(CoreObject *co,
                        idle.handle = call_handle;
                        /* TODO - get proper call end cause. */
                        idle.cause = CALL_END_CAUSE_NONE;
-                       idle.type = TCORE_CALL_TYPE_VOICE;
+                       idle.type = CALL_TYPE_VOICE;
 
                        /* Send notification */
                        tcore_server_send_notification(tcore_plugin_ref_server(p), co,

diff --git a/src/s_network.c b/src/s_network.c
index a99aa827f1a9326fe02d48ea4a90de7cbe7841ff..e0aef872b284fd6c0536a100a3f33ff4c096466b 100644 (file)
--- a/src/s_network.c
+++ b/src/s_network.c
@@ -100,7 +100,7 @@ static unsigned int lookup_tbl_access_technology[] = {
        [AT_COPS_ACT_E_UTRAN] = NETWORK_ACT_GSM_UTRAN,
 };
 
-static gboolean get_serving_network(CoreObject *o, UserRequest *ur);
+static TReturn get_serving_network(CoreObject *o, UserRequest *ur);
 
 static void _insert_mcc_mnc_oper_list(TcorePlugin *p, CoreObject *co_network)
 {
@@ -912,9 +912,10 @@ static void on_response_network_set_plmn_selection_mode(TcorePending *p,
                        nw_resp.result = TCORE_RETURN_SUCCESS;
                } else {
                        err("RESPONSE NOK");
-                       if (at_resp->lines)
+                       if (at_resp->lines) {
                                err("CME Error[%s]", (char *)at_resp->lines->data);
                                nw_resp.result = TCORE_RETURN_FAILURE;
+                       }
                }
        } else {
                err("Response: [NOK]");

diff --git a/src/s_sim.c b/src/s_sim.c
index 8f061b8b96afd39fbcb96a9234d6620f387194fb..5de04aca1f2a85b49cb389311ec4961556c98f4a 100644 (file)
--- a/src/s_sim.c
+++ b/src/s_sim.c
@@ -161,7 +161,7 @@ typedef struct {
        struct tel_sim_mbi_list mbi_list; /**< Mailbox List */
        struct tel_sim_mb_number mb_list[SIM_MSP_CNT_MAX * 5]; /**< Mailbox number */
        enum tel_sim_file_id file_id; /**< Current file id */
-       TReturn file_result; /**< File access result */
+       enum tel_sim_access_result file_result; /**< File access result */
        struct tresp_sim_read files; /**< File read data */
        enum tcore_request_command req_command; /**< Request command Id */
        struct tel_sim_imsi imsi; /**< Stored locally as of now,
@@ -184,7 +184,6 @@ static TReturn s_sim_get_facility(CoreObject *co_sim, UserRequest *ur);
 static TReturn s_sim_read_file(CoreObject *co_sim, UserRequest *ur);
 
 /* Utility Function Declaration */
-static TReturn __sim_decode_status_word(unsigned short status_word1, unsigned short status_word2);
 static void __sim_update_sim_status(CoreObject *co_sim, enum tel_sim_status sim_status);
 static void __sim_get_sim_type(CoreObject *co_sim);
 static const char *__sim_get_fac_from_lock_type(enum tel_sim_facility_type lock_type);
@@ -371,10 +370,10 @@ static enum tcore_response_command __find_resp_command(UserRequest *ur)
 }
 
 /* Utility Functions */
-static TReturn __sim_decode_status_word(unsigned short status_word1,
+static enum tel_sim_access_result __sim_decode_status_word(unsigned short status_word1,
        unsigned short status_word2)
 {
-       TReturn rst = SIM_ACCESS_FAILED;
+       enum tel_sim_access_result rst = SIM_ACCESS_FAILED;
 
        if (status_word1 == 0x93 && status_word2 == 0x00) {
                rst = SIM_ACCESS_FAILED;

diff --git a/src/s_sms.c b/src/s_sms.c
index daf39aec0821bf4be5da16c283c40dfe5b6f340e..b5cccdf4669b41d6383025bf5aff0810a44c02bb 100644 (file)
--- a/src/s_sms.c
+++ b/src/s_sms.c
@@ -76,8 +76,6 @@ static gboolean __util_hexstring_to_bytes(char *hex_str,
        char **bytes, guint *bytes_len);
 static long __util_encode_hex(const guchar *src,
        long num_bytes, char *buf);
-static guint __util_encode_pdu(const guchar sca[SMS_SMSP_ADDRESS_LEN],
-       const guchar *tpdu, guint tpdu_len, char *pdu);
 
 static gchar __util_hexchar_to_int(gchar c)
 {