[Feature][T108] [task-view-1792] modify LOG
Only Configure: No
Affected branch: GSW_V1453
Affected module: log
Self-test: yes
Doc Update: no
Change-Id: Iee673a64346d0fad2450fec1092f61bae981e7dc
diff --git a/mbtk/libgsw_lib/gsw_sms_interface.c b/mbtk/libgsw_lib/gsw_sms_interface.c
index 415bc49..3b8ea47 100755
--- a/mbtk/libgsw_lib/gsw_sms_interface.c
+++ b/mbtk/libgsw_lib/gsw_sms_interface.c
@@ -5,7 +5,7 @@
#include <dlfcn.h>
#include <time.h>
#include "gsw_nw_interface.h"
-
+#include "gsw_log_interface.h"
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
typedef unsigned char uint8_t;
@@ -127,101 +127,14 @@
int (*mbtk_sms_csca_set)(mbtk_info_handle_t* handle, char * csca);
int (*mbtk_sms_csca_get)(mbtk_info_handle_t* handle, char *buf);
int (*mbtk_sms_cnmi_set)(mbtk_info_handle_t* handle);
-static void (*mbtk_log)(int level, const char *format, ...);
-static void (*mbtk_log_init)(char *path, char *tag);
+// static void (*mbtk_log)(int level, const char *format, ...);
+// static void (*mbtk_log_init)(char *path, char *tag);
int (*smsPduEncode)(const char *smsc, const char *da_num, const char *msg, int charset, char *smsc_pdu, char **pdu);
int (*smsPduDecode)(const char *pdu_str, int pdu_len, char *da_num, char *smsc, char *msg, int *charset, int *curr_pack, int *total_pack, char *date);
kal_int32 (*_mdapi_sms_get_msg_num)(const char *msg, int charset, kal_int32 *msg_num, kal_int32 *msg_len);
-#ifndef LOG_ERR_LEVEL
-#define LOG_ERR_LEVEL 3 /* error conditions */
-#endif
-#ifndef LOG_WARN_LEVEL
-#define LOG_WARN_LEVEL 4 /* warning conditions */
-#endif
-#ifndef LOG_INFO_LEVEL
-#define LOG_INFO_LEVEL 6 /* informational */
-#endif
-#ifndef LOG_DEBUG_LEVEL
-#define LOG_DEBUG_LEVEL 7 /* debug-level messages */
-#endif
-#ifndef LOG_VERBOSE_LEVEL
-#define LOG_VERBOSE_LEVEL 8
-#endif
#define GSW_SMS "[HAL][GSW_SMS]"
-#define LOGV(fmt, args ...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- mbtk_log(LOG_VERBOSE_LEVEL, "%s#%s: "GSW_SMS"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-#define LOGI(fmt, args...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- mbtk_log(LOG_INFO_LEVEL, "%s#%s: "GSW_SMS"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-#define LOGD(fmt, args...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- mbtk_log(LOG_DEBUG_LEVEL, "%s#%s: "GSW_SMS"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-#define LOGW(fmt, args...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- mbtk_log(LOG_WARN_LEVEL, "%s#%s: "GSW_SMS"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-#define LOGE(fmt, args...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- mbtk_log(LOG_ERR_LEVEL, "%s#%s: "GSW_SMS"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-
-
static mbtk_info_handle_t* sms_info_handle = NULL;
static sms_client_handle_type handle;
static char sms_center_address[SMSC_MAX_LEN] = {0};
@@ -236,106 +149,106 @@
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_NORMAL_FAIL;
- }
+ // mbtk_log_init = (void (*)(char *path, char *tag))dlsym(dlHandle_mbtk, "mbtk_log_init");
+ // if (mbtk_log_init == NULL)
+ // {
+ // 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_NORMAL_FAIL;
- }
+ // mbtk_log = (void (*)(int level, const char *format, ...))dlsym(dlHandle_mbtk, "mbtk_log");
+ // if (mbtk_log == NULL)
+ // {
+ // 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");
+ LOGE(GSW_SMS,"mbtk_info_handle_get dlsym fail\n");
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");
+ LOGE(GSW_SMS,"mbtk_sms_state_change_cb_reg dlsym fail\n");
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");
+ LOGE(GSW_SMS,"mbtk_info_handle_free dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
PDUDecoding = (struct SMS_Struct (*)(const char *data))dlsym(dlHandle_mbtk, "PDUDecoding");
if (PDUDecoding == NULL)
{
- LOGE("PDUDecoding dlsym fail\n");
+ LOGE(GSW_SMS,"PDUDecoding dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
SCADecoding = (char *(*)(const char *data, int *EndIndex))dlsym(dlHandle_mbtk, "SCADecoding");
if (SCADecoding == NULL)
{
- LOGE("SCADecoding dlsym fail\n");
+ LOGE(GSW_SMS,"SCADecoding dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
SCAEncoding = (char *(*)(char *SCA))dlsym(dlHandle_mbtk, "SCAEncoding");
if (SCAEncoding == NULL)
{
- LOGE("SCAEncoding dlsym fail\n");
+ LOGE(GSW_SMS,"SCAEncoding dlsym fail\n");
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");
+ LOGE(GSW_SMS,"PDUEncoding dlsym fail\n");
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");
+ LOGE(GSW_SMS,"mbtk_sms_cmgf_set dlsym fail\n");
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");
+ LOGE(GSW_SMS,"mbtk_sms_cmgs_set dlsym fail\n");
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");
+ LOGE(GSW_SMS,"mbtk_sms_csca_set dlsym fail\n");
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");
+ LOGE(GSW_SMS,"mbtk_sms_csca_get dlsym fail\n");
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");
+ LOGE(GSW_SMS,"mbtk_sms_cnmi_set dlsym fail\n");
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");
+ LOGE(GSW_SMS,"smsPduEncode dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
@@ -343,14 +256,14 @@
smsPduDecode = (int (*)(const char *pdu_str, int pdu_len, char *da_num, char *smsc, char *msg, int *charset, int *curr_pack, int *total_pack, char *date))dlsym(dlHandle_mbtk,"smsPduDecode");
if (smsPduDecode == NULL)
{
- LOGE("smsPduDecode dlsym fail\n");
+ LOGE(GSW_SMS,"smsPduDecode dlsym fail\n");
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");
+ LOGE(GSW_SMS,"_mdapi_sms_get_msg_num dlsym fail");
return GSW_HAL_NORMAL_FAIL;
}
@@ -374,7 +287,7 @@
}
void gsw_sms_state_change_cb(const void* data, int data_len) {
- LOGD("gsw_sms_state_change_cb -------start\n");
+ LOGD(GSW_SMS,"gsw_sms_state_change_cb -------start\n");
uint8 *ptr = (uint8*)data;
@@ -398,9 +311,9 @@
int total_pack = 1;
if(ptr == NULL)
{
- LOGE("ptr is null");
+ LOGE(GSW_SMS,"ptr is null");
}
- LOGE("ptr: %s\n,data_len = %d\n", (char *)ptr, data_len);
+ LOGE(GSW_SMS,"ptr: %s\n,data_len = %d\n", (char *)ptr, data_len);
if(data_len > MDAPI_MAX_PDU_SIZE)
{
strncpy(received_pdu, (const char *)ptr, MDAPI_MAX_PDU_SIZE-1);
@@ -412,12 +325,12 @@
ret = smsPduDecode((const char *)received_pdu, data_len, num, smsc, msg, &charset, &curr_pack, &total_pack,date);
if(ret != 0)
{
- LOGE("smsPduDecode fail\n");
+ LOGE(GSW_SMS,"smsPduDecode fail\n");
return ;
}
- LOGE("smsPduDecode ret: %d\n", ret);
- LOGE("SMS :%s, %s, %d\n", __FILE__, __FUNCTION__, __LINE__);
- LOGE("[EVENT][MT_SMS]PDU decode:smsc: %s\n, phone number: %s\ncharset: %d\n msg_len: %d\n message content: %s\n curr_pack: %d\n total_pack: %d\n date: %s", smsc, num, charset, strlen(msg), msg, curr_pack, total_pack, date);
+ LOGE(GSW_SMS,"smsPduDecode ret: %d\n", ret);
+ LOGE(GSW_SMS,"SMS :%s, %s, %d\n", __FILE__, __FUNCTION__, __LINE__);
+ LOGE(GSW_SMS,"[EVENT][MT_SMS]PDU decode:smsc: %s\n, phone number: %s\ncharset: %d\n msg_len: %d\n message content: %s\n curr_pack: %d\n total_pack: %d\n date: %s", smsc, num, charset, strlen(msg), msg, curr_pack, total_pack, date);
gsw_sms_msg.content_encode = charset;
memcpy(gsw_sms_msg.src_num, num, strlen(num));
@@ -426,17 +339,17 @@
if(sscanf(date, "%4[^-]-%2[^-]-%2[^ ] %2[^:]:%2[^:]:%2s", (char*)gsw_sms_date.year, (char*)gsw_sms_date.month, (char*)gsw_sms_date.day, (char*)gsw_sms_date.hour, (char*)gsw_sms_date.minutes, (char*)gsw_sms_date.seconds)<=0)
{
- LOGE("sscanf failed\n");
+ LOGE(GSW_SMS,"sscanf failed\n");
}
snprintf((char *)gsw_sms_date.timezone, sizeof(gsw_sms_date.timezone), "%s","+8");
- LOGE("Year: %s\n", (char*)gsw_sms_date.year);
- LOGE("Month: %s\n", (char*)gsw_sms_date.month);
- LOGE("Day: %s\n", (char*)gsw_sms_date.day);
- LOGE("Hour: %s\n", (char*)gsw_sms_date.hour);
- LOGE("Minute: %s\n", (char*)gsw_sms_date.minutes);
- LOGE("Second: %s\n", (char*)gsw_sms_date.seconds);
+ LOGE(GSW_SMS,"Year: %s\n", (char*)gsw_sms_date.year);
+ LOGE(GSW_SMS,"Month: %s\n", (char*)gsw_sms_date.month);
+ LOGE(GSW_SMS,"Day: %s\n", (char*)gsw_sms_date.day);
+ LOGE(GSW_SMS,"Hour: %s\n", (char*)gsw_sms_date.hour);
+ LOGE(GSW_SMS,"Minute: %s\n", (char*)gsw_sms_date.minutes);
+ LOGE(GSW_SMS,"Second: %s\n", (char*)gsw_sms_date.seconds);
gsw_sms_msg.date = gsw_sms_date;
@@ -445,7 +358,7 @@
// if(total_pack > 1 && curr_pack < total_pack)
// {
gsw_sms_callback(GSW_SMS_RECEIVED_FLG, &gsw_sms_msg);
- LOGD("the gsw_sms_state_e is %d\n",GSW_SMS_RECEIVED_FLG);
+ LOGD(GSW_SMS,"the gsw_sms_state_e is %d\n",GSW_SMS_RECEIVED_FLG);
// }
// else
// {
@@ -472,7 +385,7 @@
if(handle_ptr == NULL)
{
- LOGE("gsw_sms_reg_callback fail,handle_ptr is null\n");
+ LOGE(GSW_SMS,"gsw_sms_reg_callback fail,handle_ptr is null\n");
return -1;
}
else
@@ -495,17 +408,17 @@
if(init_flag == 1)
{
- LOGE("has init sms sdk,return\n");
+ LOGE(GSW_SMS,"has init sms sdk,return\n");
return GSW_HAL_SUCCESS;
}
ret = mbtk_sms_import();
if(ret != 0)
{
- if(mbtk_log != NULL)
- {
- LOGE("[gsw_sms_sdk_init]mbtk_sms_import fail\n");
- }
+ // if(mbtk_log != NULL)
+ // {
+ // LOGE(GSW_SMS,"[gsw_sms_sdk_init]mbtk_sms_import fail\n");
+ // }
return GSW_HAL_NORMAL_FAIL;
}
@@ -514,7 +427,7 @@
sms_info_handle = mbtk_info_handle_get();
if(sms_info_handle == NULL)
{
- LOGE("[gsw_sms_sdk_init] mbtk handle init fail\n");
+ LOGE(GSW_SMS,"[gsw_sms_sdk_init] mbtk handle init fail\n");
dlclose(dlHandle_mbtk);
return GSW_HAL_NORMAL_FAIL;
}
@@ -522,14 +435,14 @@
ret = mbtk_sms_cnmi_set(sms_info_handle);
if(ret != 0)
{
- LOGE("mbtk_sms_cnmi_set fail.[%d]\n", ret);
+ LOGE(GSW_SMS,"mbtk_sms_cnmi_set fail.[%d]\n", ret);
return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_sms_state_change_cb_reg(sms_info_handle, gsw_sms_state_change_cb);
if(ret != 0)
{
- LOGE("mbtk_sms_state_change_cb_reg fail.[%d]\n", ret);
+ LOGE(GSW_SMS,"mbtk_sms_state_change_cb_reg fail.[%d]\n", ret);
if(sms_info_handle)
{
mbtk_info_handle_free(&sms_info_handle);
@@ -538,7 +451,7 @@
return GSW_HAL_NORMAL_FAIL;
}
- LOGD("[gsw_sms_sdk_init]gsw_sms_sdk_init success\n");
+ LOGD(GSW_SMS,"[gsw_sms_sdk_init]gsw_sms_sdk_init success\n");
init_flag = 1;
return GSW_HAL_SUCCESS;
}
@@ -558,31 +471,31 @@
return -1;
}
- LOGD("callback clear\n");
+ LOGD(GSW_SMS,"callback clear\n");
gsw_sms_callback = NULL;
- LOGD("handle_free\n");
+ LOGD(GSW_SMS,"handle_free\n");
if(sms_info_handle != NULL)
{
ret = mbtk_info_handle_free(&sms_info_handle);
if(ret != 0)
{
- LOGE("[gsw_sms_sdk_deinit]mbtk_info_handle_free fail\n");
+ LOGE(GSW_SMS,"[gsw_sms_sdk_deinit]mbtk_info_handle_free fail\n");
return GSW_HAL_NORMAL_FAIL;
}
sms_info_handle = NULL;
}
- LOGD("dlclose start\n");
+ LOGD(GSW_SMS,"dlclose start\n");
if(dlHandle_mbtk == NULL)
{
- LOGE("[gsw_sms_sdk_deinit]dlHandle_sms is null\n");
+ LOGE(GSW_SMS,"[gsw_sms_sdk_deinit]dlHandle_sms is null\n");
}
else
{
dlclose(dlHandle_mbtk);
}
- LOGD("dlclose end\n");
+ LOGD(GSW_SMS,"dlclose end\n");
init_flag = 0;
return GSW_HAL_SUCCESS;
}
@@ -611,8 +524,8 @@
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));
+ LOGE(GSW_SMS,"strlen(telephony_num):%d", strlen((char *)phone_num));
+ LOGE(GSW_SMS,"strlen(msg):%d", strlen((char *)msg));
return GSW_HAL_ARG_INVALID;
}
@@ -641,10 +554,10 @@
status = _mdapi_sms_get_msg_num((char *)msg, char_set, &msg_num, &pdu_msg_len);
}
- LOGE("%s, %s, %d, msg_len = [%d] ,msg_num=[%d]\n", __FILE__, __FUNCTION__, __LINE__, msg_len, msg_num);
+ LOGE(GSW_SMS,"%s, %s, %d, msg_len = [%d] ,msg_num=[%d]\n", __FILE__, __FUNCTION__, __LINE__, msg_len, msg_num);
if(status == MDAPI_RET_ERROR)
{
- LOGE("get message number failed\n");
+ LOGE(GSW_SMS,"get message number failed\n");
//return GSW_HAL_NORMAL_FAIL;
}
else
@@ -653,7 +566,7 @@
pdu = (char **)malloc(sizeof(char *) * msg_num);
if(pdu == NULL)
{
- LOGE("%s, %s, %d, allocate memory for pdu failed\n", __FILE__, __FUNCTION__, __LINE__);
+ LOGE(GSW_SMS,"%s, %s, %d, allocate memory for pdu failed\n", __FILE__, __FUNCTION__, __LINE__);
return GSW_HAL_NORMAL_FAIL;
}
@@ -671,13 +584,13 @@
}
free(pdu);
pdu = NULL;
- LOGE("%s, %s, %d, allocate memory for pdu[%d] failed\n", __FILE__, __FUNCTION__, __LINE__,index);
+ LOGE(GSW_SMS,"%s, %s, %d, allocate memory for pdu[%d] failed\n", __FILE__, __FUNCTION__, __LINE__,index);
return GSW_HAL_NORMAL_FAIL;
}
else
{
memset(pdu[index], 0, MAX_PDU_SIZE);
- LOGE("%s, %s, %d, pdu[%d} init value is: %s \n", __FILE__, __FUNCTION__, __LINE__, index, pdu[index]);
+ LOGE(GSW_SMS,"%s, %s, %d, pdu[%d} init value is: %s \n", __FILE__, __FUNCTION__, __LINE__, index, pdu[index]);
}
}
}
@@ -699,23 +612,23 @@
char pdu_data[MAX_PDU_SIZE] = {0};
char *p = pdu_data;
- LOGE("index:%d\n",index);
- LOGE("%s, %s, %d, smscPDU: %s, pdu: %s",__FILE__, __FUNCTION__, __LINE__, smscPDU, pdu[index]);
+ LOGE(GSW_SMS,"index:%d\n",index);
+ LOGE(GSW_SMS,"%s, %s, %d, smscPDU: %s, pdu: %s",__FILE__, __FUNCTION__, __LINE__, smscPDU, pdu[index]);
sprintf(p, "%s",smscPDU);
- LOGE("pdu_data:%s\n", pdu_data);
+ LOGE(GSW_SMS,"pdu_data:%s\n", pdu_data);
int sc = strlen(pdu_data);
sprintf(p+strlen(p), "%s", pdu[index]);
- LOGE("pdu_data:%s\n", pdu_data);
+ LOGE(GSW_SMS,"pdu_data:%s\n", pdu_data);
int t = strlen(pdu_data);
sprintf(cmgs, "%d,%s", (t-sc)/2, pdu_data);
- LOGE("cmgs:%s\n", cmgs);
+ LOGE(GSW_SMS,"cmgs:%s\n", cmgs);
memset(resp, 0, sizeof(resp));
err = mbtk_sms_cmgf_set(sms_info_handle, 0);
if(err)
{
- LOGE("cmgf set error : %d\n", err);
+ LOGE(GSW_SMS,"cmgf set error : %d\n", err);
for(index = 0; index < msg_num; index++){
free(pdu[index]);
pdu[index] = NULL;
@@ -726,13 +639,13 @@
}
else
{
- LOGD("cmgf set success\n");
+ LOGD(GSW_SMS,"cmgf set success\n");
}
err = mbtk_sms_cmgs_set(sms_info_handle, cmgs, resp);
if(err)
{
- LOGE("cmgs send fail\n");
+ LOGE(GSW_SMS,"cmgs send fail\n");
for(index = 0; index < msg_num; index++){
free(pdu[index]);
pdu[index] = NULL;
@@ -743,7 +656,7 @@
}
else
{
- LOGD("cmgs send success, resp:%s\n", resp);
+ LOGD(GSW_SMS,"cmgs send success, resp:%s\n", resp);
}
}
@@ -781,14 +694,14 @@
if(smsc == NULL || len <= 0)
{
- LOGE("smsc is null or len = %d\n",len);
+ LOGE(GSW_SMS,"smsc is null or len = %d\n",len);
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);
+ LOGE(GSW_SMS,"gsw_get_smsc_address Error : %d\n", ret);
return GSW_HAL_NORMAL_FAIL;
}
@@ -802,7 +715,7 @@
substr = malloc(len_t + 1);
if (NULL == substr)
{
- LOGE("substr = NULL, malloc faill!!!\n");
+ LOGE(GSW_SMS,"substr = NULL, malloc faill!!!\n");
return GSW_HAL_NO_MEMORY;
}
strncpy(substr, p1 + 1, len_t);
@@ -810,13 +723,13 @@
memcpy(smsc, substr, strlen(substr));
memcpy(sms_center_address, substr, strlen(substr));
- LOGE("qser_sms_getsmscenteraddress success, smsc = %s\n", sms_center_address);
+ LOGE(GSW_SMS,"qser_sms_getsmscenteraddress success, smsc = %s\n", sms_center_address);
free(substr);
substr = NULL;
}
else
{
- LOGE("String inside double quotes not found\n");
+ LOGE(GSW_SMS,"String inside double quotes not found\n");
return GSW_HAL_NORMAL_FAIL;
}
}
@@ -842,7 +755,7 @@
if(smsc == NULL || strlen((char *)smsc) == 0)
{
- LOGE("smsc is null or empty\n");
+ LOGE(GSW_SMS,"smsc is null or empty\n");
return GSW_HAL_ARG_INVALID;
}
@@ -850,11 +763,11 @@
if(ret == 0)
{
- LOGE("set smsc success,smsc = %s\n",smsc);
+ LOGE(GSW_SMS,"set smsc success,smsc = %s\n",smsc);
}
else
{
- LOGE("set smsc fail,ret = %d\n", ret);
+ LOGE(GSW_SMS,"set smsc fail,ret = %d\n", ret);
return GSW_HAL_NORMAL_FAIL;
}