Fix warning as error for V2
Change-Id: I70cfd971fda629011ba1be84fef15afea196d393
diff --git a/mbtk/mbtk_rild_v2/src/ril_sms.c b/mbtk/mbtk_rild_v2/src/ril_sms.c
index 081ad01..c2c87d6 100755
--- a/mbtk/mbtk_rild_v2/src/ril_sms.c
+++ b/mbtk/mbtk_rild_v2/src/ril_sms.c
@@ -29,7 +29,7 @@
static int req_cmgf_get(int *state, int *cme_err)
{
ATResponse *response = NULL;
- char *tmp_ptr = NULL;
+// char *tmp_ptr = NULL;
int err = at_send_command_singleline("AT+CMGF?", "", &response);
if (err < 0 || response->success == 0 || !response->p_intermediates){
@@ -63,8 +63,8 @@
*/
static int req_cmgf_set(int state, int *cme_err)
{
- printf("req_cmgf_set()-------------start\n");
- printf("state:%d\n",state);
+ LOGD("req_cmgf_set()-------------start");
+ LOGD("state:%d",state);
ATResponse *response = NULL;
char cmd[30] = {0};
if(state)
@@ -76,7 +76,7 @@
strcpy(cmd, "AT+CMGF=0");
}
- printf("req_cmgf_set()----cmd:%s\n", cmd);
+ LOGD("req_cmgf_set()----cmd:%s", cmd);
int err = at_send_command(cmd, &response);
if (err < 0 || response->success == 0) {
@@ -127,7 +127,7 @@
{
printf("req_cpms_get------------start(3)\n");
ATResponse *response = NULL;
- char *tmp_ptr = NULL;
+// char *tmp_ptr = NULL;
int err = at_send_command_singleline("AT+CPMS?", "", &response);
if (err < 0 || response->success == 0 || !response->p_intermediates){
@@ -226,15 +226,15 @@
*/
static int req_cmgs_set(char *cmgs, char *reg, int len, int *cme_err)
{
- printf("req_cmgs_set()----------------start\n");
- printf("cmgs:%s\n", cmgs);
+ LOGD("req_cmgs_set()----------------start");
+ LOGD("cmgs:%s", cmgs);
ATResponse *response = NULL;
char cmd[30] = {0};
char data[218] = {0};
char pnum[20] = {0};
char *ptr = cmgs;
int err = 0;
- int data_len = 0;
+// int data_len = 0;
char *src = strstr(cmgs, ",");
if(src != NULL)
@@ -249,14 +249,21 @@
memcpy(data, src, data_len);
//LOG("[XIAORUI]req_cmgs_set()----------------data %s",data);
}
+ else
+ {
+ LOGD("cmgs param is error");
+ return -1;
+ }
+ LOGD("num:%s", pnum);
+ LOGD("data:%s", data);
sprintf(cmd, "AT+CMGS=%s", pnum);
- LOG("cmd:%s,data:%s---------", cmd,data);
+ LOGD("cmd:%s", cmd);
if(strlen(cmd) > 0)
{
int err = at_send_command_sms(cmd, data, "+CMGS: ", &response);
- printf("err:%d, response:%d\n", err, response->success);
+ LOGD("err:%d, response:%d", err, response->success);
if (err < 0 || response->success == 0) {
*cme_err = at_get_cme_error(response);
@@ -265,7 +272,7 @@
char *line;
line = response->p_intermediates->line;
memcpy(reg, line, strlen(line));
- printf("line:%s\n", line);
+ LOGD("line:%s", line);
}
err = 0;
@@ -328,10 +335,10 @@
printf("0req_cmgd_set()--------------start\n");
printf("cmgd:%s\n", cmgd);
ATResponse *response = NULL;
- char cmd[30] = {0};
+ char cmd[500] = {0};
char data[218] = {0};
- char pnum[13] = {0};
- char *ptr = cmgd;
+// char pnum[13] = {0};
+// char *ptr = cmgd;
int err = 0;
memcpy(data, cmgd, len );
@@ -368,7 +375,7 @@
static int req_cmgd_get(char *reg, int *cme_err)
{
ATResponse *response = NULL;
- char *tmp_ptr = NULL;
+// char *tmp_ptr = NULL;
int err = at_send_command_singleline("AT+CMGD=?", "+CMGD:", &response);
if (err < 0 || response->success == 0 || !response->p_intermediates){
@@ -424,7 +431,7 @@
int s_index = 0, g_index = 0;
bool index_flag = false;
char *ptr_index = index_data;
- char phone[50];
+// char phone[50];
char number[5] = {0};
int err = 0;
@@ -512,8 +519,8 @@
if(index_flag)
{
- memset(reg, 0, sizeof(reg));
- memcpy(reg, ptr_index, strlen(ptr_index) );
+ // memset(reg, 0, sizeof(reg));
+ memcpy(reg, ptr_index, strlen(ptr_index) + 1);
}
err = 0;
exit:
@@ -530,7 +537,7 @@
static int req_csca_get(char *req, int *cme_err)
{
ATResponse *response = NULL;
- char *tmp_ptr = NULL;
+// char *tmp_ptr = NULL;
int err = at_send_command_singleline("AT+CSCA?", "", &response);
if (err < 0 || response->success == 0 || !response->p_intermediates){
@@ -563,10 +570,10 @@
printf("req_csca_set()--------------start\n");
printf("csca:%s\n", csca);
ATResponse *response = NULL;
- char cmd[30] = {0};
+ char cmd[500] = {0};
char data[218] = {0};
- char pnum[13] = {0};
- char *ptr = csca;
+// char pnum[13] = {0};
+// char *ptr = csca;
int err = 0;
memcpy(data, csca, len);
@@ -596,10 +603,10 @@
printf("req_csmp_set()-------------------start\n");
printf("csmp:%s\n", csmp);
ATResponse *response = NULL;
- char cmd[30] = {0};
+ char cmd[500] = {0};
char data[218] = {0};
- char pnum[13] = {0};
- char *ptr = csmp;
+// char pnum[13] = {0};
+// char *ptr = csmp;
int err = 0;
memcpy(data, csmp, len);
@@ -631,8 +638,8 @@
ATResponse *response = NULL;
char cmd[30] = {0};
char data[218] = {0};
- char pnum[13] = {0};
- char *ptr = cscb;
+// char pnum[13] = {0};
+// char *ptr = cscb;
int err = 0;
memcpy(data, cscb, len);
@@ -839,7 +846,7 @@
{
if(pack->data_len == 0 || pack->data == NULL) // SET at+cnmi=1,2.
{
- int state;
+// int state;
if(req_cnmi_set(&cme_err) || cme_err != MBTK_RIL_ERR_CME_NON)
{
if(cme_err != MBTK_RIL_ERR_CME_NON) {