wandering1/STM32F4-Base
1
0
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 2 Releases Wiki Activity

修复Yoda条件（常量右置）与函数定义括号同行

Browse Source 
- net_select.c/net_socket.c 共 62 处 Yoda 条件改为常量在右（规范 6.3.1）

- 11 个文件 58 处函数定义左大括号由换行改为与右括号同行（规范 4.4.2）
This commit is contained in:
Wanderingss
2026-09-01 16:57:34 +08:00
parent bb76cfd779
commit 02c10fa5ef
13 changed files with 111 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Drivers/BSP/NET/net_select.c
+21 -21
View File
@@ -60,12 +60,12 @@ int net_select(int nfds, net_fd_set_t *readfds, net_fd_set_t *writefds,
int i;
/* 检查输入参数合法性 */
if ((0 >= nfds) || (NET_MAX_SOCKETS < nfds)) {
if ((nfds <= 0) || (nfds > NET_MAX_SOCKETS)) {
return -1;
}
/* 计算超时时间（毫秒） */
if (NULL != timeout) {
if (timeout != NULL) {
timeout_ms = (uint32_t)(timeout->tv_sec * 1000) +
(uint32_t)(timeout->tv_usec / 1000);
}
@@ -80,12 +80,12 @@ int net_select(int nfds, net_fd_set_t *readfds, net_fd_set_t *writefds,
for (i = 0; i < nfds && i < NET_MAX_SOCKETS; i++) {
const net_sock_t *p_sock = net_get_sock(i);
if (NULL == p_sock) {
if (p_sock == NULL) {
continue;
}
/* 检查可读事件 */
if ((NULL != readfds) && NET_FD_ISSET(i, readfds)) {
if ((readfds != NULL) && NET_FD_ISSET(i, readfds)) {
if (check_socket_readable(i)) {
NET_FD_SET(i, &result_read);
ready_count++;
@@ -93,7 +93,7 @@ int net_select(int nfds, net_fd_set_t *readfds, net_fd_set_t *writefds,
}
/* 检查可写事件 */
if ((NULL != writefds) && NET_FD_ISSET(i, writefds)) {
if ((writefds != NULL) && NET_FD_ISSET(i, writefds)) {
if (check_socket_writable(i)) {
NET_FD_SET(i, &result_write);
ready_count++;
@@ -101,7 +101,7 @@ int net_select(int nfds, net_fd_set_t *readfds, net_fd_set_t *writefds,
}
/* 检查异常事件 */
if ((NULL != exceptfds) && NET_FD_ISSET(i, exceptfds)) {
if ((exceptfds != NULL) && NET_FD_ISSET(i, exceptfds)) {
if (check_socket_error(i)) {
NET_FD_SET(i, &result_except);
ready_count++;
@@ -110,13 +110,13 @@ int net_select(int nfds, net_fd_set_t *readfds, net_fd_set_t *writefds,
}
/* 有事件就绪，返回 */
if (0 < ready_count) {
if (ready_count > 0) {
break;
}
/* 超时检测 */
if (NULL != timeout) {
if ((0 < timeout_ms) &&
if (timeout != NULL) {
if ((timeout_ms > 0) &&
((HAL_GetTick() - start_tick) >= timeout_ms)) {
break; /* 超时返回 0 */
}
@@ -127,13 +127,13 @@ int net_select(int nfds, net_fd_set_t *readfds, net_fd_set_t *writefds,
}
/* 复制结果集合 */
if (NULL != readfds) {
if (readfds != NULL) {
readfds->fd_bits = result_read.fd_bits;
}
if (NULL != writefds) {
if (writefds != NULL) {
writefds->fd_bits = result_write.fd_bits;
}
if (NULL != exceptfds) {
if (exceptfds != NULL) {
exceptfds->fd_bits = result_except.fd_bits;
}
@@ -158,7 +158,7 @@ int net_poll_events(net_pollfd_t *fds, int nfds, int timeout) {
int ready = 0;
int i;
if ((NULL == fds) || (0 >= nfds)) {
if ((fds == NULL) || (nfds <= 0)) {
return -1;
}
@@ -172,7 +172,7 @@ int net_poll_events(net_pollfd_t *fds, int nfds, int timeout) {
fds[i].revents = 0;
/* 检查 fd 有效性 */
if ((0 > fds[i].fd) || (NET_MAX_SOCKETS <= fds[i].fd)) {
if ((fds[i].fd < 0) || (fds[i].fd >= NET_MAX_SOCKETS)) {
fds[i].revents |= NET_POLLNVAL;
ready++;
continue;
@@ -180,7 +180,7 @@ int net_poll_events(net_pollfd_t *fds, int nfds, int timeout) {
const net_sock_t *p_sock = net_get_sock(fds[i].fd);
if (NULL == p_sock) {
if (p_sock == NULL) {
fds[i].revents |= NET_POLLNVAL;
ready++;
continue;
@@ -215,12 +215,12 @@ int net_poll_events(net_pollfd_t *fds, int nfds, int timeout) {
}
}
if (0 < ready) {
if (ready > 0) {
break;
}
/* 超时检测 */
if (0 <= timeout) {
if (timeout >= 0) {
if ((HAL_GetTick() - start_tick) >= (uint32_t)timeout) {
break;
}
@@ -250,7 +250,7 @@ static int check_socket_readable(int sockfd) {
const net_sock_t *p_sock;
p_sock = net_get_sock(sockfd);
if (NULL == p_sock) {
if (p_sock == NULL) {
return 0;
}
@@ -280,7 +280,7 @@ static int check_socket_writable(int sockfd) {
const net_sock_t *p_sock;
p_sock = net_get_sock(sockfd);
if (NULL == p_sock) {
if (p_sock == NULL) {
return 0;
}
@@ -307,12 +307,12 @@ static int check_socket_error(int sockfd) {
const net_sock_t *p_sock;
/* 无效 fd 视为错误 */
if ((0 > sockfd) || (NET_MAX_SOCKETS <= sockfd)) {
if ((sockfd < 0) || (sockfd >= NET_MAX_SOCKETS)) {
return 1;
}
p_sock = net_get_sock(sockfd);
if (NULL == p_sock) {
if (p_sock == NULL) {
return 1; /* 未使用的 Socket 视为错误 */
}
Drivers/BSP/NET/net_socket.c
+32 -32
View File
@@ -129,7 +129,7 @@ int net_init(const char *ip, const char *mask, const char *gateway) {
ch395f_set_keepalive_cnt(3); /* 最多探 3 次*/
/* 设置网络参数（必须在 INIT_CH395 之前调用 */
if (NULL != ip) {
if (ip != NULL) {
uint8_t ip_arr[4];
uint8_t mask_arr[4];
uint8_t gw_arr[4];
@@ -300,7 +300,7 @@ int net_poll(void) {
void net_process_messages(void) {
net_msg_t msg;
if (NULL == netMsgQueueHandle) {
if (netMsgQueueHandle == NULL) {
return;
}
@@ -308,7 +308,7 @@ void net_process_messages(void) {
switch (msg.type) {
case NET_MSG_SEND: {
net_sock_t *p_sock = net_get_sock(msg.sockfd);
if (NULL == p_sock || p_sock->state != NET_SOCK_STATE_ESTABLISHED) {
if (p_sock == NULL || p_sock->state != NET_SOCK_STATE_ESTABLISHED) {
msg.result = -1;
} else {
msg.result = net_send_locked(p_sock, msg.buf, msg.len);
@@ -317,7 +317,7 @@ void net_process_messages(void) {
}
case NET_MSG_RECV: {
net_sock_t *p_sock = net_get_sock(msg.sockfd);
if (NULL == p_sock) {
if (p_sock == NULL) {
msg.result = -1;
} else {
msg.result = net_recv_locked(p_sock, msg.buf, msg.len, msg.flags);
@@ -326,7 +326,7 @@ void net_process_messages(void) {
}
case NET_MSG_CLOSE: {
net_sock_t *p_sock = net_get_sock(msg.sockfd);
if (NULL == p_sock) {
if (p_sock == NULL) {
msg.result = -1;
} else {
msg.result = net_close_locked(p_sock);
@@ -346,7 +346,7 @@ void net_process_messages(void) {
case NET_MSG_ACCEPT: {
struct net_sockaddr *p_addr = (struct net_sockaddr *)msg.buf;
int addrlen = msg.len;
int *p_addrlen = (NULL != p_addr && addrlen > 0) ? &addrlen : NULL;
int *p_addrlen = (p_addr != NULL && addrlen > 0) ? &addrlen : NULL;
msg.result = net_accept_locked(msg.sockfd, p_addr, p_addrlen);
break;
}
@@ -423,7 +423,7 @@ int net_bind(int sockfd, const struct net_sockaddr *addr, int addrlen) {
return -1;
}
if (NULL == addr || addrlen < (int)sizeof(struct net_sockaddr_in)) {
if (addr == NULL || addrlen < (int)sizeof(struct net_sockaddr_in)) {
s_net_errno = NET_ERR_INVAL;
return -1;
}
@@ -567,7 +567,7 @@ int net_listen(int sockfd) {
return -1;
}
if (NULL == netMsgQueueHandle) {
if (netMsgQueueHandle == NULL) {
s_net_errno = NET_ERR;
return -1;
}
@@ -627,7 +627,7 @@ static int net_accept_locked(int sockfd, struct net_sockaddr *addr, int *addrlen
}
/* 填充对端地址（若调用方需要） */
if (NULL != addr && NULL != addrlen) {
if (addr != NULL && addrlen != NULL) {
struct net_sockaddr_in *p_addr_in = (struct net_sockaddr_in *)addr;
p_addr_in->sin_family = NET_AF_INET;
p_addr_in->sin_port = net_htons(p_listen_sock->remote_port);
@@ -656,7 +656,7 @@ int net_accept(int sockfd, struct net_sockaddr *addr, int *addrlen) {
return -1;
}
if (NULL == netMsgQueueHandle) {
if (netMsgQueueHandle == NULL) {
s_net_errno = NET_ERR;
return -1;
}
@@ -664,7 +664,7 @@ int net_accept(int sockfd, struct net_sockaddr *addr, int *addrlen) {
msg.type = NET_MSG_ACCEPT;
msg.sockfd = sockfd;
msg.buf = (void *)addr;
msg.len = (NULL != addrlen) ? *addrlen : 0;
msg.len = (addrlen != NULL) ? *addrlen : 0;
msg.caller = xTaskGetCurrentTaskHandle();
msg.result = -1;
@@ -679,7 +679,7 @@ int net_accept(int sockfd, struct net_sockaddr *addr, int *addrlen) {
msg.result = (int)s_notified;
}
if (NULL != addrlen &&NULL != addr) {
if (addrlen != NULL &&addr != NULL) {
*addrlen = sizeof(struct net_sockaddr_in);
}
@@ -709,12 +709,12 @@ int net_connect(int sockfd, const struct net_sockaddr *addr, int addrlen) {
return -1;
}
if (NULL == netMsgQueueHandle) {
if (netMsgQueueHandle == NULL) {
s_net_errno = NET_ERR;
return -1;
}
if (NULL == addr || addrlen < (int)sizeof(struct net_sockaddr_in)) {
if (addr == NULL || addrlen < (int)sizeof(struct net_sockaddr_in)) {
s_net_errno = NET_ERR_INVAL;
return -1;
}
@@ -767,7 +767,7 @@ static int net_connect_locked(int sockfd, const struct net_sockaddr *addr, int a
return -1;
}
if (NULL == addr || addrlen < (int)sizeof(struct net_sockaddr_in)) {
if (addr == NULL || addrlen < (int)sizeof(struct net_sockaddr_in)) {
s_net_errno = NET_ERR_INVAL;
return -1;
}
@@ -865,7 +865,7 @@ static int net_send_locked(net_sock_t *p_sock, const void *buf, int len) {
uint32_t tick_start;
int sockfd = (int)(p_sock - s_net_socks);
if (NULL == buf || len <= 0) {
if (buf == NULL || len <= 0) {
s_net_errno = NET_ERR_INVAL;
return -1;
}
@@ -928,7 +928,7 @@ static int net_recv_locked(net_sock_t *p_sock, void *buf, int len, int flags) {
uint32_t tick_start;
int sockfd = (int)(p_sock - s_net_socks);
if (NULL == buf || len <= 0) {
if (buf == NULL || len <= 0) {
s_net_errno = NET_ERR_INVAL;
return -1;
}
@@ -1117,7 +1117,7 @@ int net_send(int sockfd, const void *buf, int len, int flags) {
}
/* ---- 2. 运行环境检查：消息队列须已创建（网络层已初始化） ---- */
if (NULL == netMsgQueueHandle) {
if (netMsgQueueHandle == NULL) {
s_net_errno = NET_ERR; /* 网络层未初始化 */
return -1;
}
@@ -1172,7 +1172,7 @@ int net_recv(int sockfd, void *buf, int len, int flags) {
return -1;
}
if (NULL == netMsgQueueHandle) {
if (netMsgQueueHandle == NULL) {
s_net_errno = NET_ERR;
return -1;
}
@@ -1219,7 +1219,7 @@ int net_close(int sockfd) {
return -1;
}
if (NULL == netMsgQueueHandle) {
if (netMsgQueueHandle == NULL) {
s_net_errno = NET_ERR;
return -1;
}
@@ -1277,13 +1277,13 @@ int net_sendto(int sockfd, const void *buf, int len, int flags,
return -1;
}
if (NULL == buf || len <= 0) {
if (buf == NULL || len <= 0) {
s_net_errno = NET_ERR_INVAL;
return -1;
}
/* UDP 模式：设置目标地址 */
if (NULL != dest_addr && addrlen >= (int)sizeof(struct net_sockaddr_in)) {
if (dest_addr != NULL && addrlen >= (int)sizeof(struct net_sockaddr_in)) {
p_addr_in = (const struct net_sockaddr_in *)dest_addr;
/* 转换 IP 为大端数组（同 TCP 客户端，set_des_ip 期望大端） */
@@ -1365,7 +1365,7 @@ int net_recvfrom(int sockfd, void *buf, int len, int flags,
return -1;
}
if (NULL == buf || len <= 0) {
if (buf == NULL || len <= 0) {
s_net_errno = NET_ERR_INVAL;
return -1;
}
@@ -1384,7 +1384,7 @@ int net_recvfrom(int sockfd, void *buf, int len, int flags,
recv_len -= 8;
/* 填充来源地址 */
if (NULL != src_addr &&NULL != addrlen &&
if (src_addr != NULL &&addrlen != NULL &&
*addrlen >= (int)sizeof(struct net_sockaddr_in)) {
struct net_sockaddr_in *p_addr_in = (struct net_sockaddr_in *)src_addr;
p_addr_in->sin_family = NET_AF_INET;
@@ -1436,7 +1436,7 @@ int net_recvfrom(int sockfd, void *buf, int len, int flags,
* 函数说明：直接调用 net_send_locked 完成发送
*/
int net_send_sock(net_sock_t *p_sock, const void *buf, int len) {
if (NULL == p_sock) {
if (p_sock == NULL) {
s_net_errno = NET_ERR_BADF;
return -1;
}
@@ -1455,7 +1455,7 @@ int net_send_sock(net_sock_t *p_sock, const void *buf, int len) {
* 函数说明：直接操作 Socket 控制块，不经过消息队列。避免 netTask 向自身发送消息造成死锁
*/
int net_recv_sock(net_sock_t *p_sock, void *buf, int len, int flags) {
if (NULL == p_sock) {
if (p_sock == NULL) {
s_net_errno = NET_ERR_BADF;
return -1;
}
@@ -1470,7 +1470,7 @@ int net_recv_sock(net_sock_t *p_sock, void *buf, int len, int flags) {
* 函数说明：直接操作 Socket 控制块，不经过消息队列。TCP Socket 先断开连接再释放控制块
*/
int net_close_sock(net_sock_t *p_sock) {
if (NULL == p_sock) {
if (p_sock == NULL) {
s_net_errno = NET_ERR_BADF;
return -1;
}
@@ -1530,7 +1530,7 @@ uint32_t net_inet_addr(const char *cp) {
uint32_t addr = 0;
int i;
if (NULL == cp) {
if (cp == NULL) {
return 0;
}
@@ -1561,7 +1561,7 @@ uint32_t net_inet_addr(const char *cp) {
char *net_inet_ntoa(uint32_t addr, char *buf) {
uint32_t naddr = NET_NTOHL(addr);
if (NULL == buf) {
if (buf == NULL) {
return NULL;
}
@@ -1787,7 +1787,7 @@ static void handle_timeout_event(net_sock_t *p_sock) {
* 2. 回调参数为 ch395_sock、event、event_arg
*/
static void fire_event(net_sock_t *p_sock, net_event_t event) {
if (NULL != p_sock->event_cb) {
if (p_sock->event_cb != NULL) {
p_sock->event_cb(p_sock->ch395_sock, event, p_sock->event_arg);
}
}
@@ -1805,7 +1805,7 @@ static void fire_event(net_sock_t *p_sock, net_event_t event) {
static void parse_ip_string(const char *str, uint8_t *ip_arr) {
int i;
if (NULL == str ||NULL == ip_arr) {
if (str == NULL ||ip_arr == NULL) {
return;
}
@@ -1864,7 +1864,7 @@ int net_getsockname(int sockfd, struct net_sockaddr *addr, int *addrlen) {
return -1;
}
if (NULL == addr ||NULL == addrlen || *addrlen < (int)sizeof(struct net_sockaddr_in)) {
if (addr == NULL ||addrlen == NULL || *addrlen < (int)sizeof(struct net_sockaddr_in)) {
s_net_errno = NET_ERR_INVAL;
return -1;
}