nuttx: replace all ARRAY_SIZE()/ARRAYSIZE() to nitems()

Signed-off-by: chao an <anchao@xiaomi.com>
This commit is contained in:
chao an
2023-02-02 20:31:22 +08:00
committed by Xiang Xiao
parent cf0769d613
commit 3a0fdb019d
95 changed files with 291 additions and 451 deletions
+2 -2
View File
@@ -161,7 +161,7 @@ static int do_accept_request(FAR struct usrsock_conn_s *conn,
bufs[0].iov_base = &req;
bufs[0].iov_len = sizeof(req);
return usrsock_do_request(conn, bufs, ARRAY_SIZE(bufs));
return usrsock_do_request(conn, bufs, nitems(bufs));
}
/****************************************************************************
@@ -385,7 +385,7 @@ int usrsock_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
inbufs[1].iov_base = &newconn->usockid;
inbufs[1].iov_len = sizeof(newconn->usockid);
usrsock_setup_datain(conn, inbufs, ARRAY_SIZE(inbufs));
usrsock_setup_datain(conn, inbufs, nitems(inbufs));
/* We might start getting events for this socket right after
* returning to daemon, so setup 'newconn' already here.
+1 -1
View File
@@ -110,7 +110,7 @@ static int do_bind_request(FAR struct usrsock_conn_s *conn,
bufs[1].iov_base = (FAR void *)addr;
bufs[1].iov_len = req.addrlen;
return usrsock_do_request(conn, bufs, ARRAY_SIZE(bufs));
return usrsock_do_request(conn, bufs, nitems(bufs));
}
/****************************************************************************
+1 -1
View File
@@ -106,7 +106,7 @@ static int do_close_request(FAR struct usrsock_conn_s *conn)
bufs[0].iov_base = (FAR void *)&req;
bufs[0].iov_len = sizeof(req);
return usrsock_do_request(conn, bufs, ARRAY_SIZE(bufs));
return usrsock_do_request(conn, bufs, nitems(bufs));
}
/****************************************************************************
+1 -1
View File
@@ -112,7 +112,7 @@ static int do_connect_request(FAR struct usrsock_conn_s *conn,
bufs[1].iov_base = (FAR void *)addr;
bufs[1].iov_len = addrlen;
ret = usrsock_do_request(conn, bufs, ARRAY_SIZE(bufs));
ret = usrsock_do_request(conn, bufs, nitems(bufs));
if (ret == -ENETDOWN)
{
ret = -ECONNABORTED;
+2 -2
View File
@@ -123,7 +123,7 @@ static int do_getpeername_request(FAR struct usrsock_conn_s *conn,
bufs[0].iov_base = (FAR void *)&req;
bufs[0].iov_len = sizeof(req);
return usrsock_do_request(conn, bufs, ARRAY_SIZE(bufs));
return usrsock_do_request(conn, bufs, nitems(bufs));
}
/****************************************************************************
@@ -193,7 +193,7 @@ int usrsock_getpeername(FAR struct socket *psock,
inbufs[0].iov_base = (FAR void *)addr;
inbufs[0].iov_len = *addrlen;
usrsock_setup_datain(conn, inbufs, ARRAY_SIZE(inbufs));
usrsock_setup_datain(conn, inbufs, nitems(inbufs));
/* Request user-space daemon to close socket. */
+2 -2
View File
@@ -123,7 +123,7 @@ static int do_getsockname_request(FAR struct usrsock_conn_s *conn,
bufs[0].iov_base = (FAR void *)&req;
bufs[0].iov_len = sizeof(req);
return usrsock_do_request(conn, bufs, ARRAY_SIZE(bufs));
return usrsock_do_request(conn, bufs, nitems(bufs));
}
/****************************************************************************
@@ -193,7 +193,7 @@ int usrsock_getsockname(FAR struct socket *psock,
inbufs[0].iov_base = (FAR void *)addr;
inbufs[0].iov_len = *addrlen;
usrsock_setup_datain(conn, inbufs, ARRAY_SIZE(inbufs));
usrsock_setup_datain(conn, inbufs, nitems(inbufs));
/* Request user-space daemon to handle request. */
+2 -2
View File
@@ -134,7 +134,7 @@ static int do_getsockopt_request(FAR struct usrsock_conn_s *conn, int level,
bufs[0].iov_base = (FAR void *)&req;
bufs[0].iov_len = sizeof(req);
return usrsock_do_request(conn, bufs, ARRAY_SIZE(bufs));
return usrsock_do_request(conn, bufs, nitems(bufs));
}
/****************************************************************************
@@ -216,7 +216,7 @@ int usrsock_getsockopt(FAR struct socket *psock, int level, int option,
inbufs[0].iov_base = (FAR void *)value;
inbufs[0].iov_len = *value_len;
usrsock_setup_datain(conn, inbufs, ARRAY_SIZE(inbufs));
usrsock_setup_datain(conn, inbufs, nitems(inbufs));
/* Request user-space daemon to handle request. */
+2 -2
View File
@@ -139,7 +139,7 @@ static int do_ioctl_request(FAR struct usrsock_conn_s *conn, int cmd,
}
#endif
return usrsock_do_request(conn, bufs, ARRAY_SIZE(bufs));
return usrsock_do_request(conn, bufs, nitems(bufs));
}
/****************************************************************************
@@ -227,7 +227,7 @@ int usrsock_ioctl(FAR struct socket *psock, int cmd, unsigned long arg_)
}
#endif
usrsock_setup_datain(conn, inbufs, ARRAY_SIZE(inbufs));
usrsock_setup_datain(conn, inbufs, nitems(inbufs));
/* Request user-space daemon to handle ioctl. */
+1 -1
View File
@@ -106,7 +106,7 @@ static int do_listen_request(FAR struct usrsock_conn_s *conn, int backlog)
bufs[0].iov_base = &req;
bufs[0].iov_len = sizeof(req);
return usrsock_do_request(conn, bufs, ARRAY_SIZE(bufs));
return usrsock_do_request(conn, bufs, nitems(bufs));
}
/****************************************************************************
+2 -2
View File
@@ -175,7 +175,7 @@ static int do_recvfrom_request(FAR struct usrsock_conn_s *conn,
bufs[0].iov_base = (FAR void *)&req;
bufs[0].iov_len = sizeof(req);
return usrsock_do_request(conn, bufs, ARRAY_SIZE(bufs));
return usrsock_do_request(conn, bufs, nitems(bufs));
}
/****************************************************************************
@@ -385,7 +385,7 @@ ssize_t usrsock_recvmsg(FAR struct socket *psock, FAR struct msghdr *msg,
inbufs[1].iov_base = (FAR void *)buf;
inbufs[1].iov_len = len;
usrsock_setup_datain(conn, inbufs, ARRAY_SIZE(inbufs));
usrsock_setup_datain(conn, inbufs, nitems(inbufs));
/* MSG_DONTWAIT is only use in usrsock. */
+1 -1
View File
@@ -172,7 +172,7 @@ static int do_sendto_request(FAR struct usrsock_conn_s *conn,
memcpy(&bufs[2], msg->msg_iov, sizeof(struct iovec) * msg->msg_iovlen);
return usrsock_do_request(conn, bufs, ARRAY_SIZE(bufs));
return usrsock_do_request(conn, bufs, nitems(bufs));
}
/****************************************************************************
+1 -1
View File
@@ -128,7 +128,7 @@ static int do_setsockopt_request(FAR struct usrsock_conn_s *conn,
bufs[1].iov_base = (FAR void *)value;
bufs[1].iov_len = req.valuelen;
return usrsock_do_request(conn, bufs, ARRAY_SIZE(bufs));
return usrsock_do_request(conn, bufs, nitems(bufs));
}
/****************************************************************************
+1 -1
View File
@@ -106,7 +106,7 @@ static int do_shutdown_request(FAR struct usrsock_conn_s *conn, int how)
bufs[0].iov_base = (FAR void *)&req;
bufs[0].iov_len = sizeof(req);
return usrsock_do_request(conn, bufs, ARRAY_SIZE(bufs));
return usrsock_do_request(conn, bufs, nitems(bufs));
}
/****************************************************************************
+1 -1
View File
@@ -137,7 +137,7 @@ static int do_socket_request(FAR struct usrsock_conn_s *conn, int domain,
bufs[0].iov_base = (FAR void *)&req;
bufs[0].iov_len = sizeof(req);
return usrsock_do_request(conn, bufs, ARRAY_SIZE(bufs));
return usrsock_do_request(conn, bufs, nitems(bufs));
}
/****************************************************************************