michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lib: zperf: fix compiler warning

Browse source 
The compiler emits a "null where non-null expected" warning unless the
argument of strlen is non-null at compile time.

Signed-off-by: Florian Grandel <fgrandel@code-for-humans.de>
This commit is contained in:
Florian Grandel 2023-09-29 19:57:11 +02:00 • committed by Fabio Baltieri
commit 630bfff65f
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/net/lib/zperf/zperf_tcp_receiver.c
View file

@ -165,7 +165,7 @@ static void tcp_server_session(void)
if (!net_ipv4_is_addr_unspecified(addr)) {
memcpy(&in4_addr->sin_addr, addr,
sizeof(struct in_addr));
} else if (MY_IP4ADDR && strlen(MY_IP4ADDR)) {
} else if (strlen(MY_IP4ADDR ? MY_IP4ADDR : "")) {
/* Use Setting IP */
ret = zperf_get_ipv4_addr(MY_IP4ADDR,
&in4_addr->sin_addr);
@ -217,7 +217,7 @@ use_existing_ipv4:
if (!net_ipv6_is_addr_unspecified(addr)) {
memcpy(&in6_addr->sin6_addr, addr,
sizeof(struct in6_addr));
} else if (MY_IP6ADDR && strlen(MY_IP6ADDR)) {
} else if (strlen(MY_IP6ADDR ? MY_IP6ADDR : "")) {
/* Use Setting IP */
ret = zperf_get_ipv6_addr(MY_IP6ADDR,
MY_PREFIX_LEN_STR,

4
subsys/net/lib/zperf/zperf_udp_receiver.c
View file

@ -257,7 +257,7 @@ static void udp_server_session(void)
if (!net_ipv4_is_addr_unspecified(in4_addr)) {
memcpy(&in4_addr_my->sin_addr, in4_addr,
sizeof(struct in_addr));
} else if (MY_IP4ADDR && strlen(MY_IP4ADDR)) {
} else if (strlen(MY_IP4ADDR ? MY_IP4ADDR : "")) {
/* Use setting IP */
ret = zperf_get_ipv4_addr(MY_IP4ADDR,
&in4_addr_my->sin_addr);
@ -312,7 +312,7 @@ static void udp_server_session(void)
if (!net_ipv6_is_addr_unspecified(in6_addr)) {
memcpy(&in6_addr_my->sin6_addr, in6_addr,
sizeof(struct in6_addr));
} else if (MY_IP6ADDR && strlen(MY_IP6ADDR)) {
} else if (strlen(MY_IP6ADDR ? MY_IP6ADDR : "")) {
/* Use setting IP */
ret = zperf_get_ipv6_addr(MY_IP6ADDR,
MY_PREFIX_LEN_STR,