Skip to content

Commit f919fd1

Browse files
Arto Kinnunendeepakvenugopal
authored andcommitted
Fix warning found by PVS-studio (ARMmbed#1891)
Fix warning "V612 CWE-670 An unconditional 'return' within a loop." by removing unnecessary inner loop and use first element directly. Fix warning "V607 Ownerless expression '& discover_response_tlv'." by adjusting macro parameters.
1 parent 399f02f commit f919fd1

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

source/6LoWPAN/Thread/thread_extension.h

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -66,31 +66,31 @@ uint8_t thread_extension_discover_response_len(protocol_interface_info_entry_t *
6666
uint8_t *thread_extension_discover_response_write(protocol_interface_info_entry_t *cur, uint8_t *ptr);
6767

6868
#else
69-
#define thread_extension_joining_enabled(interface_id) false
70-
#define thread_extension_discover_response_len(cur) 0
69+
#define thread_extension_joining_enabled(interface_id) (false)
70+
#define thread_extension_discover_response_len(cur) (0)
7171
#define thread_extension_discover_response_write(cur, ptr) (ptr)
7272
#endif //HAVE_THREAD_ROUTER
7373
#else
7474

75-
#define thread_extension_allocate(cur)
76-
#define thread_extension_free(cur)
77-
#define thread_extension_init(interface_id,coap_service_id)
78-
#define thread_extension_network_data_process(cur)
75+
#define thread_extension_allocate(cur) ((void) 0)
76+
#define thread_extension_free(cur) ((void) 0)
77+
#define thread_extension_init(interface_id,coap_service_id) ((void) 0)
78+
#define thread_extension_network_data_process(cur) ((void) 0)
7979
#define thread_extension_primary_bbr_get(cur,addr_ptr,seq_ptr,timer1_ptr, timer2_ptr) (-1)
80-
#define thread_extension_address_registration(interface,addr,child_mac64,refresh_child_entry,duplicate_child_detected)
81-
#define thread_extension_aloc_generate(cur)
82-
#define thread_extension_aloc_map(cur, addr16) false
83-
#define thread_extension_mcast_subscrition_change(interface)
80+
#define thread_extension_address_registration(interface,addr,child_mac64,refresh_child_entry,duplicate_child_detected) ((void) 0)
81+
#define thread_extension_aloc_generate(cur) ((void) 0)
82+
#define thread_extension_aloc_map(cur, addr16) (false)
83+
#define thread_extension_mcast_subscrition_change(interface) ((void) 0)
8484
#define thread_extension_enabled(cur) (false)
8585
#define thread_extension_version_check(version) (false)
86-
#define thread_extension_discover_response_read(nwk_info, discover_response_tlv, data_ptr, data_len)
87-
#define thread_extension_discover_response_tlv_write(data, version, extension_bit) (data)
88-
#define thread_extension_service_init(cur) 0
89-
#define thread_extension_joining_enabled(interface_id) false
90-
#define thread_extension_discover_response_len(cur) 0
86+
#define thread_extension_discover_response_read(nwk_info, discover_response_tlv, data_ptr, data_len) ((void) 0)
87+
#define thread_extension_discover_response_tlv_write(data, version, securityPolicy) ((void) 0)
88+
#define thread_extension_service_init(cur) (0)
89+
#define thread_extension_joining_enabled(interface_id) (false)
90+
#define thread_extension_discover_response_len(cur) (0)
9191
#define thread_extension_discover_response_write(cur, ptr) (ptr)
92-
#define thread_extension_addr_ntf_send(cur,destination_address,addr_data_ptr,bbr_status)
93-
#define thread_extension_dua_address_generate(cur, domain_prefix, domain_prefix_len)
92+
#define thread_extension_addr_ntf_send(cur,destination_address,addr_data_ptr,bbr_status) ((void) 0)
93+
#define thread_extension_dua_address_generate(cur, domain_prefix, domain_prefix_len) ((void) 0)
9494
#endif
9595

9696
#ifdef __cplusplus

source/6LoWPAN/Thread/thread_network_data_storage.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2348,7 +2348,9 @@ bool thread_nd_service_anycast_address_mapping_from_network_data(thread_network_
23482348
if (curService->S_id != S_id) {
23492349
continue;
23502350
}
2351-
ns_list_foreach(thread_network_data_service_server_entry_t, curServiceServer, &curService->server_list) {
2351+
/* any server will do - take first from the list */
2352+
thread_network_data_service_server_entry_t *curServiceServer = ns_list_get_first(&curService->server_list);
2353+
if (curServiceServer) {
23522354
*rlocAddress = curServiceServer->router_id;
23532355
return true;
23542356
}

0 commit comments

Comments
 (0)