Merge pull request #86 from mysterywolf/master

memcpy改为rt_memcpy
RT-Thread-packages · Jan 12, 2022 · 1d36bfb · 1d36bfb
2 parents 686a3ad + 3ad722c
commit 1d36bfb
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/inc/webclient.h b/inc/webclient.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *

diff --git a/samples/webclient_get_sample.c b/samples/webclient_get_sample.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -78,7 +78,7 @@ static int webclient_get_comm(const char *uri)
 
         do
         {
-            bytes_read = webclient_read(session, (void *)buffer, 
+            bytes_read = webclient_read(session, (void *)buffer,
                     content_length - content_pos > GET_RESP_BUFSZ ?
                             GET_RESP_BUFSZ : content_length - content_pos);
             if (bytes_read <= 0)
@@ -131,7 +131,7 @@ static int webclient_get_smpl(const char *uri)
         rt_kprintf("%c", response[index]);
     }
     rt_kprintf("\n");
-    
+
     if (response)
     {
         web_free(response);
@@ -202,7 +202,7 @@ int webclient_get_test(int argc, char **argv)
     {
         web_free(uri);
     }
-    
+
     return RT_EOK;
 }
 

diff --git a/samples/webclient_post_sample.c b/samples/webclient_post_sample.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -183,7 +183,7 @@ int webclient_post_test(int argc, char **argv)
         rt_kprintf("web_post_test -s [uri]  - webclient simplify post request test.\n");
         return -RT_ERROR;
     }
-    
+
     if (uri)
     {
         web_free(uri);

diff --git a/samples/webclient_shard_download_sample.c b/samples/webclient_shard_download_sample.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *

diff --git a/src/webclient.c b/src/webclient.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2019, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -216,11 +216,11 @@ static int webclient_resolve_address(struct webclient_session *session, struct a
     port_ptr = rt_strstr(host_addr + host_addr_len, ":");
     if (port_ptr && (!path_ptr || (port_ptr < path_ptr)))
     {
-        if (!path_ptr) 
+        if (!path_ptr)
         {
             rt_strcpy(port_str, port_ptr + 1);
         }
-        else 
+        else
         {
             int port_len = path_ptr - port_ptr - 1;
             rt_strncpy(port_str, port_ptr + 1, port_len);
@@ -270,7 +270,7 @@ static int webclient_resolve_address(struct webclient_session *session, struct a
             goto __exit;
         }
 
-        memcpy(host_addr_new, host_addr, host_addr_len);
+        rt_memcpy(host_addr_new, host_addr, host_addr_len);
         host_addr_new[host_addr_len] = '\0';
         session->host = host_addr_new;
     }

diff --git a/src/webclient_file.c b/src/webclient_file.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *