Skip to content

Commit 7487ca1

Browse files
author
Arto Kinnunen
committed
Fix clang-6.0 build error and warnings
Error: -variable length array folded to constant array as an extension Warnings: -null passed to a callee that requires a non-null -equality comparison with extraneous parentheses
1 parent cce3fc7 commit 7487ca1

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

source/6LoWPAN/Thread/thread_extension_bbr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ static int thread_extension_bbr_dua_cb(int8_t service_id, uint8_t source_address
10001000
typedef struct {
10011001
uint8_t addr[16];
10021002
} multicast_addr_t;
1003-
static multicast_addr_t multicast_store[MULTICAST_ADDRESS_STORE_AMOUNT] = {0};
1003+
static multicast_addr_t multicast_store[MULTICAST_ADDRESS_STORE_AMOUNT] = {{0}};
10041004

10051005
static void thread_border_router_multicast_store_add(thread_pbbr_t *this, uint8_t *destination_addr_ptr)
10061006
{

source/DHCPv6_client/dhcpv6_client_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void dhcp_client_global_address_delete(int8_t interface, uint8_t *dhcp_addr, uin
100100

101101
void dhcp_relay_agent_enable(int8_t interface, uint8_t border_router_address[static 16]);
102102

103-
int dhcp_client_server_address_update(int8_t interface, uint8_t prefix[static 16], uint8_t server_address[static 16]);
103+
int dhcp_client_server_address_update(int8_t interface, uint8_t *prefix, uint8_t server_address[static 16]);
104104

105105

106106

source/DHCPv6_client/dhcpv6_client_service.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ int dhcp_client_get_global_address(int8_t interface, uint8_t dhcp_addr[static 16
302302
return 0;
303303
}
304304

305-
int dhcp_client_server_address_update(int8_t interface, uint8_t prefix[static 16], uint8_t server_address[static 16])
305+
int dhcp_client_server_address_update(int8_t interface, uint8_t *prefix, uint8_t server_address[static 16])
306306
{
307307
dhcpv6_client_server_data_t *srv_data_ptr = NULL;
308308

source/Security/protocols/sec_prot_lib.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ int8_t sec_prot_lib_pmkid_calc(const uint8_t *pmk, const uint8_t *auth_eui64, co
272272
const uint8_t pmk_string_val[] = {"PMK Name"};
273273
const uint8_t pmk_string_val_len = sizeof(pmk_string_val) - 1;
274274

275-
const uint8_t data_len = pmk_string_val_len + EUI64_LEN + EUI64_LEN;
275+
uint8_t data_len = pmk_string_val_len + EUI64_LEN + EUI64_LEN;
276276
uint8_t data[data_len];
277277
uint8_t *ptr = data;
278278
memcpy(ptr, pmk_string_val, pmk_string_val_len);
@@ -294,7 +294,7 @@ int8_t sec_prot_lib_ptkid_calc(const uint8_t *ptk, const uint8_t *auth_eui64, co
294294
const uint8_t ptk_string_val[] = {"PTK Name"};
295295
const uint8_t ptk_string_val_len = sizeof(ptk_string_val) - 1;
296296

297-
const uint8_t data_len = ptk_string_val_len + EUI64_LEN + EUI64_LEN;
297+
uint8_t data_len = ptk_string_val_len + EUI64_LEN + EUI64_LEN;
298298
uint8_t data[data_len];
299299
uint8_t *ptr = data;
300300
memcpy(ptr, ptk_string_val, ptk_string_val_len);

source/libDHCPv6/libDHCPv6.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ dhcpv6_client_server_data_t *libdhcpv6_nonTemporal_entry_get_by_transactionId(ui
208208
dhcpv6_client_server_data_t *libdhcpv6_nonTemporal_entry_get_by_prefix(int8_t interfaceId, uint8_t *prefix)
209209
{
210210
ns_list_foreach(dhcpv6_client_server_data_t, cur, &dhcpv6_client_nonTemporal_list) {
211-
if ((cur->interfaceId == interfaceId)) {
211+
if (cur->interfaceId == interfaceId) {
212212
if (memcmp(cur->iaNontemporalAddress.addressPrefix, prefix, 8) == 0) {
213213
return cur;
214214
}

test/nanostack/unittest/stub/dhcpv6_client_stub.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void dhcp_client_configure(int8_t interface, bool renew_uses_solicit, bool one_c
8989

9090
}
9191

92-
int dhcp_client_server_address_update(int8_t interface, uint8_t prefix[static 16], uint8_t server_address[static 16])
92+
int dhcp_client_server_address_update(int8_t interface, uint8_t *prefix, uint8_t server_address[static 16])
9393
{
9494
return 0;
9595
}

0 commit comments

Comments
 (0)