Skip to content

Commit c95b77a

Browse files
xiangxistuxiangxistu
authored
Merge pull request #88 from mysterywolf/master
使用rt_xxx替换
2 parents 38d3aab + 0e58af0 commit c95b77a

11 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎iperf/iperf.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static void iperf_udp_client(void *thread_param)
5151
{
5252
return;
5353
}
54-
memset(buffer, 0x00, IPERF_BUFSZ);
54+
rt_memset(buffer, 0x00, IPERF_BUFSZ);
5555
sock = socket(PF_INET, SOCK_DGRAM, 0);
5656
if(sock < 0)
5757
{
@@ -286,7 +286,7 @@ void iperf_server(void *thread_param)
286286
server_addr.sin_family = AF_INET;
287287
server_addr.sin_port = htons(param.port);
288288
server_addr.sin_addr.s_addr = INADDR_ANY;
289-
memset(&(server_addr.sin_zero), 0x0, sizeof(server_addr.sin_zero));
289+
rt_memset(&(server_addr.sin_zero), 0x0, sizeof(server_addr.sin_zero));
290290

291291
if (bind(sock, (struct sockaddr *)&server_addr, sizeof(struct sockaddr)) == -1)
292292
{

‎ntp/ntp.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ static rt_bool_t ntp_check_network(void)
410410
{
411411
#ifdef RT_USING_NETDEV
412412
struct netdev * netdev = netdev_get_by_family(AF_INET);
413-
return (netdev && netdev_is_link_up(netdev));
413+
return (netdev && netdev_is_link_up(netdev));
414414
#else
415415
return RT_TRUE;
416416
#endif

‎ping/ping.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006-2021, RT-Thread Development Team
2+
* Copyright (c) 2006-2022, RT-Thread Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -161,15 +161,15 @@ rt_err_t ping(char* target_name, rt_uint32_t times, rt_size_t size)
161161
size = PING_DATA_SIZE;
162162
}
163163

164-
memset(&hint, 0, sizeof(hint));
164+
rt_memset(&hint, 0, sizeof(hint));
165165
/* convert URL to IP */
166166
if (lwip_getaddrinfo(target_name, NULL, &hint, &res) != 0)
167167
{
168168
rt_kprintf("ping: unknown host %s\n", target_name);
169169
return -RT_ERROR;
170170
}
171-
memcpy(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
172-
memcpy(&ina, &h->sin_addr, sizeof(ina));
171+
rt_memcpy(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
172+
rt_memcpy(&ina, &h->sin_addr, sizeof(ina));
173173
lwip_freeaddrinfo(res);
174174
if (inet_aton(inet_ntoa(ina), &target_addr) == 0)
175175
{

‎tcpdump/tcpdump.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006-2021, RT-Thread Development Team
2+
* Copyright (c) 2006-2022, RT-Thread Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*

‎telnet/telnet.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006-2021, RT-Thread Development Team
2+
* Copyright (c) 2006-2022, RT-Thread Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -325,10 +325,10 @@ static void telnet_thread(void* parameter)
325325
}
326326

327327
if(setsockopt(telnet->server_fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&keepalive, sizeof(keepalive)) < 0)
328-
{
328+
{
329329
rt_kprintf("telnet:set socket keepalive failed\n");
330330
return;
331-
}
331+
}
332332

333333
addr.sin_family = AF_INET;
334334
addr.sin_port = htons(TELNET_PORT);

‎tftp/tftp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006-2021, RT-Thread Development Team
2+
* Copyright (c) 2006-2022, RT-Thread Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*

‎tftp/tftp_client.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006-2021, RT-Thread Development Team
2+
* Copyright (c) 2006-2022, RT-Thread Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*

‎tftp/tftp_port.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006-2021, RT-Thread Development Team
2+
* Copyright (c) 2006-2022, RT-Thread Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*

‎tftp/tftp_server.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006-2021, RT-Thread Development Team
2+
* Copyright (c) 2006-2022, RT-Thread Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -114,7 +114,7 @@ static struct tftp_client_xfer *tftp_client_xfer_add(struct tftp_server *server,
114114
{
115115
if (_private->client_table[i].xfer == NULL)
116116
{
117-
memset(&_private->client_table[i], 0, sizeof(struct tftp_client_xfer));
117+
rt_memset(&_private->client_table[i], 0, sizeof(struct tftp_client_xfer));
118118
_private->client_table[i].xfer = xfer;
119119
return &_private->client_table[i];
120120
}
@@ -342,7 +342,7 @@ static struct tftp_client_xfer *tftp_server_request_handle(struct tftp_server *s
342342

343343
_private = server->_private;
344344
/* Receiving client requests */
345-
memset(packet, 0, sizeof(struct tftp_packet));
345+
rt_memset(packet, 0, sizeof(struct tftp_packet));
346346
xfer = tftp_recv_request(_private->server_xfer, packet);
347347
if (xfer == NULL)
348348
{
@@ -550,7 +550,7 @@ struct tftp_server *tftp_server_create(const char *root_name, int port)
550550
return NULL;
551551
}
552552
/* init server object */
553-
memset(server, 0, mem_len);
553+
rt_memset(server, 0, mem_len);
554554
server->root_name = strdup(root_name);
555555
if (server->root_name == NULL)
556556
{
@@ -567,7 +567,7 @@ struct tftp_server *tftp_server_create(const char *root_name, int port)
567567
free(server);
568568
return NULL;
569569
}
570-
memset(_private->client_table, 0, mem_len);
570+
rt_memset(_private->client_table, 0, mem_len);
571571
_private->table_num = TFTP_SERVER_CONNECT_MAX;
572572
return server;
573573
}

‎tftp/tftp_xfer.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006-2021, RT-Thread Development Team
2+
* Copyright (c) 2006-2022, RT-Thread Development Team
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -202,7 +202,7 @@ int tftp_send_request(struct tftp_xfer *xfer, uint16_t cmd, const char *remote_f
202202
}
203203
/* Packing request packet header */
204204
send_packet->cmd = htons(cmd);
205-
size = sprintf(send_packet->info.filename, "%s%c%s%c%s%c%d%c%s%c%d%c",
205+
size = rt_sprintf(send_packet->info.filename, "%s%c%s%c%s%c%d%c%s%c%d%c",
206206
remote_file, 0, xfer->mode, 0, "blksize", 0, xfer->blksize, 0,"tsize", 0, 0, 0) + 2;
207207
/* send data */
208208
r_size = sendto(xfer->sock, send_packet, size, 0,
@@ -233,7 +233,7 @@ struct tftp_xfer *tftp_recv_request(struct tftp_xfer *xfer, struct tftp_packet *
233233

234234
/* get packet size */
235235
mem_size = sizeof(struct tftp_packet);
236-
memset(packet, 0, mem_size);
236+
rt_memset(packet, 0, mem_size);
237237
/* Receiving raw data */
238238
size = tftp_recv_raw_data(xfer, packet, mem_size);
239239
if (size > 0)
@@ -248,7 +248,7 @@ struct tftp_xfer *tftp_recv_request(struct tftp_xfer *xfer, struct tftp_packet *
248248
if (client_xfer != NULL)
249249
{
250250
struct tftp_xfer_private *_client_private = client_xfer->_private;
251-
memcpy(&_client_private->sender, &_private->sender, sizeof(struct sockaddr_in));
251+
rt_memcpy(&_client_private->sender, &_private->sender, sizeof(struct sockaddr_in));
252252
}
253253
if (ntohs(packet->cmd) == TFTP_CMD_RRQ)
254254
{
@@ -343,7 +343,7 @@ struct tftp_xfer *tftp_xfer_create(const char *ip_addr, int port)
343343
tftp_printf("can't create tftp transfer!! exit\n");
344344
return NULL;
345345
}
346-
memset(xfer, 0, mem_len);
346+
rt_memset(xfer, 0, mem_len);
347347
_private = (struct tftp_xfer_private *)&xfer[1];
348348

349349
/* create socket */

0 commit comments

Comments
 (0)