Skip to content

Commit 396297a

Browse files
mysterywolfmysterywolf
committed
[ethernetif] replace rt_memcpy with SMEMCPY
1 parent e41bb4f commit 396297a

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

‎components/net/lwip-1.4.1/src/netif/ethernetif.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,14 +201,14 @@ int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len,
201201
{
202202
return -RT_ERROR;
203203
}
204-
rt_memcpy(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
205-
rt_memcpy(&ina, &h->sin_addr, sizeof(ina));
204+
SMEMCPY(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
205+
SMEMCPY(&ina, &h->sin_addr, sizeof(ina));
206206
lwip_freeaddrinfo(res);
207207
if (inet_aton(inet_ntoa(ina), &target_addr) == 0)
208208
{
209209
return -RT_ERROR;
210210
}
211-
rt_memcpy(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
211+
SMEMCPY(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
212212

213213
/* new a socket */
214214
if ((s = lwip_socket(AF_INET, SOCK_RAW, IP_PROTO_ICMP)) < 0)
@@ -331,7 +331,7 @@ static int netdev_add(struct netif *lwip_netif)
331331
netdev->mtu = lwip_netif->mtu;
332332
netdev->ops = &lwip_netdev_ops;
333333
netdev->hwaddr_len = lwip_netif->hwaddr_len;
334-
rt_memcpy(netdev->hwaddr, lwip_netif->hwaddr, lwip_netif->hwaddr_len);
334+
SMEMCPY(netdev->hwaddr, lwip_netif->hwaddr, lwip_netif->hwaddr_len);
335335
netdev->ip_addr = lwip_netif->ip_addr;
336336
netdev->gw = lwip_netif->gw;
337337
netdev->netmask = lwip_netif->netmask;

‎components/net/lwip-2.0.2/src/netif/ethernetif.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,14 +210,14 @@ int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len,
210210
{
211211
return -RT_ERROR;
212212
}
213-
rt_memcpy(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
214-
rt_memcpy(&ina, &h->sin_addr, sizeof(ina));
213+
SMEMCPY(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
214+
SMEMCPY(&ina, &h->sin_addr, sizeof(ina));
215215
lwip_freeaddrinfo(res);
216216
if (inet_aton(inet_ntoa(ina), &target_addr) == 0)
217217
{
218218
return -RT_ERROR;
219219
}
220-
rt_memcpy(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
220+
SMEMCPY(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
221221

222222
/* new a socket */
223223
if ((s = lwip_socket(AF_INET, SOCK_RAW, IP_PROTO_ICMP)) < 0)
@@ -340,7 +340,7 @@ static int netdev_add(struct netif *lwip_netif)
340340
netdev->mtu = lwip_netif->mtu;
341341
netdev->ops = &lwip_netdev_ops;
342342
netdev->hwaddr_len = lwip_netif->hwaddr_len;
343-
rt_memcpy(netdev->hwaddr, lwip_netif->hwaddr, lwip_netif->hwaddr_len);
343+
SMEMCPY(netdev->hwaddr, lwip_netif->hwaddr, lwip_netif->hwaddr_len);
344344
netdev->ip_addr = lwip_netif->ip_addr;
345345
netdev->gw = lwip_netif->gw;
346346
netdev->netmask = lwip_netif->netmask;

‎components/net/lwip-2.0.3/src/netif/ethernetif.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,14 +210,14 @@ int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len,
210210
{
211211
return -RT_ERROR;
212212
}
213-
rt_memcpy(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
214-
rt_memcpy(&ina, &h->sin_addr, sizeof(ina));
213+
SMEMCPY(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
214+
SMEMCPY(&ina, &h->sin_addr, sizeof(ina));
215215
lwip_freeaddrinfo(res);
216216
if (inet_aton(inet_ntoa(ina), &target_addr) == 0)
217217
{
218218
return -RT_ERROR;
219219
}
220-
rt_memcpy(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
220+
SMEMCPY(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
221221

222222
/* new a socket */
223223
if ((s = lwip_socket(AF_INET, SOCK_RAW, IP_PROTO_ICMP)) < 0)
@@ -340,7 +340,7 @@ static int netdev_add(struct netif *lwip_netif)
340340
netdev->mtu = lwip_netif->mtu;
341341
netdev->ops = &lwip_netdev_ops;
342342
netdev->hwaddr_len = lwip_netif->hwaddr_len;
343-
rt_memcpy(netdev->hwaddr, lwip_netif->hwaddr, lwip_netif->hwaddr_len);
343+
SMEMCPY(netdev->hwaddr, lwip_netif->hwaddr, lwip_netif->hwaddr_len);
344344
netdev->ip_addr = lwip_netif->ip_addr;
345345
netdev->gw = lwip_netif->gw;
346346
netdev->netmask = lwip_netif->netmask;

‎components/net/lwip-2.1.2/src/netif/ethernetif.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,14 +208,14 @@ int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len,
208208
{
209209
return -RT_ERROR;
210210
}
211-
rt_memcpy(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
212-
rt_memcpy(&ina, &h->sin_addr, sizeof(ina));
211+
SMEMCPY(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
212+
SMEMCPY(&ina, &h->sin_addr, sizeof(ina));
213213
lwip_freeaddrinfo(res);
214214
if (inet_aton(inet_ntoa(ina), &target_addr) == 0)
215215
{
216216
return -RT_ERROR;
217217
}
218-
rt_memcpy(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
218+
SMEMCPY(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
219219

220220
/* new a socket */
221221
if ((s = lwip_socket(AF_INET, SOCK_RAW, IP_PROTO_ICMP)) < 0)
@@ -338,7 +338,7 @@ static int netdev_add(struct netif *lwip_netif)
338338
netdev->mtu = lwip_netif->mtu;
339339
netdev->ops = &lwip_netdev_ops;
340340
netdev->hwaddr_len = lwip_netif->hwaddr_len;
341-
rt_memcpy(netdev->hwaddr, lwip_netif->hwaddr, lwip_netif->hwaddr_len);
341+
SMEMCPY(netdev->hwaddr, lwip_netif->hwaddr, lwip_netif->hwaddr_len);
342342
netdev->ip_addr = lwip_netif->ip_addr;
343343
netdev->gw = lwip_netif->gw;
344344
netdev->netmask = lwip_netif->netmask;

0 commit comments

Comments
 (0)