Browse Source

【修改】部分警告修复

Signed-off-by: chenyong <1521761801@qq.com>
chenyong 6 years ago
parent
commit
406d407c7d
2 changed files with 7 additions and 5 deletions
  1. 2 1
      samples/onenet_sample.c
  2. 5 4
      src/onenet_mqtt.c

+ 2 - 1
samples/onenet_sample.c

@@ -124,7 +124,7 @@ static void onenet_cmd_rsp_cb(uint8_t *recv_data, size_t recv_size, uint8_t **re
     /* user have to malloc memory for response data */
     *resp_data = (uint8_t *) ONENET_MALLOC(strlen(res_buf));
 
-    strncpy(*resp_data, res_buf, strlen(res_buf));
+    strncpy((char *)*resp_data, res_buf, strlen(res_buf));
 
     *resp_size = strlen(res_buf);
 }
@@ -133,6 +133,7 @@ static void onenet_cmd_rsp_cb(uint8_t *recv_data, size_t recv_size, uint8_t **re
 int onenet_set_cmd_rsp(int argc, char **argv)
 {
     onenet_set_cmd_rsp_cb(onenet_cmd_rsp_cb);
+    return 0;
 }
 MSH_CMD_EXPORT(onenet_set_cmd_rsp, set cmd response function);
 

+ 5 - 4
src/onenet_mqtt.c

@@ -82,7 +82,7 @@ static void mqtt_callback(MQTTClient *c, MessageData *msg_data)
         {
             strncat(topicname, &(msg_data->topicName->lenstring.data[6]), msg_data->topicName->lenstring.len - 6);
 
-            onenet_mqtt_publish(topicname, response_buf, strlen(response_buf));
+            onenet_mqtt_publish(topicname, response_buf, strlen((const char *)response_buf));
 
             ONENET_FREE(response_buf);
 
@@ -145,9 +145,10 @@ static rt_err_t onenet_get_info(void)
     char dev_id[ONENET_INFO_DEVID_LEN] = { 0 };
     char api_key[ONENET_INFO_APIKEY_LEN] = { 0 };
     char auth_info[ONENET_INFO_AUTH_LEN] = { 0 };
-    char name[ONENET_INFO_NAME_LEN] = { 0 };
 
 #ifdef ONENET_USING_AUTO_REGISTER
+    char name[ONENET_INFO_NAME_LEN] = { 0 };
+    
     if (!onenet_port_is_registed())
     {
         if (onenet_port_get_register_info(name, auth_info) < 0)
@@ -508,8 +509,8 @@ static rt_err_t onenet_mqtt_get_bin_data(const char *str, const uint8_t *bin, in
     /* size = header(3) + json + binary length(4) + binary length +'\0' */
     *out_buff = (uint8_t *) ONENET_MALLOC(strlen(msg_str) + 3 + 4 + binlen + 1);
 
-    strncpy(&(*out_buff)[3], msg_str, strlen(msg_str));
-    *length = strlen(&(*out_buff)[3]);
+    strncpy((char *)&(*out_buff)[3], msg_str, strlen(msg_str));
+    *length = strlen((const char *)&(*out_buff)[3]);
 
     /* mqtt head and cjson length */
     (*out_buff)[0] = 0x02;