You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/01/12 20:17:35 UTC
[incubator-nuttx] branch pr89 updated: net/: Run current nxstyle
against all .c files under net/. Correct new problems identified by
nxstyle. This is primarily a verification of the nxstyle changes (which all
look good). (#89)
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch pr89
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/pr89 by this push:
new 51cbc85 net/: Run current nxstyle against all .c files under net/. Correct new problems identified by nxstyle. This is primarily a verification of the nxstyle changes (which all look good). (#89)
51cbc85 is described below
commit 51cbc85535b73e8d8a71c288c49f6ff80738b707
Author: patacongo <sp...@yahoo.com>
AuthorDate: Sun Jan 12 14:17:29 2020 -0600
net/: Run current nxstyle against all .c files under net/. Correct new problems identified by nxstyle. This is primarily a verification of the nxstyle changes (which all look good). (#89)
Co-authored-by: Gregory Nutt <gn...@nuttx.org>
---
net/icmpv6/icmpv6_radvertise.c | 3 ++-
net/neighbor/neighbor_dumpentry.c | 4 ++--
net/procfs/netdev_statistics.c | 2 +-
net/sixlowpan/sixlowpan_hc1.c | 6 ++++--
net/socket/net_vfcntl.c | 6 +++---
5 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/net/icmpv6/icmpv6_radvertise.c b/net/icmpv6/icmpv6_radvertise.c
index 21466a3..bc42ff0 100644
--- a/net/icmpv6/icmpv6_radvertise.c
+++ b/net/icmpv6/icmpv6_radvertise.c
@@ -194,7 +194,8 @@ void icmpv6_radvertise(FAR struct net_driver_s *dev)
/* Set up the source address option */
srcaddr = (FAR struct icmpv6_srclladdr_s *)
- ((FAR uint8_t *)adv + sizeof(struct icmpv6_router_advertise_s));
+ ((FAR uint8_t *)adv +
+ sizeof(struct icmpv6_router_advertise_s));
srcaddr->opttype = ICMPv6_OPT_SRCLLADDR;
srcaddr->optlen = ICMPv6_OPT_OCTECTS(lladdrsize);
memcpy(srcaddr->srclladdr, &dev->d_mac, lladdrsize);
diff --git a/net/neighbor/neighbor_dumpentry.c b/net/neighbor/neighbor_dumpentry.c
index 1e38195..492651e 100644
--- a/net/neighbor/neighbor_dumpentry.c
+++ b/net/neighbor/neighbor_dumpentry.c
@@ -51,7 +51,7 @@
* Private Functions
****************************************************************************/
-/******************************************************************************
+/****************************************************************************
* Name: neighbor_dump_address
*
* Description:
@@ -64,7 +64,7 @@
* Returned Value:
* None
*
- ******************************************************************************/
+ ****************************************************************************/
static void neighbor_dump_address(FAR const void *buf, unsigned int buflen)
{
diff --git a/net/procfs/netdev_statistics.c b/net/procfs/netdev_statistics.c
index 746b6e5..1dbeddd 100644
--- a/net/procfs/netdev_statistics.c
+++ b/net/procfs/netdev_statistics.c
@@ -168,7 +168,7 @@ static int netprocfs_radio_linklayer(FAR struct netprocfs_file_s *netfile,
}
#endif
- /****************************************************************************
+ /**************************************************************************
* Name: netprocfs_linklayer
****************************************************************************/
diff --git a/net/sixlowpan/sixlowpan_hc1.c b/net/sixlowpan/sixlowpan_hc1.c
index f8bd344..f051de4 100644
--- a/net/sixlowpan/sixlowpan_hc1.c
+++ b/net/sixlowpan/sixlowpan_hc1.c
@@ -228,8 +228,10 @@ int sixlowpan_compresshdr_hc1(FAR struct radio_driver_s *radio,
hcudp[SIXLOWPAN_HC1_HC_UDP_UDP_ENCODING] = 0xe0;
hcudp[SIXLOWPAN_HC1_HC_UDP_TTL] = ipv6->ttl;
hcudp[SIXLOWPAN_HC1_HC_UDP_PORTS] =
- (uint8_t)((ntohs(udp->srcport) - CONFIG_NET_6LOWPAN_MINPORT) << 4) +
- (uint8_t)((ntohs(udp->destport) - CONFIG_NET_6LOWPAN_MINPORT));
+ (uint8_t)((ntohs(udp->srcport) -
+ CONFIG_NET_6LOWPAN_MINPORT) << 4) +
+ (uint8_t)((ntohs(udp->destport) -
+ CONFIG_NET_6LOWPAN_MINPORT));
memcpy(&hcudp[SIXLOWPAN_HC1_HC_UDP_CHKSUM], &udp->udpchksum, 2);
diff --git a/net/socket/net_vfcntl.c b/net/socket/net_vfcntl.c
index bf61c65..e5d340a 100644
--- a/net/socket/net_vfcntl.c
+++ b/net/socket/net_vfcntl.c
@@ -164,9 +164,9 @@ int psock_vfcntl(FAR struct socket *psock, int cmd, va_list ap)
/* Set the file status flags, defined in <fcntl.h>, for the file description
* associated with fd from the corresponding bits in the third argument,
* arg, taken as type int. Bits corresponding to the file access mode and
- * the file creation flags, as defined in <fcntl.h>, that are set in arg shall
- * be ignored. If any bits in arg other than those mentioned here are changed
- * by the application, the result is unspecified.
+ * the file creation flags, as defined in <fcntl.h>, that are set in arg
+ * will be ignored. If any bits in arg other than those mentioned here are
+ * changed by the application, the result is unspecified.
*/
{