Przeglądaj źródła

【修复】GCC 编译警告

Signed-off-by: MurphyZhao <d2014zjt@163.com>
MurphyZhao 7 lat temu
rodzic
commit
c44481356d
2 zmienionych plików z 5 dodań i 9 usunięć
  1. 3 5
      samples/mqtt/mqtt-example.c
  2. 2 4
      samples/ota/ota_mqtt-example.c

+ 3 - 5
samples/mqtt/mqtt-example.c

@@ -97,8 +97,7 @@ static void   *pclient;
 
 static uint8_t is_running = 0;
 
-#if !defined(__GNUC__)
-static char* strlwr(char *str)
+static char* rt_strlwr(char *str)
  {
     if(str == NULL)
         return NULL;
@@ -112,7 +111,6 @@ static char* strlwr(char *str)
     }
     return str;
 }
-#endif
 
 static void event_handle(void *pcontext, void *pclient, iotx_mqtt_event_msg_pt msg)
 {
@@ -267,7 +265,7 @@ static void mqtt_client(void)
     mqtt_params.handle_event.pcontext = NULL;
 
     /* Convert uppercase letters in host to lowercase */
-	rt_kprintf("host: %s\r\n", strlwr((char*)mqtt_params.host));
+	rt_kprintf("host: %s\r\n", rt_strlwr((char*)mqtt_params.host));
 
     /* Construct a MQTT client with specify parameter */
     pclient = IOT_MQTT_Construct(&mqtt_params);
@@ -632,7 +630,7 @@ static int ali_mqtt_main(int argc, char **argv)
     {
         if (!strcmp("pub", argv[1]))
         {
-            user_param = strdup(argv[2]);
+            user_param = (char*)rt_strdup((const char*)argv[2]);
             HAL_Printf("param:%s\n", user_param);
 
             // publish

+ 2 - 4
samples/ota/ota_mqtt-example.c

@@ -85,8 +85,7 @@ static char g_ota_version[64] = "iotx_ver_1.0.0";
 static int      user_argc;
 static uint8_t is_running = 0;
 
-#if !defined(__GNUC__)
-static char* strlwr(char *str)
+static char* rt_strlwr(char *str)
  {
     if(str == NULL)
         return NULL;
@@ -100,7 +99,6 @@ static char* strlwr(char *str)
     }
     return str;
 }
-#endif
 
 static void event_handle(void *pcontext, void *pclient, iotx_mqtt_event_msg_pt msg)
 {
@@ -228,7 +226,7 @@ static int mqtt_client(void)
     mqtt_params.handle_event.pcontext = NULL;
 
     /* Convert uppercase letters in host to lowercase */
-	EXAMPLE_TRACE("host: %s", strlwr((char*)mqtt_params.host));
+	EXAMPLE_TRACE("host: %s", rt_strlwr((char*)mqtt_params.host));
 
     /* Construct a MQTT client with specify parameter */
     pclient = IOT_MQTT_Construct(&mqtt_params);