Skip to content

Commit e134b22

Browse files
0xc01700xc0170
authored
Merge pull request #11473 from michalpasztamobica/gcc_warnings_fixes
Fix compilation warnings from GCC in netsocket/network tests
2 parents 185e380 + 9ce69b6 commit e134b22

12 files changed

+15
-35
lines changed

‎TESTS/netsocket/dns/synchronous_dns_cache.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ void SYNCHRONOUS_DNS_CACHE()
4141
SocketAddress address;
4242
int started_us = ticker_us;
4343
nsapi_error_t err = get_interface()->gethostbyname(dns_test_hosts[0], &address);
44+
TEST_ASSERT_TRUE(err == NSAPI_ERROR_OK);
4445

4546
int delay_ms = (ticker_us - started_us) / 1000;
4647

‎TESTS/netsocket/tcp/tcpsocket_echotest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void TCPSOCKET_ECHOTEST()
6767

6868
int recvd;
6969
int sent;
70-
for (int s_idx = 0; s_idx < sizeof(pkt_sizes) / sizeof(*pkt_sizes); s_idx++) {
70+
for (unsigned int s_idx = 0; s_idx < sizeof(pkt_sizes) / sizeof(*pkt_sizes); s_idx++) {
7171
int pkt_s = pkt_sizes[s_idx];
7272
fill_tx_buffer_ascii(tcp_global::tx_buffer, BUFF_SIZE);
7373
sent = sock.send(tcp_global::tx_buffer, pkt_s);

‎TESTS/netsocket/tcp/tcpsocket_recv_100k.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ void rcv_n_chk_against_rfc864_pattern_nonblock(TCPSocket &sock)
146146
int rd = sock.recv(buff, buff_size);
147147
TEST_ASSERT(rd > 0 || rd == NSAPI_ERROR_WOULD_BLOCK);
148148
if (rd > 0) {
149-
if (rd > buff_size) {
149+
if ((unsigned int) rd > buff_size) {
150150
TEST_FAIL_MESSAGE("sock.recv returned more than requested.");
151151
}
152152
check_RFC_864_pattern(buff, rd, recvd_size);

‎TESTS/netsocket/tls/tlssocket_echotest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void TLSSOCKET_ECHOTEST()
7070

7171
int recvd;
7272
int sent;
73-
for (int s_idx = 0; s_idx < sizeof(pkt_sizes) / sizeof(*pkt_sizes); s_idx++) {
73+
for (unsigned int s_idx = 0; s_idx < sizeof(pkt_sizes) / sizeof(*pkt_sizes); s_idx++) {
7474
int pkt_s = pkt_sizes[s_idx];
7575
fill_tx_buffer_ascii(tls_global::tx_buffer, BUFF_SIZE);
7676

‎TESTS/netsocket/udp/udpsocket_echotest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void UDPSOCKET_ECHOTEST()
6868
int sent;
6969
int packets_sent = 0;
7070
int packets_recv = 0;
71-
for (int s_idx = 0; s_idx < sizeof(pkt_sizes) / sizeof(*pkt_sizes); ++s_idx) {
71+
for (unsigned int s_idx = 0; s_idx < sizeof(pkt_sizes) / sizeof(*pkt_sizes); ++s_idx) {
7272
int pkt_s = pkt_sizes[s_idx];
7373

7474
fill_tx_buffer_ascii(tx_buffer, BUFF_SIZE);
@@ -127,7 +127,7 @@ void UDPSOCKET_ECHOTEST_NONBLOCK()
127127
int sent;
128128
int packets_sent = 0;
129129
int packets_recv = 0;
130-
for (int s_idx = 0; s_idx < sizeof(pkt_sizes) / sizeof(*pkt_sizes); ++s_idx) {
130+
for (unsigned int s_idx = 0; s_idx < sizeof(pkt_sizes) / sizeof(*pkt_sizes); ++s_idx) {
131131
int pkt_s = pkt_sizes[s_idx];
132132
int packets_sent_prev = packets_sent;
133133
for (int retry_cnt = 0; retry_cnt <= RETRIES; retry_cnt++) {

‎TESTS/network/emac/main.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,7 @@ int main()
8383
return !Harness::run(specification);
8484
}
8585

86-
#endif // (MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI) && \
87-
!defined(TARGET_UBLOX_EVK_ODIN_W2) && \
88-
!defined(TARGET_REALTEK_RTL8195AM) && \
89-
!defined(TARGET_MTB_ADV_WISE_1530) && \
90-
!defined(TARGET_MTB_USI_WM_BN_BM_22) && \
91-
!defined(TARGET_MTB_MXCHIP_EMW3166) && \
92-
!defined(TARGET_MTB_UBLOX_ODIN_W2) && \
93-
!defined(TARGET_UNO_91H)
86+
#endif // (MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI) && !defined(TARGET_*
9487

9588
#endif // MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE != ETHERNET && MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE != WIFI
9689
#endif // !defined(MBED_CONF_APP_ECHO_SERVER) || !defined(MBED_CONF_APP_ECHO_SERVER_TRACE) || !defined(MBED_CONF_APP_WIFI_SCAN)

‎TESTS/network/interface/networkinterface_status.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ void NETWORKINTERFACE_STATUS_NONBLOCK()
132132
status = wait_status_callback();
133133
TEST_ASSERT_EQUAL(NSAPI_STATUS_DISCONNECTED, status);
134134

135-
wait(1); // In cellular there might still come disconnected messages from the network which are sent to callback.
135+
ThisThread::sleep_for(1); // In cellular there might still come disconnected messages from the network which are sent to callback.
136136
// This would cause this test to fail as next connect is already ongoing. So wait here a while until (hopefully)
137137
// all messages also from the network have arrived.
138138
}

‎TESTS/network/l3ip/main.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525

2626
using namespace utest::v1;
2727

28-
namespace {
29-
NetworkInterface *l3interface;
30-
}
31-
3228
void L3IP_START()
3329
{
3430
printf("MBED: L3IP_START\n");

‎TESTS/network/multihoming/multihoming_asynchronous_dns.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void MULTIHOMING_ASYNCHRONOUS_DNS()
6161
continue;
6262
}
6363

64-
for (unsigned int j = 0; j < interface_num; j++) {
64+
for (int j = 0; j < interface_num; j++) {
6565

6666
nsapi_error_t err = interface->gethostbyname_async(dns_test_hosts[i],
6767
mbed::Callback<void(nsapi_error_t, SocketAddress *)>(hostbyname_cb, (void *) &data), NSAPI_UNSPEC, interface_name[j]);

‎TESTS/network/multihoming/multihoming_synchronous_dns.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void MULTIHOMING_SYNCHRONOUS_DNS()
5151
continue;
5252
}
5353

54-
for (unsigned int j = 0; j < interface_num; j++) {
54+
for (int j = 0; j < interface_num; j++) {
5555

5656
nsapi_error_t err = interface->gethostbyname(dns_test_hosts[i], &address, NSAPI_UNSPEC, interface_name[j]);
5757
printf("DNS: query interface_name %s %d \n", interface_name[j], j);

‎TESTS/network/multihoming/multihoming_udpsocket_echotest.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ void MULTIHOMING_UDPSOCKET_ECHOTEST()
6666

6767
UDPSocket sock;
6868
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(interface));
69-
for (unsigned int j = 0; j < interface_num; j++) {
69+
for (int j = 0; j < interface_num; j++) {
7070
int recvd;
7171
int sent;
7272
int s_idx = 0;
@@ -113,7 +113,7 @@ void udpsocket_echotest_nonblock_receiver(void *receive_bytes)
113113
for (int retry_cnt = 0; retry_cnt <= RETRIES; retry_cnt++) {
114114
recvd = sock.recvfrom(NULL, rx_buffer, expt2recv);
115115
if (recvd == NSAPI_ERROR_WOULD_BLOCK) {
116-
wait_ms(WAIT2RECV_TIMEOUT);
116+
ThisThread::sleep_for(WAIT2RECV_TIMEOUT);
117117
--retry_cnt;
118118
continue;
119119
} else if (recvd == expt2recv) {
@@ -144,7 +144,7 @@ void MULTIHOMING_UDPSOCKET_ECHOTEST_NONBLOCK()
144144
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(interface));
145145
sock.set_blocking(false);
146146
sock.sigio(callback(_sigio_handler, ThisThread::get_id()));
147-
for (unsigned int j = 0; j < interface_num; j++) {
147+
for (int j = 0; j < interface_num; j++) {
148148
int s_idx = 0;
149149
int packets_sent = 0;
150150
int packets_recv = 0;

‎TESTS/network/wifi/main.cpp

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,18 +94,8 @@ int main()
9494
{
9595
return !Harness::run(specification);
9696
}
97-
#endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID) && \
98-
!defined(MBED_CONF_APP_AP_MAC_UNSECURE) || \
99-
!defined(MBED_CONF_APP_MAX_SCAN_SIZE) || \
100-
!defined(MBED_CONF_APP_WIFI_CH_UNSECURE) || \
101-
!defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
97+
#endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID) && !defined(MBED_CONF_APP_*
10298

103-
#endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID) && \
104-
(!defined(MBED_CONF_APP_AP_MAC_SECURE) || \
105-
!defined(MBED_CONF_APP_MAX_SCAN_SIZE) || \
106-
!defined(MBED_CONF_APP_WIFI_CH_SECURE) || \
107-
!defined(MBED_CONF_APP_WIFI_PASSWORD) || \
108-
!defined(MBED_CONF_APP_WIFI_SECURE_SSID) || \
109-
!defined MBED_CONF_APP_WIFI_SECURE_PROTOCOL)
99+
#endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID) && (!defined(MBED_CONF_APP_*
110100

111101
#endif //!defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE != WIFI

0 commit comments

Comments
 (0)