From f89a162ea3be6536c340c0010aab41cffe9bfac9 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Thu, 30 Dec 2021 19:38:20 -0500 Subject: [core] 使用rt_memcpy rt_memset代替memcpy memset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/net/at/at_socket/at_socket.c | 8 ++++---- components/net/at/src/at_cli.c | 10 +++++----- components/net/at/src/at_server.c | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'components/net/at') diff --git a/components/net/at/at_socket/at_socket.c b/components/net/at/at_socket/at_socket.c index ef6baee8c5..4a44245b48 100644 --- a/components/net/at/at_socket/at_socket.c +++ b/components/net/at/at_socket/at_socket.c @@ -173,7 +173,7 @@ static size_t at_recvpkt_get(rt_slist_t *rlist, char *mem, size_t len) if (page_pos >= len - content_pos) { - memcpy((char *) mem + content_pos, pkt->buff + pkt->bfsz_index, len - content_pos); + rt_memcpy((char *) mem + content_pos, pkt->buff + pkt->bfsz_index, len - content_pos); pkt->bfsz_index += len - content_pos; if (pkt->bfsz_index == pkt->bfsz_totle) { @@ -184,7 +184,7 @@ static size_t at_recvpkt_get(rt_slist_t *rlist, char *mem, size_t len) } else { - memcpy((char *) mem + content_pos, pkt->buff + pkt->bfsz_index, page_pos); + rt_memcpy((char *) mem + content_pos, pkt->buff + pkt->bfsz_index, page_pos); content_pos += page_pos; pkt->bfsz_index += page_pos; at_recvpkt_node_delete(rlist, node); @@ -1288,7 +1288,7 @@ int at_getaddrinfo(const char *nodename, const char *servname, { return EAI_MEMORY; } - memset(ai, 0, total_size); + rt_memset(ai, 0, total_size); /* cast through void* to get rid of alignment warnings */ sa = (struct sockaddr_storage *) (void *) ((uint8_t *) ai + sizeof(struct addrinfo)); struct sockaddr_in *sa4 = (struct sockaddr_in *) sa; @@ -1317,7 +1317,7 @@ int at_getaddrinfo(const char *nodename, const char *servname, { /* copy nodename to canonname if specified */ ai->ai_canonname = ((char *) ai + sizeof(struct addrinfo) + sizeof(struct sockaddr_storage)); - memcpy(ai->ai_canonname, nodename, namelen); + rt_memcpy(ai->ai_canonname, nodename, namelen); ai->ai_canonname[namelen] = 0; } ai->ai_addrlen = sizeof(struct sockaddr_storage); diff --git a/components/net/at/src/at_cli.c b/components/net/at/src/at_cli.c index d51358d863..5ff7880eee 100644 --- a/components/net/at/src/at_cli.c +++ b/components/net/at/src/at_cli.c @@ -123,14 +123,14 @@ static void server_cli_parser(void) device_bak = server->device; getchar_bak = server->get_char; - memset(endmark_back, 0x00, AT_END_MARK_LEN); - memcpy(endmark_back, server->end_mark, strlen(server->end_mark)); + rt_memset(endmark_back, 0x00, AT_END_MARK_LEN); + rt_memcpy(endmark_back, server->end_mark, strlen(server->end_mark)); /* setup server device as console device */ server->device = rt_console_get_device(); server->get_char = at_server_console_getchar; - memset(server->end_mark, 0x00, AT_END_MARK_LEN); + rt_memset(server->end_mark, 0x00, AT_END_MARK_LEN); server->end_mark[0] = '\r'; rt_hw_interrupt_enable(int_lvl); @@ -154,8 +154,8 @@ static void server_cli_parser(void) server->device = device_bak; server->get_char = getchar_bak; - memset(server->end_mark, 0x00, AT_END_MARK_LEN); - memcpy(server->end_mark, endmark_back, strlen(endmark_back)); + rt_memset(server->end_mark, 0x00, AT_END_MARK_LEN); + rt_memcpy(server->end_mark, endmark_back, strlen(endmark_back)); rt_hw_interrupt_enable(int_lvl); } diff --git a/components/net/at/src/at_server.c b/components/net/at/src/at_server.c index 1db26a260b..5d6a63fd98 100644 --- a/components/net/at/src/at_server.c +++ b/components/net/at/src/at_server.c @@ -406,7 +406,7 @@ static rt_err_t at_cmd_get_name(const char *cmd_buffer, char *cmd_name) || (*(cmd_buffer + i) >= AT_CMD_CHAR_0 && *(cmd_buffer + i) <= AT_CMD_CHAR_9)) { cmd_name_len = i; - memcpy(cmd_name, cmd_buffer, cmd_name_len); + rt_memcpy(cmd_name, cmd_buffer, cmd_name_len); *(cmd_name + cmd_name_len) = '\0'; return RT_EOK; @@ -508,7 +508,7 @@ static void server_parser(at_server_t server) } __retry: - memset(server->recv_buffer, 0x00, AT_SERVER_RECV_BUFF_LEN); + rt_memset(server->recv_buffer, 0x00, AT_SERVER_RECV_BUFF_LEN); server->cur_recv_len = 0; } } @@ -564,7 +564,7 @@ int at_server_init(void) at_server_local->echo_mode = 1; at_server_local->status = AT_STATUS_UNINITIALIZED; - memset(at_server_local->recv_buffer, 0x00, AT_SERVER_RECV_BUFF_LEN); + rt_memset(at_server_local->recv_buffer, 0x00, AT_SERVER_RECV_BUFF_LEN); at_server_local->cur_recv_len = 0; at_server_local->rx_notice = rt_sem_create("at_svr", 0, RT_IPC_FLAG_FIFO); @@ -600,7 +600,7 @@ int at_server_init(void) } at_server_local->get_char = at_server_getchar; - memcpy(at_server_local->end_mark, AT_CMD_END_MARK, sizeof(AT_CMD_END_MARK)); + rt_memcpy(at_server_local->end_mark, AT_CMD_END_MARK, sizeof(AT_CMD_END_MARK)); at_server_local->parser_entry = server_parser; at_server_local->parser = rt_thread_create("at_svr", -- cgit v1.3.1