sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: Remove the extra space

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-12-16 11:56:40 +08:00 committed by Alin Jerpelea
parent df246461ec
commit 5de49d2939
10 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/arp/arp_input.c
View File

@ -129,8 +129,8 @@ static int arp_in(FAR struct net_driver_s *dev)
net_ipv4addr_hdrcopy(arp->ah_sipaddr, &dev->d_ipaddr); net_ipv4addr_hdrcopy(arp->ah_sipaddr, &dev->d_ipaddr);
arp_dump(arp); arp_dump(arp);
eth->type = HTONS(ETHTYPE_ARP); eth->type = HTONS(ETHTYPE_ARP);
dev->d_len = sizeof(struct arp_hdr_s) + ETH_HDRLEN; dev->d_len = sizeof(struct arp_hdr_s) + ETH_HDRLEN;
} }
break; break;

14
net/arp/arp_send.c
View File

@ -54,11 +54,11 @@ static void arp_send_terminate(FAR struct arp_send_s *state, int result)
{ {
/* Don't allow any further call backs. */ /* Don't allow any further call backs. */
state->snd_sent = true; state->snd_sent = true;
state->snd_result = (int16_t)result; state->snd_result = (int16_t)result;
state->snd_cb->flags = 0; state->snd_cb->flags = 0;
state->snd_cb->priv = NULL; state->snd_cb->priv = NULL;
state->snd_cb->event = NULL; state->snd_cb->event = NULL;
/* Wake up the waiting thread */ /* Wake up the waiting thread */
@ -277,8 +277,8 @@ int arp_send(in_addr_t ipaddr)
nxsem_init(&state.snd_sem, 0, 0); /* Doesn't really fail */ nxsem_init(&state.snd_sem, 0, 0); /* Doesn't really fail */
state.snd_retries = 0; /* No retries yet */ state.snd_retries = 0; /* No retries yet */
state.snd_ipaddr = ipaddr; /* IP address to query */ state.snd_ipaddr = ipaddr; /* IP address to query */
/* Remember the routing device name */ /* Remember the routing device name */

2
net/bluetooth/bluetooth_conn.c
View File

@ -190,7 +190,7 @@ void bluetooth_conn_free(FAR struct bluetooth_conn_s *conn)
{ {
/* Remove the frame from the list */ /* Remove the frame from the list */
next = container->bn_flink; next = container->bn_flink;
container->bn_flink = NULL; container->bn_flink = NULL;
/* Free the contained frame data (should be only one in chain) */ /* Free the contained frame data (should be only one in chain) */

8
net/bluetooth/bluetooth_container.c
View File

@ -134,8 +134,8 @@ FAR struct bluetooth_container_s *bluetooth_container_allocate(void)
net_lock(); net_lock();
if (g_free_container != NULL) if (g_free_container != NULL)
{ {
container = g_free_container; container = g_free_container;
g_free_container = container->bn_flink; g_free_container = container->bn_flink;
pool = BLUETOOTH_POOL_PREALLOCATED; pool = BLUETOOTH_POOL_PREALLOCATED;
net_unlock(); net_unlock();
} }
@ -143,8 +143,8 @@ FAR struct bluetooth_container_s *bluetooth_container_allocate(void)
{ {
net_unlock(); net_unlock();
container = (FAR struct bluetooth_container_s *) container = (FAR struct bluetooth_container_s *)
kmm_malloc((sizeof (struct bluetooth_container_s))); kmm_malloc((sizeof(struct bluetooth_container_s)));
pool = BLUETOOTH_POOL_DYNAMIC; pool = BLUETOOTH_POOL_DYNAMIC;
} }
/* We have successfully allocated memory from some source? */ /* We have successfully allocated memory from some source? */

2
net/bluetooth/bluetooth_input.c
View File

@ -250,7 +250,7 @@ int bluetooth_input(FAR struct radio_driver_s *radio,
{ {
/* Remove the frame from the list */ /* Remove the frame from the list */
next = frame->io_flink; next = frame->io_flink;
frame->io_flink = NULL; frame->io_flink = NULL;
/* Add the frame to the RX queue */ /* Add the frame to the RX queue */

20
net/bluetooth/bluetooth_recvmsg.c
View File

@ -157,7 +157,7 @@ static ssize_t
/* Extract the IOB containing the frame from the container */ /* Extract the IOB containing the frame from the container */
iob = container->bn_iob; iob = container->bn_iob;
container->bn_iob = NULL; container->bn_iob = NULL;
DEBUGASSERT(iob != NULL); DEBUGASSERT(iob != NULL);
@ -175,8 +175,8 @@ static ssize_t
if (pstate->ir_from != NULL) if (pstate->ir_from != NULL)
{ {
iaddr = (FAR struct sockaddr_l2 *)pstate->ir_from; iaddr = (FAR struct sockaddr_l2 *)pstate->ir_from;
iaddr->l2_family = AF_BLUETOOTH; iaddr->l2_family = AF_BLUETOOTH;
BLUETOOTH_ADDRCOPY(&iaddr->l2_bdaddr, &container->bn_raddr); BLUETOOTH_ADDRCOPY(&iaddr->l2_bdaddr, &container->bn_raddr);
iaddr->l2_cid = container->bn_channel; iaddr->l2_cid = container->bn_channel;
} }
@ -245,10 +245,10 @@ static uint16_t bluetooth_recvfrom_eventhandler(FAR struct net_driver_s *dev,
{ {
/* Don't allow any further call backs. */ /* Don't allow any further call backs. */
pstate->ir_cb->flags = 0; pstate->ir_cb->flags = 0;
pstate->ir_cb->priv = NULL; pstate->ir_cb->priv = NULL;
pstate->ir_cb->event = NULL; pstate->ir_cb->event = NULL;
pstate->ir_result = ret; pstate->ir_result = ret;
/* indicate that the data has been consumed */ /* indicate that the data has been consumed */
@ -372,9 +372,9 @@ ssize_t bluetooth_recvmsg(FAR struct socket *psock, FAR struct msghdr *msg,
state.ir_cb = bluetooth_callback_alloc(&radio->r_dev, conn); state.ir_cb = bluetooth_callback_alloc(&radio->r_dev, conn);
if (state.ir_cb) if (state.ir_cb)
{ {
state.ir_cb->flags = (BLUETOOTH_NEWDATA | BLUETOOTH_POLL); state.ir_cb->flags = (BLUETOOTH_NEWDATA | BLUETOOTH_POLL);
state.ir_cb->priv = (FAR void *)&state; state.ir_cb->priv = (FAR void *)&state;
state.ir_cb->event = bluetooth_recvfrom_eventhandler; state.ir_cb->event = bluetooth_recvfrom_eventhandler;
/* Wait for either the receive to complete or for an error/timeout to /* Wait for either the receive to complete or for an error/timeout to
* occur. NOTES: (1) net_sem_wait will also terminate if a signal * occur. NOTES: (1) net_sem_wait will also terminate if a signal

14
net/can/can_getsockopt.c
View File

@ -151,13 +151,13 @@ int can_getsockopt(FAR struct socket *psock, int level, int option,
* to me in this case. * to me in this case.
*/ */
ret = -EINVAL; ret = -EINVAL;
} }
else else
{ {
FAR int32_t *loopback = (FAR int32_t *)value; FAR int32_t *loopback = (FAR int32_t *)value;
*loopback = conn->loopback; *loopback = conn->loopback;
*value_len = sizeof(conn->loopback); *value_len = sizeof(conn->loopback);
} }
break; break;
@ -169,7 +169,7 @@ int can_getsockopt(FAR struct socket *psock, int level, int option,
* to me in this case. * to me in this case.
*/ */
ret = -EINVAL; ret = -EINVAL;
} }
else else
{ {
@ -188,7 +188,7 @@ int can_getsockopt(FAR struct socket *psock, int level, int option,
* to me in this case. * to me in this case.
*/ */
ret = -EINVAL; ret = -EINVAL;
} }
else else
{ {
@ -211,7 +211,7 @@ int can_getsockopt(FAR struct socket *psock, int level, int option,
* to me in this case. * to me in this case.
*/ */
ret = -EINVAL; ret = -EINVAL;
} }
else else
{ {

14
net/can/can_recvmsg.c
View File

@ -379,9 +379,9 @@ static uint16_t can_recvfrom_eventhandler(FAR struct net_driver_s *dev,
/* Don't allow any further call backs. */ /* Don't allow any further call backs. */
pstate->pr_cb->flags = 0; pstate->pr_cb->flags = 0;
pstate->pr_cb->priv = NULL; pstate->pr_cb->priv = NULL;
pstate->pr_cb->event = NULL; pstate->pr_cb->event = NULL;
/* indicate that the data has been consumed */ /* indicate that the data has been consumed */
@ -545,7 +545,7 @@ ssize_t can_recvmsg(FAR struct socket *psock, FAR struct msghdr *msg,
/* Get the device driver that will service this transfer */ /* Get the device driver that will service this transfer */
dev = conn->dev; dev = conn->dev;
if (dev == NULL) if (dev == NULL)
{ {
ret = -ENODEV; ret = -ENODEV;
@ -557,9 +557,9 @@ ssize_t can_recvmsg(FAR struct socket *psock, FAR struct msghdr *msg,
state.pr_cb = can_callback_alloc(dev, conn); state.pr_cb = can_callback_alloc(dev, conn);
if (state.pr_cb) if (state.pr_cb)
{ {
state.pr_cb->flags = (CAN_NEWDATA | CAN_POLL); state.pr_cb->flags = (CAN_NEWDATA | CAN_POLL);
state.pr_cb->priv = (FAR void *)&state; state.pr_cb->priv = (FAR void *)&state;
state.pr_cb->event = can_recvfrom_eventhandler; state.pr_cb->event = can_recvfrom_eventhandler;
/* Wait for either the receive to complete or for an error/timeout to /* Wait for either the receive to complete or for an error/timeout to
* occur. NOTES: (1) net_sem_wait will also terminate if a signal * occur. NOTES: (1) net_sem_wait will also terminate if a signal

14
net/can/can_sendmsg.c
View File

@ -124,9 +124,9 @@ static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev,
/* Don't allow any further call backs. */ /* Don't allow any further call backs. */
pstate->snd_cb->flags = 0; pstate->snd_cb->flags = 0;
pstate->snd_cb->priv = NULL; pstate->snd_cb->priv = NULL;
pstate->snd_cb->event = NULL; pstate->snd_cb->event = NULL;
/* Wake up the waiting thread */ /* Wake up the waiting thread */
@ -223,8 +223,8 @@ ssize_t can_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
memset(&state, 0, sizeof(struct send_s)); memset(&state, 0, sizeof(struct send_s));
nxsem_init(&state.snd_sem, 0, 0); /* Doesn't really fail */ nxsem_init(&state.snd_sem, 0, 0); /* Doesn't really fail */
state.snd_buflen = msg->msg_iov->iov_len; /* bytes to send */ state.snd_buflen = msg->msg_iov->iov_len; /* bytes to send */
state.snd_buffer = msg->msg_iov->iov_base; /* Buffer to send from */ state.snd_buffer = msg->msg_iov->iov_base; /* Buffer to send from */
#ifdef CONFIG_NET_CAN_RAW_TX_DEADLINE #ifdef CONFIG_NET_CAN_RAW_TX_DEADLINE
if (msg->msg_controllen > sizeof(struct cmsghdr)) if (msg->msg_controllen > sizeof(struct cmsghdr))
@ -234,8 +234,8 @@ ssize_t can_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
&& cmsg->cmsg_type == CAN_RAW_TX_DEADLINE && cmsg->cmsg_type == CAN_RAW_TX_DEADLINE
&& cmsg->cmsg_len == sizeof(struct timeval)) && cmsg->cmsg_len == sizeof(struct timeval))
{ {
state.pr_msgbuf = CMSG_DATA(cmsg); /* Buffer to cmsg data */ state.pr_msgbuf = CMSG_DATA(cmsg); /* Buffer to cmsg data */
state.pr_msglen = cmsg->cmsg_len; /* len of cmsg data */ state.pr_msglen = cmsg->cmsg_len; /* len of cmsg data */
} }
} }
#endif #endif

12
net/can/can_sockif.c
View File

@ -388,18 +388,18 @@ static int can_poll_local(FAR struct socket *psock, FAR struct pollfd *fds,
/* Initialize the poll info container */ /* Initialize the poll info container */
info->psock = psock; info->psock = psock;
info->fds = fds; info->fds = fds;
info->cb = cb; info->cb = cb;
/* Initialize the callback structure. Save the reference to the info /* Initialize the callback structure. Save the reference to the info
* structure as callback private data so that it will be available * structure as callback private data so that it will be available
* during callback processing. * during callback processing.
*/ */
cb->flags = NETDEV_DOWN; cb->flags = NETDEV_DOWN;
cb->priv = (FAR void *)info; cb->priv = (FAR void *)info;
cb->event = can_poll_eventhandler; cb->event = can_poll_eventhandler;
if ((fds->events & POLLOUT) != 0) if ((fds->events & POLLOUT) != 0)
{ {