From 205e8f581e25b7ab25d4eebff02f2738c61cc690 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Tue, 11 Jan 2022 18:36:35 -0500 Subject: [PATCH 1/2] format codes --- inc/webclient.h | 2 +- samples/webclient_get_sample.c | 8 ++++---- samples/webclient_post_sample.c | 4 ++-- samples/webclient_shard_download_sample.c | 2 +- src/webclient.c | 6 +++--- src/webclient_file.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/inc/webclient.h b/inc/webclient.h index cc047c5..85e0ac0 100644 --- 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 index 8185229..f175381 100644 --- 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 index a5e7711..af2b77a 100644 --- 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 index e9b5def..8fd8540 100644 --- 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 index 3b12a8a..4124263 100644 --- 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); diff --git a/src/webclient_file.c b/src/webclient_file.c index f8db2e0..b8cf86a 100644 --- 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 * From 3ad722c77e19da989db1767fba8b29d923cf6e51 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Tue, 11 Jan 2022 18:40:56 -0500 Subject: [PATCH 2/2] =?UTF-8?q?memcpy=E6=94=B9=E4=B8=BArt=5Fmemcpy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/webclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webclient.c b/src/webclient.c index 4124263..b354650 100644 --- a/src/webclient.c +++ b/src/webclient.c @@ -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; }