[Feature][T108][task-view-1499][ril]Modify return value GSW_HAL_FAIL to GSW_HAL_NORMAL_FAIL
Only Configure: No
Affected branch: GSW_V1453
Affected module: ril
Is it affected on IC: only ASR
Self-test: yes
Doc Update: no
Change-Id: I3d166729537a1a4863f797dc9a1d11e9cbfdddee
diff --git a/mbtk/libgsw_lib/gsw_sms.c b/mbtk/libgsw_lib/gsw_sms.c
index e33def8..bf27db3 100755
--- a/mbtk/libgsw_lib/gsw_sms.c
+++ b/mbtk/libgsw_lib/gsw_sms.c
@@ -114,9 +114,6 @@
#define lib_mbtk_path "/lib/libmbtk_lib.so"
#define lib_qser_sms_path "/lib/liblynq-qser-sms.so"
-#define GSW_HAL_FAIL GSW_HAL_NORMAL_FAIL
-#define GSW_HAL_MEM_INVAILD GSW_HAL_ARG_INVALID
-
static mbtk_info_handle_t* (*mbtk_info_handle_get)(void);
int (*mbtk_sms_state_change_cb_reg)(mbtk_info_handle_t* handle, mbtk_info_callback_func cb);
@@ -236,110 +233,110 @@
dlHandle_mbtk = dlopen(lib_mbtk_path, RTLD_NOW);
if (dlHandle_mbtk == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_log_init = (void (*)(char *path, char *tag))dlsym(dlHandle_mbtk, "mbtk_log_init");
if (mbtk_log_init == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_log = (void (*)(int level, const char *format, ...))dlsym(dlHandle_mbtk, "mbtk_log");
if (mbtk_log == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_info_handle_get = (mbtk_info_handle_t* (*)(void))dlsym(dlHandle_mbtk, "mbtk_info_handle_get");
if (mbtk_info_handle_get == NULL)
{
LOGE("mbtk_info_handle_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_sms_state_change_cb_reg = (int (*)(mbtk_info_handle_t* handle, mbtk_info_callback_func cb))dlsym(dlHandle_mbtk, "mbtk_sms_state_change_cb_reg");
if (mbtk_sms_state_change_cb_reg == NULL)
{
LOGE("mbtk_sms_state_change_cb_reg dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_info_handle_free = (int (*)(mbtk_info_handle_t** handle))dlsym(dlHandle_mbtk, "mbtk_info_handle_free");
if (mbtk_info_handle_free == NULL)
{
LOGE("mbtk_info_handle_free dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
PDUDecoding = (struct SMS_Struct (*)(const char *data))dlsym(dlHandle_mbtk, "PDUDecoding");
if (PDUDecoding == NULL)
{
LOGE("PDUDecoding dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
SCADecoding = (char *(*)(const char *data, int *EndIndex))dlsym(dlHandle_mbtk, "SCADecoding");
if (SCADecoding == NULL)
{
LOGE("SCADecoding dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
SCAEncoding = (char *(*)(char *SCA))dlsym(dlHandle_mbtk, "SCAEncoding");
if (SCAEncoding == NULL)
{
LOGE("SCAEncoding dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
PDUEncoding = (struct PDUS *(*)(char *SCA, char *DA, char *UDC, struct UDHS *udhs))dlsym(dlHandle_mbtk, "PDUEncoding");
if (PDUEncoding == NULL)
{
LOGE("PDUEncoding dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_sms_cmgf_set = (int (*)(mbtk_info_handle_t* handle, int mode))dlsym(dlHandle_mbtk, "mbtk_sms_cmgf_set");
if (mbtk_sms_cmgf_set == NULL)
{
LOGE("mbtk_sms_cmgf_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_sms_cmgs_set = (int (*)(mbtk_info_handle_t* handle, char * cmgs, char *resp))dlsym(dlHandle_mbtk, "mbtk_sms_cmgs_set");
if (mbtk_sms_cmgs_set == NULL)
{
LOGE("mbtk_sms_cmgs_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_sms_csca_set = (int (*)(mbtk_info_handle_t* handle, char * csca))dlsym(dlHandle_mbtk, "mbtk_sms_csca_set");
if (mbtk_sms_csca_set == NULL)
{
LOGE("mbtk_sms_csca_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_sms_csca_get = (int (*)(mbtk_info_handle_t* handle, char *buf))dlsym(dlHandle_mbtk, "mbtk_sms_csca_get");
if (mbtk_sms_csca_get == NULL)
{
LOGE("mbtk_sms_csca_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_sms_cnmi_set = (int (*)(mbtk_info_handle_t* handle))dlsym(dlHandle_mbtk, "mbtk_sms_cnmi_set");
if (mbtk_sms_cnmi_set == NULL)
{
LOGE("mbtk_sms_cnmi_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
smsPduEncode = (int (*)(const char *smsc, const char *da_num, const char *msg, int charset, char *smsc_pdu, char **pdu))dlsym(dlHandle_mbtk, "smsPduEncode");
if (smsPduEncode == NULL)
{
LOGE("smsPduEncode dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
@@ -347,14 +344,14 @@
if (smsPduDecode == NULL)
{
LOGE("smsPduDecode dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
_mdapi_sms_get_msg_num = (kal_int32 (*)(const char *msg, int charset, kal_int32 *msg_num, kal_int32 *msg_len))dlsym(dlHandle_mbtk,"_mdapi_sms_get_msg_num");
if (_mdapi_sms_get_msg_num == NULL)
{
LOGE("_mdapi_sms_get_msg_num dlsym fail");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -508,7 +505,7 @@
{
LOGE("[gsw_sms_sdk_init]mbtk_sms_import fail\n");
}
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_log_init("syslog", "MBTK_RIL");
@@ -518,14 +515,14 @@
{
LOGE("[gsw_sms_sdk_init] mbtk handle init fail\n");
dlclose(dlHandle_mbtk);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_sms_cnmi_set(sms_info_handle);
if(ret != 0)
{
LOGE("mbtk_sms_cnmi_set fail.[%d]\n", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_sms_state_change_cb_reg(sms_info_handle, gsw_sms_state_change_cb);
@@ -537,7 +534,7 @@
mbtk_info_handle_free(&sms_info_handle);
sms_info_handle = NULL;
}
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
LOGD("[gsw_sms_sdk_init]gsw_sms_sdk_init success\n");
@@ -570,7 +567,7 @@
if(ret != 0)
{
LOGE("[gsw_sms_sdk_deinit]mbtk_info_handle_free fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
sms_info_handle = NULL;
}
@@ -603,19 +600,19 @@
if(init_flag == 0)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(phone_num == NULL || msg == NULL)
{
- return GSW_HAL_MEM_INVAILD;
+ return GSW_HAL_ARG_INVALID;
}
if(strlen((char *)msg) > GSW_SMS_RECV_CONT_MAX || strlen((char *)msg) == 0 || strlen((char *)phone_num) == 0)
{
LOGE("strlen(telephony_num):%d", strlen((char *)phone_num));
LOGE("strlen(msg):%d", strlen((char *)msg));
- return GSW_HAL_MEM_INVAILD;
+ return GSW_HAL_ARG_INVALID;
}
int err = -1;
@@ -647,7 +644,7 @@
if(status == MDAPI_RET_ERROR)
{
LOGE("get message number failed\n");
- //return GSW_HAL_FAIL;
+ //return GSW_HAL_NORMAL_FAIL;
}
else
{
@@ -656,7 +653,7 @@
if(pdu == NULL)
{
LOGE("%s, %s, %d, allocate memory for pdu failed\n", __FILE__, __FUNCTION__, __LINE__);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
@@ -674,7 +671,7 @@
free(pdu);
pdu = NULL;
LOGE("%s, %s, %d, allocate memory for pdu[%d] failed\n", __FILE__, __FUNCTION__, __LINE__,index);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
{
@@ -724,7 +721,7 @@
}
free(pdu);
pdu = NULL;
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
{
@@ -741,7 +738,7 @@
}
free(pdu);
pdu = NULL;
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
{
@@ -778,20 +775,20 @@
if(init_flag == 0)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(smsc == NULL || len <= 0)
{
LOGE("smsc is null or len = %d\n",len);
- return GSW_HAL_MEM_INVAILD;
+ return GSW_HAL_ARG_INVALID;
}
ret = mbtk_sms_csca_get(sms_info_handle, smsc_temp);
if(smsc_temp[0] == '\0')
{
LOGE("gsw_get_smsc_address Error : %d\n", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
@@ -806,7 +803,7 @@
if(substr_t == NULL)
{
LOGE("malloc substr_t fail\n");
- return GSW_HAL_MEM_INVAILD;
+ return GSW_HAL_ARG_INVALID;
}
strncpy(substr_t, p1 + 1, len_t);
substr_t[len_t] = '\0';
@@ -822,7 +819,7 @@
else
{
LOGE("String inside double quotes not found\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
}
@@ -842,13 +839,13 @@
if(init_flag == 0)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(smsc == NULL || strlen((char *)smsc) == 0)
{
LOGE("smsc is null or empty\n");
- return GSW_HAL_MEM_INVAILD;
+ return GSW_HAL_ARG_INVALID;
}
ret = mbtk_sms_csca_set(sms_info_handle, (char *)smsc);
@@ -860,7 +857,7 @@
else
{
LOGE("set smsc fail,ret = %d\n", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;