Fix remaining linter issues

danielinux · danielinux · commit 79ba8f9001c3 · 2025-02-25T11:57:34.000+01:00
diff --git a/src/http/httpd.c b/src/http/httpd.c
@@ -185,7 +185,7 @@ int http_url_decode(char *buf, size_t len) {
 
 int http_url_encode(char *buf, size_t len, size_t max_len) {
     char *p = buf;
-    char *q;
+    char *q = NULL;
     while (p < buf + len) {
         q = strchr(p, ' ');
         if (!q) {
@@ -200,7 +200,8 @@ int http_url_encode(char *buf, size_t len, size_t max_len) {
         *(q + 2) = '0';
         len += 2;
     }
-    q[len] = '\0';
+    if (q)
+        q[len] = '\0';
     return len;
 }
 
diff --git a/src/port/posix/bsd_socket.c b/src/port/posix/bsd_socket.c
@@ -246,8 +246,8 @@ int wolfIP_sock_poll(struct wolfIP *ipstack, struct pollfd *fds, nfds_t nfds, in
     for (i = 0; i < nfds; i++) {
         struct bsd_poll_helper *poller = NULL;
         int j;
-        int fd = fds[i].fd;
         char c = 0;
+        fd = fds[i].fd;
         for (j = 0; j < MAX_TCPSOCKETS; j++) {
             if (tcp_pollers[j].fd == 0)
                 continue;
diff --git a/src/port/raspberry-pico-usb-server/src/main.c b/src/port/raspberry-pico-usb-server/src/main.c
@@ -133,6 +133,7 @@ static void tusb_net_push_rx(const uint8_t *src, uint16_t size) {
             break;
         }
     }
+    if (i == 2) return;
     if (dst) {
         memcpy(dst, src, size);
         tusb_net_rxbuf_used[i] = 1;
@@ -191,26 +192,7 @@ static void telnet_cb(int fd, uint16_t event, void *arg)
             wolfIP_sock_write(IPStack, tel_c, welcome_msg, strlen(welcome_msg));
         }
     }
-#if 0
-    else if ((fd == tel_c) && (event & CB_EVENT_READABLE  )) {
-        int ret;
-        ret = wolfIP_sock_recv((struct wolfIP *)arg, tel_c, buf, sizeof(buf), 0);
-        if (ret != -11) {
-            if (ret < 0) {
-                printf("Recv error: %d\n", ret);
-                wolfIP_sock_close((struct wolfIP *)arg, tel_c);
-            } else if (ret == 0) {
-                printf("Client side closed the connection.\n");
-                wolfIP_sock_close((struct wolfIP *)arg, tel_c);
-                printf("Server: Exiting.\n");
-                exit_ok = 1;
-            } else if (ret > 0) {
-                printf("recv: %d, echoing back\n", ret);
-                tot_recv += ret;
-            }
-        }
-    }
-#endif
+    /* Telnet read callback disabled for now */
 }
 
 
diff --git a/src/test/tcp_netcat_select.c b/src/test/tcp_netcat_select.c
@@ -88,18 +88,15 @@ int main() {
 
         if ((new_socket == -1) && FD_ISSET(server_fd, &tempfds)) {
             printf("Server socket activity\n");
-            // New connection on the socket
+            new_socket = accept(server_fd, NULL, NULL);
             if (new_socket == -1) {
-                new_socket = accept(server_fd, NULL, NULL);
-                if (new_socket == -1) {
-                    perror("Accept failed");
-                    continue;
-                }
-                printf("New connection established\n");
-                FD_SET(new_socket, &readfds);  // Monitor the new socket
-                max_fd = (new_socket > max_fd) ? new_socket : max_fd;
+                perror("Accept failed");
                 continue;
             }
+            printf("New connection established\n");
+            FD_SET(new_socket, &readfds);  // Monitor the new socket
+            max_fd = (new_socket > max_fd) ? new_socket : max_fd;
+            continue;
         }
         if ((new_socket != -1) && FD_ISSET(new_socket, &tempfds)) {
             // Data available on the socket
diff --git a/src/test/test_httpd.c b/src/test/test_httpd.c
@@ -127,7 +127,7 @@ int main(int argc, char **argv)
 {
     struct wolfIP *s;
     struct ll *tapdev;
-    struct timeval tv;
+    struct timeval tv = {0, 0};
     struct in_addr linux_ip;
     uint32_t srv_ip;
     ip4 ip = 0, nm = 0, gw = 0;
@@ -171,6 +171,7 @@ int main(int argc, char **argv)
     printf("IP: manually configured\n");
     inet_pton(AF_INET, WOLFIP_IP, &srv_ip);
 #endif
+    (void)srv_ip;
 
     /* Server side test */
     test_httpd(s);
diff --git a/src/test/test_linux_dhcp_dns.c b/src/test/test_linux_dhcp_dns.c
@@ -138,7 +138,7 @@ static void *pt_echoserver(void *arg)
 {
     int fd, ret;
     unsigned total_r = 0;
-    uint8_t buf[BUFFER_SIZE];
+    uint8_t local_buf[BUFFER_SIZE];
     struct sockaddr_in local_sock = {
         .sin_family = AF_INET,
         .sin_port = ntohs(8), /* Echo */
@@ -171,7 +171,7 @@ static void *pt_echoserver(void *arg)
     printf("test server: client %d connected\n", ret);
     fd = ret;
     while (1) {
-        ret = read(fd, buf + total_r, sizeof(buf) - total_r);
+        ret = read(fd, local_buf + total_r, sizeof(local_buf) - total_r);
         if (ret < 0) {
             printf("failed test server read: %d (%s) \n", ret, strerror(errno));
             return (void *)-1;
@@ -184,7 +184,7 @@ static void *pt_echoserver(void *arg)
                 return (void *)-1;
         }
         total_r += ret;
-        write(fd, buf + total_r - ret, ret);
+        write(fd, local_buf + total_r - ret, ret);
     }
 }
 
diff --git a/src/test/test_linux_eventloop.c b/src/test/test_linux_eventloop.c
@@ -205,7 +205,7 @@ void *pt_echoclient(void *arg)
     int fd, ret;
     unsigned total_r = 0;
     unsigned i;
-    uint8_t buf[BUFFER_SIZE];
+    uint8_t local_buf[BUFFER_SIZE];
     uint32_t *srv_addr = (uint32_t *)arg;
     struct sockaddr_in remote_sock = {
         .sin_family = AF_INET,
@@ -226,16 +226,16 @@ void *pt_echoclient(void *arg)
         perror("connect");
         return (void *)-1;
     }
-    for (i = 0; i < sizeof(buf); i += sizeof(test_pattern)) {
-        memcpy(buf + i, test_pattern, sizeof(test_pattern));
+    for (i = 0; i < sizeof(local_buf); i += sizeof(test_pattern)) {
+        memcpy(local_buf + i, test_pattern, sizeof(test_pattern));
     }
-    ret = write(fd, buf, sizeof(buf));
+    ret = write(fd, local_buf, sizeof(local_buf));
     if (ret < 0) {
         printf("test client write: %d\n", ret);
         return (void *)-1;
     }
-    while (total_r < sizeof(buf)) {
-        ret = read(fd, buf + total_r, sizeof(buf) - total_r);
+    while (total_r < sizeof(local_buf)) {
+        ret = read(fd, local_buf + total_r, sizeof(local_buf) - total_r);
         if (ret < 0) {
             printf("failed test client read: %d\n", ret);
             return (void *)-1;
@@ -249,12 +249,12 @@ void *pt_echoclient(void *arg)
         }
         total_r += ret;
     }
-    for (i = 0; i < sizeof(buf); i += sizeof(test_pattern)) {
-        if (memcmp(buf + i, test_pattern, sizeof(test_pattern))) {
+    for (i = 0; i < sizeof(local_buf); i += sizeof(test_pattern)) {
+        if (memcmp(local_buf + i, test_pattern, sizeof(test_pattern))) {
             printf("test client: pattern mismatch\n");
             printf("at position %u\n", i);
-            buf[i + 16] = 0;
-            printf("%s\n", &buf[i]);
+            local_buf[i + 16] = 0;
+            printf("%s\n", &local_buf[i]);
             return (void *)-1;
         }
     }
@@ -270,7 +270,7 @@ static void *pt_echoserver(void *arg)
 {
     int fd, ret;
     unsigned total_r = 0;
-    uint8_t buf[BUFFER_SIZE];
+    uint8_t local_buf[BUFFER_SIZE];
     struct sockaddr_in local_sock = {
         .sin_family = AF_INET,
         .sin_port = ntohs(8), /* Echo */
@@ -303,7 +303,7 @@ static void *pt_echoserver(void *arg)
     printf("test server: client %d connected\n", ret);
     fd = ret;
     while (1) {
-        ret = read(fd, buf + total_r, sizeof(buf) - total_r);
+        ret = read(fd, local_buf + total_r, sizeof(local_buf) - total_r);
         if (ret < 0) {
             printf("failed test server read: %d (%s) \n", ret, strerror(errno));
             return (void *)-1;
@@ -316,7 +316,7 @@ static void *pt_echoserver(void *arg)
                 return (void *)-1;
         }
         total_r += ret;
-        write(fd, buf + total_r - ret, ret);
+        write(fd, local_buf + total_r - ret, ret);
     }
 }
 
@@ -421,7 +421,7 @@ int main(int argc, char **argv)
 {
     struct wolfIP *s;
     struct ll *tapdev;
-    struct timeval tv;
+    struct timeval tv = {0, 0};
     struct in_addr linux_ip;
     uint32_t srv_ip;
     ip4 ip = 0, nm = 0, gw = 0;
diff --git a/src/test/test_native_wolfssl.c b/src/test/test_native_wolfssl.c
@@ -89,7 +89,7 @@ static void server_cb(int fd, uint16_t event, void *arg)
             wolfIP_sock_close((struct wolfIP *)arg, client_fd);
             printf("Server: Exiting.\n");
             exit_ok = 1;
-        } else if (ret > 0) {
+        } else  /* ret > 0 */ {
             printf("recv: %d, echoing back\n", ret);
             tot_recv += ret;
         }
@@ -171,7 +171,7 @@ void *pt_echoclient(void *arg)
     int fd, ret;
     unsigned total_r = 0;
     unsigned i;
-    uint8_t buf[BUFFER_SIZE];
+    uint8_t local_buf[BUFFER_SIZE];
     uint32_t *srv_addr = (uint32_t *)arg;
     struct sockaddr_in remote_sock = {
         .sin_family = AF_INET,
@@ -214,16 +214,16 @@ void *pt_echoclient(void *arg)
         printf("Linux client: Failed to connect to TLS server, err: %d\n", ret);
         return (void *)-1;
     }
-    for (i = 0; i < sizeof(buf); i += sizeof(test_pattern)) {
-        memcpy(buf + i, test_pattern, sizeof(test_pattern));
+    for (i = 0; i < sizeof(local_buf); i += sizeof(test_pattern)) {
+        memcpy(local_buf + i, test_pattern, sizeof(test_pattern));
     }
-    ret = wolfSSL_write(client_ssl, buf, sizeof(buf));
+    ret = wolfSSL_write(client_ssl, local_buf, sizeof(local_buf));
     if (ret < 0) {
         printf("test client write: %d\n", ret);
         return (void *)-1;
     }
-    while (total_r < sizeof(buf)) {
-        ret = wolfSSL_read(client_ssl, buf + total_r, sizeof(buf) - total_r);
+    while (total_r < sizeof(local_buf)) {
+        ret = wolfSSL_read(client_ssl, local_buf + total_r, sizeof(local_buf) - total_r);
         if (ret < 0) {
             printf("failed test client read: %d\n", ret);
             return (void *)-1;
@@ -237,12 +237,12 @@ void *pt_echoclient(void *arg)
         }
         total_r += ret;
     }
-    for (i = 0; i < sizeof(buf); i += sizeof(test_pattern)) {
-        if (memcmp(buf + i, test_pattern, sizeof(test_pattern))) {
+    for (i = 0; i < sizeof(local_buf); i += sizeof(test_pattern)) {
+        if (memcmp(local_buf + i, test_pattern, sizeof(test_pattern))) {
             printf("test client: pattern mismatch\n");
             printf("at position %u\n", i);
-            buf[i + 16] = 0;
-            printf("%s\n", &buf[i]);
+            local_buf[i + 16] = 0;
+            printf("%s\n", &local_buf[i]);
             return (void *)-1;
         }
     }
@@ -334,7 +334,7 @@ int main(int argc, char **argv)
 {
     struct wolfIP *s;
     struct ll *tapdev;
-    struct timeval tv;
+    struct timeval tv = {0, 0};
     struct in_addr linux_ip;
     uint32_t srv_ip;
     ip4 ip = 0, nm = 0, gw = 0;
diff --git a/src/wolfip.c b/src/wolfip.c
diff --git a/wolfip.h b/wolfip.h

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ static void pt_echoserver(void arg)`
`138`	`138`	`{`
`139`	`139`	`int fd, ret;`
`140`	`140`	`unsigned total_r = 0;`
`141`		`- uint8_t buf[BUFFER_SIZE];`
	`141`	`+ uint8_t local_buf[BUFFER_SIZE];`
`142`	`142`	`struct sockaddr_in local_sock = {`
`143`	`143`	`.sin_family = AF_INET,`
`144`	`144`	`.sin_port = ntohs(8), /* Echo */`
`@@ -171,7 +171,7 @@ static void pt_echoserver(void arg)`
`171`	`171`	`printf("test server: client %d connected\n", ret);`
`172`	`172`	`fd = ret;`
`173`	`173`	`while (1) {`
`174`		`- ret = read(fd, buf + total_r, sizeof(buf) - total_r);`
	`174`	`+ ret = read(fd, local_buf + total_r, sizeof(local_buf) - total_r);`
`175`	`175`	`if (ret < 0) {`
`176`	`176`	`printf("failed test server read: %d (%s) \n", ret, strerror(errno));`
`177`	`177`	`return (void *)-1;`
`@@ -184,7 +184,7 @@ static void pt_echoserver(void arg)`
`184`	`184`	`return (void *)-1;`
`185`	`185`	`}`
`186`	`186`	`total_r += ret;`
`187`		`- write(fd, buf + total_r - ret, ret);`
	`187`	`+ write(fd, local_buf + total_r - ret, ret);`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`