Skip to content

Commit 5106b1d

Browse files
author
Juha Heiskanen
committed
Fixed unused variable and function warnings.
1 parent 4096c1a commit 5106b1d

File tree

7 files changed

+27
-15
lines changed

7 files changed

+27
-15
lines changed

source/6LoWPAN/Thread/thread_test_api.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ int_fast8_t arm_nwk_6lowpan_thread_test_add_neighbour(
7070
const uint8_t *id_mask,
7171
const uint8_t *route_data)
7272
{
73-
#ifdef HAVE_THREAD
73+
#ifdef HAVE_THREAD_ROUTER
7474
protocol_interface_info_entry_t *cur;
7575
cur = protocol_stack_interface_info_get_by_id(interface_id);
7676
if (!cur) {
@@ -94,7 +94,7 @@ int_fast8_t arm_nwk_6lowpan_thread_test_remove_neighbour(
9494
int8_t interface_id,
9595
uint16_t neighbour_short_addr)
9696
{
97-
#ifdef HAVE_THREAD
97+
#ifdef HAVE_THREAD_ROUTER
9898
protocol_interface_info_entry_t *cur;
9999
cur = protocol_stack_interface_info_get_by_id(interface_id);
100100
if (!cur) {
@@ -1220,7 +1220,7 @@ int8_t thread_test_initial_slaac_iid_set(int8_t interface_id, uint8_t *iid)
12201220

12211221
int8_t thread_test_router_id_request_send(int8_t interface_id, uint8_t status)
12221222
{
1223-
#ifdef HAVE_THREAD
1223+
#ifdef HAVE_THREAD_ROUTER
12241224
protocol_interface_info_entry_t *cur;
12251225

12261226
cur = protocol_stack_interface_info_get_by_id(interface_id);

source/RPL/rpl_control.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ static void rpl_control_etx_change_callback(int8_t nwk_id, uint16_t previous_et
399399
if (!cur || !cur->rpl_domain) {
400400
return;
401401
}
402+
(void) attribute_index;
402403
// ETX is "better" if now lower, or previous was "unknown" and new isn't infinite
403404
bool better = current_etx < previous_etx || (previous_etx == 0 && current_etx != 0xffff);
404405

source/Security/Common/security_lib.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@ void tls_server_hash_copy(uint8_t *ptr, tls_msg_t *tmp_msg, sec_suite_t *suite)
128128
tls_build_server_hello_msg(ptr, suite->tls_session);
129129
tls_handshake_copy(tmp_msg, t_heap);
130130
tr_debug("Pana server S-Hello,Cert hash");
131+
#else
132+
(void) ptr;
133+
(void) tmp_msg;
134+
(void) suite;
131135
#endif
132136
}
133137
#endif

source/Security/PANA/pana_server.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1721,6 +1721,8 @@ static void pana_client_authentication_fail(sec_suite_t *suite)
17211721
int8_t pana_server_nvm_callback_set(pana_server_update_cb *update_cb, pana_server_session_get_cb *nvm_get, pana_server_session_get_by_id_cb *nvm_session_get, uint8_t *nvm_static_buffer)
17221722
{
17231723
(void)update_cb;
1724+
(void)nvm_get;
1725+
(void)nvm_session_get;
17241726
(void)nvm_static_buffer;
17251727
return -1;
17261728
}

source/Security/TLS/tls_lib.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ static uint8_t tls_parse_server_key_exchange(uint8_t *ptr, uint16_t len, sec_sui
6868

6969
static uint8_t *tls_set_client_key_excange(uint8_t *ptr, sec_suite_t *tls_suite);
7070
static uint8_t tls_parse_server_hello(uint8_t *ptr, sec_suite_t *tls_suite);
71+
#ifdef PANA_SERVER_API
7172
static uint8_t tls_parse_client_hello(uint8_t *ptr, uint16_t len, sec_suite_t *tls_suite);
73+
#endif
7274
static tls_psk_key_t *tls_get_key(uint16_t key_id);
7375

7476
tls_session_t *amr_tls_session_allocate(void)
@@ -171,7 +173,7 @@ void tls_finnish_copy(uint8_t *ptr, tls_heap_t *heap_ptr)
171173

172174
}
173175

174-
uint8_t tls_parse_client_hello(uint8_t *ptr, uint16_t len, sec_suite_t *tls_suite)
176+
static uint8_t tls_parse_client_hello(uint8_t *ptr, uint16_t len, sec_suite_t *tls_suite)
175177
{
176178
uint8_t ret_val = 0, i = 0;
177179
uint16_t tls_version;
@@ -548,6 +550,7 @@ uint8_t tls_parse_server_key_exchange(uint8_t *ptr, uint16_t len, sec_suite_t *t
548550
return 0;
549551
}
550552

553+
#ifdef ECC
551554
static uint8_t tls_parse_client_key_exchange(uint8_t *ptr, uint16_t len, sec_suite_t *tls_suite)
552555
{
553556
(void)len;
@@ -567,6 +570,7 @@ static uint8_t tls_parse_client_key_exchange(uint8_t *ptr, uint16_t len, sec_sui
567570

568571
return 0;
569572
}
573+
#endif
570574

571575

572576
void tls_read_certi_signature(tls_heap_t *theap, uint8_t certificate)
@@ -589,8 +593,8 @@ void tls_read_certi_signature(tls_heap_t *theap, uint8_t certificate)
589593

590594
}
591595

592-
593-
uint8_t tls_parse_certificate_verify(uint8_t *ptr, uint16_t len, sec_suite_t *tls_suite)
596+
#ifdef ECC
597+
static uint8_t tls_parse_certificate_verify(uint8_t *ptr, uint16_t len, sec_suite_t *tls_suite)
594598
{
595599
(void)len;
596600
uint16_t sig_algh, sig_len;
@@ -653,7 +657,7 @@ uint8_t tls_parse_certificate_verify(uint8_t *ptr, uint16_t len, sec_suite_t *tl
653657
}
654658
return 1;
655659
}
656-
660+
#endif
657661

658662
tls_ecc_heap_t *ecc_allocate_ram(void)
659663
{
@@ -1690,6 +1694,7 @@ buffer_t *tls_server_up(buffer_t *buf, sec_suite_t *tls_suite)
16901694
buf = tls_certificate_buffer_store(buf, certi_rx, tls_suite);
16911695
}
16921696
#else
1697+
(void)tls_suite;
16931698
if (buf) {
16941699
buf = buffer_free(buf);
16951700
}

source/Service_Libs/nd_proxy/nd_proxy.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@ bool nd_proxy_upstream_route_onlink(int8_t downstream_id, uint8_t *address);
142142
NS_DUMMY_DEFINITIONS_OK
143143

144144
#define nd_proxy_downstream_interface_register(interface_id, nd_proxy_req, bridge_state_update) -1
145-
#define nd_proxy_downstream_interface_unregister(interface_id) -1
146-
#define nd_proxy_upstream_interface_register(interface_id, route_validation_req) -1
147-
#define nd_proxy_upstream_interface_unregister(interface_id) -1
145+
#define nd_proxy_downstream_interface_unregister(interface_id) (-1)
146+
#define nd_proxy_upstream_interface_register(interface_id, route_validation_req) (-1)
147+
#define nd_proxy_upstream_interface_unregister(interface_id) (-1)
148148
#define nd_proxy_enabled_for_downstream(interface_id) false
149149
#define nd_proxy_enabled_for_upstream(interface_id) false
150150
#define nd_proxy_target_address_validation(upstream_id, address) false

source/libNET/src/ns_net.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ int8_t arm_network_certificate_revocation_list_remove(const arm_cert_revocation_
10721072
*/
10731073
int8_t arm_network_key_get(int8_t interface_id, ns_keys_t *key)
10741074
{
1075-
#ifndef PANA
1075+
#ifndef PANA_SERVER
10761076
(void)interface_id;
10771077
(void)key;
10781078
#endif
@@ -1081,7 +1081,7 @@ int8_t arm_network_key_get(int8_t interface_id, ns_keys_t *key)
10811081

10821082
int8_t arm_pana_server_library_init(int8_t interface_id, net_tls_cipher_e cipher_mode, const uint8_t *key_material, uint32_t time_period_before_activate_key)
10831083
{
1084-
#ifndef PANA
1084+
#ifndef PANA_SERVER
10851085
(void)interface_id;
10861086
(void)cipher_mode;
10871087
(void)key_material;
@@ -1092,15 +1092,15 @@ int8_t arm_pana_server_library_init(int8_t interface_id, net_tls_cipher_e cipher
10921092

10931093
int8_t arm_pana_activate_new_key(int8_t interface_id)
10941094
{
1095-
#ifndef PANA
1095+
#ifndef PANA_SERVER
10961096
(void)interface_id;
10971097
#endif
10981098
return pana_server_trig_new_key(interface_id);
10991099
}
11001100

11011101
int8_t arm_pana_server_key_update(int8_t interface_id, const uint8_t *network_key_material)
11021102
{
1103-
#ifndef PANA
1103+
#ifndef PANA_SERVER
11041104
(void)interface_id;
11051105
(void)network_key_material;
11061106
#endif
@@ -1199,7 +1199,7 @@ int8_t arm_6lowpan_bootsrap_set_for_selected_interface(int8_t interface_id)
11991199
int8_t arm_nwk_interface_configure_6lowpan_bootstrap_set(int8_t interface_id, net_6lowpan_mode_e bootstrap_mode, net_6lowpan_mode_extension_e net_6lowpan_mode_extension)
12001200
{
12011201
int8_t ret_val;
1202-
1202+
(void)bootstrap_mode;
12031203
ret_val = arm_6lowpan_bootsrap_set_for_selected_interface(interface_id);
12041204

12051205
if (ret_val == 0) {

0 commit comments

Comments
 (0)