Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-12-11 12:57:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix nxstyle warning

Browse Source
This commit is contained in:
Xiang Xiao
2020-04-16 22:02:11 +08:00
committed by Gregory Nutt
parent 9131ae1f1f
commit b432ae5598
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
net/netdev/netdev_ioctl.c
View File

@@ -305,7 +305,7 @@ static void ioctl_get_ipv4addr(FAR struct sockaddr *outaddr,
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_NET_IPv4 #ifdef CONFIG_NET_IPv4
static void inline ioctl_get_ipv4broadcast(FAR struct sockaddr *outaddr, static void ioctl_get_ipv4broadcast(FAR struct sockaddr *outaddr,
in_addr_t inaddr, in_addr_t netmask) in_addr_t inaddr, in_addr_t netmask)
{ {
FAR struct sockaddr_in *dest = (FAR struct sockaddr_in *)outaddr; FAR struct sockaddr_in *dest = (FAR struct sockaddr_in *)outaddr;
@@ -378,7 +378,8 @@ static void ioctl_set_ipv4addr(FAR in_addr_t *outaddr,
static void ioctl_set_ipv6addr(FAR net_ipv6addr_t outaddr, static void ioctl_set_ipv6addr(FAR net_ipv6addr_t outaddr,
FAR const struct sockaddr_storage *inaddr) FAR const struct sockaddr_storage *inaddr)
{ {
FAR const struct sockaddr_in6 *src = (FAR const struct sockaddr_in6 *)inaddr; FAR const struct sockaddr_in6 *src =
(FAR const struct sockaddr_in6 *)inaddr;
memcpy(outaddr, src->sin6_addr.in6_u.u6_addr8, 16); memcpy(outaddr, src->sin6_addr.in6_u.u6_addr8, 16);
} }
#endif #endif
@@ -511,7 +512,7 @@ static int netdev_iee802154_ioctl(FAR struct socket *psock, int cmd,
* Name: netdev_pktradio_ioctl * Name: netdev_pktradio_ioctl
* *
* Description: * Description:
* Perform non-IEEE802.15.4 packet radio network device specific operations. * Perform non-IEEE802.15.4 packet radio network device specific operation.
* *
* Input Parameters: * Input Parameters:
* psock - Socket structure * psock - Socket structure
@@ -605,7 +606,7 @@ static int netdev_wifr_ioctl(FAR struct socket *psock, int cmd,
{ {
/* Just forward the IOCTL to the wireless driver */ /* Just forward the IOCTL to the wireless driver */
ret = dev->d_ioctl(dev, cmd, ((unsigned long)(uintptr_t)req)); ret = dev->d_ioctl(dev, cmd, (unsigned long)(uintptr_t)req);
} }
} }
@@ -1065,8 +1066,9 @@ static int netdev_ifr_ioctl(FAR struct socket *psock, int cmd,
dev = netdev_ifr_dev(req); dev = netdev_ifr_dev(req);
if (dev && dev->d_ioctl) if (dev && dev->d_ioctl)
{ {
struct mii_ioctl_notify_s *notify = &req->ifr_ifru.ifru_mii_notify; struct mii_ioctl_notify_s *notify =
ret = dev->d_ioctl(dev, cmd, ((unsigned long)(uintptr_t)notify)); &req->ifr_ifru.ifru_mii_notify;
ret = dev->d_ioctl(dev, cmd, (unsigned long)(uintptr_t)notify);
} }
} }
break; break;
@@ -1079,8 +1081,10 @@ static int netdev_ifr_ioctl(FAR struct socket *psock, int cmd,
dev = netdev_ifr_dev(req); dev = netdev_ifr_dev(req);
if (dev && dev->d_ioctl) if (dev && dev->d_ioctl)
{ {
struct mii_ioctl_data_s *mii_data = &req->ifr_ifru.ifru_mii_data; struct mii_ioctl_data_s *mii_data =
ret = dev->d_ioctl(dev, cmd, ((unsigned long)(uintptr_t)mii_data)); &req->ifr_ifru.ifru_mii_data;
ret = dev->d_ioctl(dev, cmd,
(unsigned long)(uintptr_t)mii_data);
} }
} }
break; break;
@@ -1243,9 +1247,10 @@ static int netdev_arp_ioctl(FAR struct socket *psock, int cmd,
FAR struct sockaddr_in *addr = FAR struct sockaddr_in *addr =
(FAR struct sockaddr_in *)&req->arp_pa; (FAR struct sockaddr_in *)&req->arp_pa;
/* Find the existing ARP table entry for this protocol address. */ /* Find the existing ARP entry for this protocol address. */
FAR struct arp_entry_s *entry = arp_lookup(addr->sin_addr.s_addr); FAR struct arp_entry_s *entry =
arp_lookup(addr->sin_addr.s_addr);
if (entry != NULL) if (entry != NULL)
{ {
/* The ARP table is fixed size; an entry is deleted /* The ARP table is fixed size; an entry is deleted
@@ -1613,8 +1618,6 @@ int psock_ioctl(FAR struct socket *psock, int cmd, unsigned long arg)
return -EBADF; return -EBADF;
} }
/* Execute the command. First check for a standard network IOCTL command. */
#ifdef CONFIG_NET_USRSOCK #ifdef CONFIG_NET_USRSOCK
/* Check for a USRSOCK ioctl command */ /* Check for a USRSOCK ioctl command */
@@ -1624,7 +1627,7 @@ int psock_ioctl(FAR struct socket *psock, int cmd, unsigned long arg)
{ {
/* Check for a standard network IOCTL command. */ /* Check for a standard network IOCTL command. */
ret = netdev_ifr_ioctl(psock, cmd, (FAR struct ifreq *)((uintptr_t)arg)); ret = netdev_ifr_ioctl(psock, cmd, (FAR struct ifreq *)(uintptr_t)arg);
} }
#if defined(CONFIG_NETDEV_IOCTL) && defined(CONFIG_NETDEV_WIRELESS_IOCTL) #if defined(CONFIG_NETDEV_IOCTL) && defined(CONFIG_NETDEV_WIRELESS_IOCTL)
@@ -1672,7 +1675,7 @@ int psock_ioctl(FAR struct socket *psock, int cmd, unsigned long arg)
if (ret == -ENOTTY) if (ret == -ENOTTY)
{ {
ret = netdev_imsf_ioctl(psock, cmd, ret = netdev_imsf_ioctl(psock, cmd,
(FAR struct ip_msfilter *)((uintptr_t)arg)); (FAR struct ip_msfilter *)(uintptr_t)arg);
} }
#endif #endif
@@ -1682,7 +1685,7 @@ int psock_ioctl(FAR struct socket *psock, int cmd, unsigned long arg)
if (ret == -ENOTTY) if (ret == -ENOTTY)
{ {
ret = netdev_arp_ioctl(psock, cmd, ret = netdev_arp_ioctl(psock, cmd,
(FAR struct arpreq *)((uintptr_t)arg)); (FAR struct arpreq *)(uintptr_t)arg);
} }
#endif #endif
@@ -1692,7 +1695,7 @@ int psock_ioctl(FAR struct socket *psock, int cmd, unsigned long arg)
if (ret == -ENOTTY) if (ret == -ENOTTY)
{ {
ret = netdev_rt_ioctl(psock, cmd, ret = netdev_rt_ioctl(psock, cmd,
(FAR struct rtentry *)((uintptr_t)arg)); (FAR struct rtentry *)(uintptr_t)arg);
} }
#endif #endif