缩小变量作用域:消除18处variableScope,声明移入实际使用块
This commit is contained in:
@@ -633,11 +633,11 @@ int lftpd_start(const char *directory, int port, lftpd_t *lftpd)
|
||||
}
|
||||
|
||||
{
|
||||
char ip_str[16];
|
||||
struct net_sockaddr_in addr;
|
||||
int addrlen = sizeof(addr);
|
||||
if (net_getsockname(client_socket,
|
||||
(struct net_sockaddr *)&addr, &addrlen) == 0) {
|
||||
char ip_str[16];
|
||||
net_inet_ntoa(addr.sin_addr.s_addr, ip_str);
|
||||
int remote_port = lftpd_inet_get_socket_port(client_socket);
|
||||
lftpd_log_info("connection received from %s:%d...",
|
||||
|
||||
@@ -8,10 +8,9 @@
|
||||
int lftpd_inet_listen(int port)
|
||||
{
|
||||
int retry;
|
||||
int s;
|
||||
|
||||
for (retry = 0; retry < 5; retry++) {
|
||||
s = net_socket(NET_AF_INET, NET_SOCK_STREAM);
|
||||
int s = net_socket(NET_AF_INET, NET_SOCK_STREAM);
|
||||
if (s < 0) {
|
||||
if (retry == 0) DBG_ERROR("create socket");
|
||||
vTaskDelay(pdMS_TO_TICKS(500));
|
||||
|
||||
@@ -201,10 +201,9 @@ void *lftpd_io_opendir(const char *path)
|
||||
int lftpd_io_readdir(void *dp, char *name, int name_max, uint32_t *p_size, int *p_is_dir)
|
||||
{
|
||||
FILINFO fno;
|
||||
FRESULT fr;
|
||||
|
||||
while (1) {
|
||||
fr = f_readdir((DIR *)dp, &fno);
|
||||
FRESULT fr = f_readdir((DIR *)dp, &fno);
|
||||
if (fr != FR_OK || fno.fname[0] == 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user