Skip to content

Commit

Permalink
Fix warning found by PVS-studio (ARMmbed#1891)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Arto Kinnunen authored and deepakvenugopal committed Nov 2, 2018
1 parent 399f02f commit f919fd1
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 18 deletions.
34 changes: 17 additions & 17 deletions source/6LoWPAN/Thread/thread_extension.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,31 +66,31 @@ uint8_t thread_extension_discover_response_len(protocol_interface_info_entry_t *
uint8_t *thread_extension_discover_response_write(protocol_interface_info_entry_t *cur, uint8_t *ptr);

#else
#define thread_extension_joining_enabled(interface_id) false
#define thread_extension_discover_response_len(cur) 0
#define thread_extension_joining_enabled(interface_id) (false)
#define thread_extension_discover_response_len(cur) (0)
#define thread_extension_discover_response_write(cur, ptr) (ptr)
#endif //HAVE_THREAD_ROUTER
#else

#define thread_extension_allocate(cur)
#define thread_extension_free(cur)
#define thread_extension_init(interface_id,coap_service_id)
#define thread_extension_network_data_process(cur)
#define thread_extension_allocate(cur) ((void) 0)
#define thread_extension_free(cur) ((void) 0)
#define thread_extension_init(interface_id,coap_service_id) ((void) 0)
#define thread_extension_network_data_process(cur) ((void) 0)
#define thread_extension_primary_bbr_get(cur,addr_ptr,seq_ptr,timer1_ptr, timer2_ptr) (-1)
#define thread_extension_address_registration(interface,addr,child_mac64,refresh_child_entry,duplicate_child_detected)
#define thread_extension_aloc_generate(cur)
#define thread_extension_aloc_map(cur, addr16) false
#define thread_extension_mcast_subscrition_change(interface)
#define thread_extension_address_registration(interface,addr,child_mac64,refresh_child_entry,duplicate_child_detected) ((void) 0)
#define thread_extension_aloc_generate(cur) ((void) 0)
#define thread_extension_aloc_map(cur, addr16) (false)
#define thread_extension_mcast_subscrition_change(interface) ((void) 0)
#define thread_extension_enabled(cur) (false)
#define thread_extension_version_check(version) (false)
#define thread_extension_discover_response_read(nwk_info, discover_response_tlv, data_ptr, data_len)
#define thread_extension_discover_response_tlv_write(data, version, extension_bit) (data)
#define thread_extension_service_init(cur) 0
#define thread_extension_joining_enabled(interface_id) false
#define thread_extension_discover_response_len(cur) 0
#define thread_extension_discover_response_read(nwk_info, discover_response_tlv, data_ptr, data_len) ((void) 0)
#define thread_extension_discover_response_tlv_write(data, version, securityPolicy) ((void) 0)
#define thread_extension_service_init(cur) (0)
#define thread_extension_joining_enabled(interface_id) (false)
#define thread_extension_discover_response_len(cur) (0)
#define thread_extension_discover_response_write(cur, ptr) (ptr)
#define thread_extension_addr_ntf_send(cur,destination_address,addr_data_ptr,bbr_status)
#define thread_extension_dua_address_generate(cur, domain_prefix, domain_prefix_len)
#define thread_extension_addr_ntf_send(cur,destination_address,addr_data_ptr,bbr_status) ((void) 0)
#define thread_extension_dua_address_generate(cur, domain_prefix, domain_prefix_len) ((void) 0)
#endif

#ifdef __cplusplus
Expand Down
4 changes: 3 additions & 1 deletion source/6LoWPAN/Thread/thread_network_data_storage.c
Original file line number Diff line number Diff line change
Expand Up @@ -2348,7 +2348,9 @@ bool thread_nd_service_anycast_address_mapping_from_network_data(thread_network_
if (curService->S_id != S_id) {
continue;
}
ns_list_foreach(thread_network_data_service_server_entry_t, curServiceServer, &curService->server_list) {
/* any server will do - take first from the list */
thread_network_data_service_server_entry_t *curServiceServer = ns_list_get_first(&curService->server_list);
if (curServiceServer) {
*rlocAddress = curServiceServer->router_id;
return true;
}
Expand Down

0 comments on commit f919fd1

Please sign in to comment.