Fix compiler warnings (ARMmbed#1740)

Arto Kinnunen · web-flow · commit f9b23d47b785 · 2018-07-05T13:49:05.000+03:00
Fix IAR compiler warnings: -Warning[Pe188]: enumerated type mixed with another type -Warning[Pe177]: variable "ret" was declared but never referenced Fix ARM compiler warning: -warning: ARMmbed#1295-D: Deprecated declaration thread_router_bootstrap_ random_upgrade_jitter - give arg types -warning: ARMmbed#68-D: integer conversion resulted in a change of sign -warning: ARMmbed#111-D: statement is unreachable -Do not use multicast address to indicate error.
diff --git a/source/6LoWPAN/Thread/thread_extension.c b/source/6LoWPAN/Thread/thread_extension.c
@@ -698,7 +698,6 @@ static void thread_extension_relay_socket_cb(void *cb_res)
     uint16_t payload_len;
     char *destination_uri_ptr = THREAD_URI_RELAY_RECEIVE;
     sckt_data = cb_res;
-    int ret MAYBE_UNUSED = -1;
 
     protocol_interface_info_entry_t *cur = protocol_stack_interface_info_get_by_id(sckt_data->interface_id);
 
diff --git a/source/6LoWPAN/Thread/thread_router_bootstrap.c b/source/6LoWPAN/Thread/thread_router_bootstrap.c
@@ -1216,7 +1216,7 @@ uint16_t thread_router_bootstrap_child_count_get(protocol_interface_info_entry_t
     }
     mle_neigh_table_list_t *mle_table = mle_class_active_list_get(cur->id);
     if (!mle_table) {
-        return -1;
+        return 0;
     }
     ns_list_foreach(mle_neigh_table_entry_t, cur_entry, mle_table) {
         if (thread_router_addr_from_addr(cur_entry->short_adr) == router_address) {
@@ -1230,12 +1230,12 @@ static uint16_t thread_router_bootstrap_child_address_generate(protocol_interfac
 {
     mle_neigh_table_list_t *mle_table = mle_class_active_list_get(cur->id);
     if (!mle_table) {
-        return -1;
+        return 0xfffe;
     }
 
     if (thread_router_bootstrap_child_count_get(cur) >= cur->thread_info->maxChildCount) {
         tr_info("Maximum count %d reached", cur->thread_info->maxChildCount);
-        return 0xffff;
+        return 0xfffe;
     }
 
     bool address_allocated = false;
@@ -1254,24 +1254,24 @@ static uint16_t thread_router_bootstrap_child_address_generate(protocol_interfac
     }
     if (address_allocated){
         // all possible addresses already allocated
-        return 0xffff;
+        return 0xfffe;
     }
     return ((mac_helper_mac16_address_get(cur) & THREAD_ROUTER_MASK) | cur->thread_info->lastAllocatedChildAddress);
 }
 
 static bool thread_child_id_request(protocol_interface_info_entry_t *cur, mle_neigh_table_entry_t *entry_temp)
 {
         //Remove All Short address links from router
-        if (entry_temp->short_adr != 0xffff) {
+        if (entry_temp->short_adr < 0xfffe) {
             protocol_6lowpan_release_short_link_address_from_neighcache(cur, entry_temp->short_adr);
         }
 
-        //allocate child address if current is router, 0xffff or not our child
+        //allocate child address if current is router, >0xfffe or not our child
         if (!thread_addr_is_child(mac_helper_mac16_address_get(cur), entry_temp->short_adr)) {
             entry_temp->short_adr = thread_router_bootstrap_child_address_generate(cur);
         }
 
-        if (entry_temp->short_adr == 0xffff) {
+        if (entry_temp->short_adr >= 0xfffe) {
             return false;
         }
 
@@ -1900,9 +1900,9 @@ void thread_router_bootstrap_mle_receive_cb(int8_t interface_id, mle_message_t *
                     uint32_t timeout = 0;
                     uint64_t active_timestamp = 0;
                     uint64_t pending_timestamp = 0;
-                    mle_tlv_info_t addressRegisterTlv = {0};
-                    mle_tlv_info_t challengeTlv = {0};
-                    mle_tlv_info_t tlv_req = {0};
+                    mle_tlv_info_t addressRegisterTlv = {.tlvType = MLE_TYPE_SRC_ADDRESS};
+                    mle_tlv_info_t challengeTlv = {.tlvType = MLE_TYPE_SRC_ADDRESS};
+                    mle_tlv_info_t tlv_req = {.tlvType = MLE_TYPE_SRC_ADDRESS};
                     entry_temp = mle_class_get_entry_by_ll64(cur->id, linkMargin, mle_msg->packet_src_address, false, NULL);
 
                     if (mle_tlv_read_8_bit_tlv(MLE_TYPE_STATUS, mle_msg->data_ptr, mle_msg->data_length, &status)) {
diff --git a/source/6LoWPAN/Thread/thread_router_bootstrap.h b/source/6LoWPAN/Thread/thread_router_bootstrap.h
@@ -64,7 +64,7 @@ void thread_router_bootstrap_active_router_attach(struct protocol_interface_info
 int thread_router_bootstrap_route_tlv_push(protocol_interface_info_entry_t *cur, uint8_t *route_tlv, uint8_t route_len, uint8_t linkMargin, mle_neigh_table_entry_t *entry);
 void thread_router_bootstrap_mle_receive_cb(int8_t interface_id, mle_message_t *mle_msg, struct mle_security_header *security_headers);
 void thread_router_bootstrap_timer(protocol_interface_info_entry_t *cur, uint32_t ticks);
-uint32_t thread_router_bootstrap_random_upgrade_jitter();
+uint32_t thread_router_bootstrap_random_upgrade_jitter(void);
 void thread_router_bootstrap_advertiment_analyze(protocol_interface_info_entry_t *cur, uint8_t *src_address, mle_neigh_table_entry_t *entry_temp, uint16_t shortAddress);
 
 void thread_router_bootstrap_multicast_forwarder_enable(protocol_interface_info_entry_t *cur, buffer_t *buf);
diff --git a/source/6LoWPAN/Thread/thread_routing.c b/source/6LoWPAN/Thread/thread_routing.c
@@ -183,7 +183,7 @@ static inline thread_link_quality_e thread_quality_combine(thread_link_quality_e
 /* Return the quality (worse of incoming and outgoing quality) for a neighbour router */
 static inline thread_link_quality_e thread_neighbour_router_quality(const thread_router_link_t *neighbour)
 {
-    return thread_quality_combine(neighbour->incoming_quality, neighbour->outgoing_quality);
+    return thread_quality_combine((thread_link_quality_e) neighbour->incoming_quality, (thread_link_quality_e) neighbour->outgoing_quality);
 }
 
 
@@ -690,8 +690,8 @@ int_fast8_t thread_routing_add_link(protocol_interface_info_entry_t *cur,
         if (our_quality_to_other_neighbour < QUALITY_10dB) {
             continue;
         }
-        thread_link_quality_e neighbours_incoming_quality_to_other_neighbour = (byte & ROUTE_DATA_IN_MASK) >> ROUTE_DATA_IN_SHIFT;
-        thread_link_quality_e neighbours_outgoing_quality_to_other_neighbour = (byte & ROUTE_DATA_OUT_MASK) >> ROUTE_DATA_OUT_SHIFT;
+        thread_link_quality_e neighbours_incoming_quality_to_other_neighbour = (thread_link_quality_e) ((byte & ROUTE_DATA_IN_MASK) >> ROUTE_DATA_IN_SHIFT);
+        thread_link_quality_e neighbours_outgoing_quality_to_other_neighbour = (thread_link_quality_e) ((byte & ROUTE_DATA_OUT_MASK) >> ROUTE_DATA_OUT_SHIFT);
         thread_link_quality_e neighbours_quality_to_other_neighbour = thread_quality_combine(neighbours_incoming_quality_to_other_neighbour,
                                                                                              neighbours_outgoing_quality_to_other_neighbour);
         if (neighbours_quality_to_other_neighbour < our_quality_to_other_neighbour) {
diff --git a/source/MAC/IEEE802_15_4/mac_mcps_sap.c b/source/MAC/IEEE802_15_4/mac_mcps_sap.c
@@ -227,8 +227,8 @@ static int8_t mac_virtual_mlme_nap_req_handler(protocol_interface_rf_mac_setup_s
             }
 
             mlme_scan_t mlme_scan_req;
-            mlme_scan_req.ScanType = *ptr++;
-            mlme_scan_req.ScanChannels.channel_page = *ptr++;
+            mlme_scan_req.ScanType = (mac_scan_type_t) *ptr++;
+            mlme_scan_req.ScanChannels.channel_page = (channel_page_e) *ptr++;
             memcpy(mlme_scan_req.ScanChannels.channel_mask, ptr, 32);
             ptr += 32;
             mlme_scan_req.ScanDuration = *ptr++;
@@ -239,14 +239,13 @@ static int8_t mac_virtual_mlme_nap_req_handler(protocol_interface_rf_mac_setup_s
             memcpy(mlme_scan_req.Key.Keysource, ptr, 8);
             mac_mlme_scan_request(&mlme_scan_req, rf_mac_setup);
             return 0;
-            break;
         }
         case MLME_SET:{
             if (mlme_req->ptr_length < 3) {
                 return -1;
             }
             mlme_set_t mlme_set_req;
-            mlme_set_req.attr = *ptr++;
+            mlme_set_req.attr = (mlme_attr_t) *ptr++;
             mlme_set_req.attr_index = *ptr++;
             mlme_set_req.value_pointer = ptr;
             mlme_set_req.value_size = mlme_req->ptr_length - 2;
diff --git a/source/MAC/IEEE802_15_4/mac_mlme.c b/source/MAC/IEEE802_15_4/mac_mlme.c
@@ -1255,7 +1255,7 @@ int8_t mac_mlme_virtual_confirmation_handle(int8_t driver_id, const uint8_t *dat
     if (!mac_setup) {
         return -1;
     }
-    mlme_primitive primitive = *data_ptr;
+    mlme_primitive primitive = (mlme_primitive) *data_ptr;
     if (primitive == MLME_SCAN) {
         mlme_scan_conf_t *resp = ns_dyn_mem_temporary_alloc(sizeof(mlme_scan_conf_t));
         if (!resp) {
diff --git a/source/MAC/virtual_rf/virtual_rf_client.c b/source/MAC/virtual_rf/virtual_rf_client.c
@@ -138,7 +138,7 @@ static int8_t phy_rf_virtual_rx(const uint8_t *data_ptr, uint16_t data_len,int8_
                 return -1;
             }
             phy_msg.id = MACTUN_MLME_NAP_EXTENSION;
-            phy_msg.message.mlme_request.primitive = *data_ptr++;
+            phy_msg.message.mlme_request.primitive = (mlme_primitive) *data_ptr++;
             phy_msg.message.mlme_request.mlme_ptr = data_ptr;
             phy_msg.message.mlme_request.ptr_length = (data_len - 2);
 
diff --git a/source/Service_Libs/mdns/ns_fnet_port.c b/source/Service_Libs/mdns/ns_fnet_port.c
@@ -131,7 +131,7 @@ fnet_socket_t fnet_socket(fnet_address_family_t family, fnet_socket_type_t type,
 fnet_return_t fnet_socket_bind( fnet_socket_t s, const struct sockaddr *name, fnet_size_t namelen )
 {
     (void)namelen;
-    ns_address_t ns_source_addr = {0};
+    ns_address_t ns_source_addr;
     int8_t socket_id = (int8_t)(long)s;
     fnet_return_t fnet_ret_val = FNET_ERR;
     const struct sockaddr_in6 *namein6 = (const struct sockaddr_in6 *) name;
diff --git a/source/libNET/src/multicast_api.c b/source/libNET/src/multicast_api.c
@@ -185,7 +185,7 @@ int_fast8_t multicast_mpl_set_default_parameters(int8_t interface_id,
                                                  uint8_t control_message_k,
                                                  uint8_t control_message_timer_expirations)
 {
-    protocol_interface_info_entry_t *interface = protocol_stack_interface_info_get(interface_id);
+    protocol_interface_info_entry_t *interface = protocol_stack_interface_info_get_by_id(interface_id);
     if (!interface) {
         return -1;
     }

Original file line number	Diff line number	Diff line change
`@@ -1216,7 +1216,7 @@ uint16_t thread_router_bootstrap_child_count_get(protocol_interface_info_entry_t`
`1216`	`1216`	`}`
`1217`	`1217`	`mle_neigh_table_list_t *mle_table = mle_class_active_list_get(cur->id);`
`1218`	`1218`	`if (!mle_table) {`
`1219`		`- return -1;`
	`1219`	`+ return 0;`
`1220`	`1220`	`}`
`1221`	`1221`	`ns_list_foreach(mle_neigh_table_entry_t, cur_entry, mle_table) {`
`1222`	`1222`	`if (thread_router_addr_from_addr(cur_entry->short_adr) == router_address) {`
`@@ -1230,12 +1230,12 @@ static uint16_t thread_router_bootstrap_child_address_generate(protocol_interfac`
`1230`	`1230`	`{`
`1231`	`1231`	`mle_neigh_table_list_t *mle_table = mle_class_active_list_get(cur->id);`
`1232`	`1232`	`if (!mle_table) {`
`1233`		`- return -1;`
	`1233`	`+ return 0xfffe;`
`1234`	`1234`	`}`
`1235`	`1235`
`1236`	`1236`	`if (thread_router_bootstrap_child_count_get(cur) >= cur->thread_info->maxChildCount) {`
`1237`	`1237`	`tr_info("Maximum count %d reached", cur->thread_info->maxChildCount);`
`1238`		`- return 0xffff;`
	`1238`	`+ return 0xfffe;`
`1239`	`1239`	`}`
`1240`	`1240`
`1241`	`1241`	`bool address_allocated = false;`
`@@ -1254,24 +1254,24 @@ static uint16_t thread_router_bootstrap_child_address_generate(protocol_interfac`
`1254`	`1254`	`}`
`1255`	`1255`	`if (address_allocated){`
`1256`	`1256`	`// all possible addresses already allocated`
`1257`		`- return 0xffff;`
	`1257`	`+ return 0xfffe;`
`1258`	`1258`	`}`
`1259`	`1259`	`return ((mac_helper_mac16_address_get(cur) & THREAD_ROUTER_MASK) \| cur->thread_info->lastAllocatedChildAddress);`
`1260`	`1260`	`}`
`1261`	`1261`
`1262`	`1262`	`static bool thread_child_id_request(protocol_interface_info_entry_t cur, mle_neigh_table_entry_t entry_temp)`
`1263`	`1263`	`{`
`1264`	`1264`	`//Remove All Short address links from router`
`1265`		`- if (entry_temp->short_adr != 0xffff) {`
	`1265`	`+ if (entry_temp->short_adr < 0xfffe) {`
`1266`	`1266`	`protocol_6lowpan_release_short_link_address_from_neighcache(cur, entry_temp->short_adr);`
`1267`	`1267`	`}`
`1268`	`1268`
`1269`		`- //allocate child address if current is router, 0xffff or not our child`
	`1269`	`+ //allocate child address if current is router, >0xfffe or not our child`
`1270`	`1270`	`if (!thread_addr_is_child(mac_helper_mac16_address_get(cur), entry_temp->short_adr)) {`
`1271`	`1271`	`entry_temp->short_adr = thread_router_bootstrap_child_address_generate(cur);`
`1272`	`1272`	`}`
`1273`	`1273`
`1274`		`- if (entry_temp->short_adr == 0xffff) {`
	`1274`	`+ if (entry_temp->short_adr >= 0xfffe) {`
`1275`	`1275`	`return false;`
`1276`	`1276`	`}`
`1277`	`1277`
`@@ -1900,9 +1900,9 @@ void thread_router_bootstrap_mle_receive_cb(int8_t interface_id, mle_message_t *`
`1900`	`1900`	`uint32_t timeout = 0;`
`1901`	`1901`	`uint64_t active_timestamp = 0;`
`1902`	`1902`	`uint64_t pending_timestamp = 0;`
`1903`		`- mle_tlv_info_t addressRegisterTlv = {0};`
`1904`		`- mle_tlv_info_t challengeTlv = {0};`
`1905`		`- mle_tlv_info_t tlv_req = {0};`
	`1903`	`+ mle_tlv_info_t addressRegisterTlv = {.tlvType = MLE_TYPE_SRC_ADDRESS};`
	`1904`	`+ mle_tlv_info_t challengeTlv = {.tlvType = MLE_TYPE_SRC_ADDRESS};`
	`1905`	`+ mle_tlv_info_t tlv_req = {.tlvType = MLE_TYPE_SRC_ADDRESS};`
`1906`	`1906`	`entry_temp = mle_class_get_entry_by_ll64(cur->id, linkMargin, mle_msg->packet_src_address, false, NULL);`
`1907`	`1907`
`1908`	`1908`	`if (mle_tlv_read_8_bit_tlv(MLE_TYPE_STATUS, mle_msg->data_ptr, mle_msg->data_length, &status)) {`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ static inline thread_link_quality_e thread_quality_combine(thread_link_quality_e`
`183`	`183`	`/* Return the quality (worse of incoming and outgoing quality) for a neighbour router */`
`184`	`184`	`static inline thread_link_quality_e thread_neighbour_router_quality(const thread_router_link_t *neighbour)`
`185`	`185`	`{`
`186`		`- return thread_quality_combine(neighbour->incoming_quality, neighbour->outgoing_quality);`
	`186`	`+ return thread_quality_combine((thread_link_quality_e) neighbour->incoming_quality, (thread_link_quality_e) neighbour->outgoing_quality);`
`187`	`187`	`}`
`188`	`188`
`189`	`189`
`@@ -690,8 +690,8 @@ int_fast8_t thread_routing_add_link(protocol_interface_info_entry_t *cur,`
`690`	`690`	`if (our_quality_to_other_neighbour < QUALITY_10dB) {`
`691`	`691`	`continue;`
`692`	`692`	`}`
`693`		`- thread_link_quality_e neighbours_incoming_quality_to_other_neighbour = (byte & ROUTE_DATA_IN_MASK) >> ROUTE_DATA_IN_SHIFT;`
`694`		`- thread_link_quality_e neighbours_outgoing_quality_to_other_neighbour = (byte & ROUTE_DATA_OUT_MASK) >> ROUTE_DATA_OUT_SHIFT;`
	`693`	`+ thread_link_quality_e neighbours_incoming_quality_to_other_neighbour = (thread_link_quality_e) ((byte & ROUTE_DATA_IN_MASK) >> ROUTE_DATA_IN_SHIFT);`
	`694`	`+ thread_link_quality_e neighbours_outgoing_quality_to_other_neighbour = (thread_link_quality_e) ((byte & ROUTE_DATA_OUT_MASK) >> ROUTE_DATA_OUT_SHIFT);`
`695`	`695`	`thread_link_quality_e neighbours_quality_to_other_neighbour = thread_quality_combine(neighbours_incoming_quality_to_other_neighbour,`
`696`	`696`	`neighbours_outgoing_quality_to_other_neighbour);`
`697`	`697`	`if (neighbours_quality_to_other_neighbour < our_quality_to_other_neighbour) {`
Original file line number	Diff line number	Diff line change
`@@ -1255,7 +1255,7 @@ int8_t mac_mlme_virtual_confirmation_handle(int8_t driver_id, const uint8_t *dat`
`1255`	`1255`	`if (!mac_setup) {`
`1256`	`1256`	`return -1;`
`1257`	`1257`	`}`
`1258`		`- mlme_primitive primitive = *data_ptr;`
	`1258`	`+ mlme_primitive primitive = (mlme_primitive) *data_ptr;`
`1259`	`1259`	`if (primitive == MLME_SCAN) {`
`1260`	`1260`	`mlme_scan_conf_t *resp = ns_dyn_mem_temporary_alloc(sizeof(mlme_scan_conf_t));`
`1261`	`1261`	`if (!resp) {`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ static int8_t phy_rf_virtual_rx(const uint8_t *data_ptr, uint16_t data_len,int8_`
`138`	`138`	`return -1;`
`139`	`139`	`}`
`140`	`140`	`phy_msg.id = MACTUN_MLME_NAP_EXTENSION;`
`141`		`- phy_msg.message.mlme_request.primitive = *data_ptr++;`
	`141`	`+ phy_msg.message.mlme_request.primitive = (mlme_primitive) *data_ptr++;`
`142`	`142`	`phy_msg.message.mlme_request.mlme_ptr = data_ptr;`
`143`	`143`	`phy_msg.message.mlme_request.ptr_length = (data_len - 2);`
`144`	`144`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ fnet_socket_t fnet_socket(fnet_address_family_t family, fnet_socket_type_t type,`
`131`	`131`	`fnet_return_t fnet_socket_bind( fnet_socket_t s, const struct sockaddr *name, fnet_size_t namelen )`
`132`	`132`	`{`
`133`	`133`	`(void)namelen;`
`134`		`- ns_address_t ns_source_addr = {0};`
	`134`	`+ ns_address_t ns_source_addr;`
`135`	`135`	`int8_t socket_id = (int8_t)(long)s;`
`136`	`136`	`fnet_return_t fnet_ret_val = FNET_ERR;`
`137`	`137`	`const struct sockaddr_in6 namein6 = (const struct sockaddr_in6 ) name;`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ int_fast8_t multicast_mpl_set_default_parameters(int8_t interface_id,`
`185`	`185`	`uint8_t control_message_k,`
`186`	`186`	`uint8_t control_message_timer_expirations)`
`187`	`187`	`{`
`188`		`- protocol_interface_info_entry_t *interface = protocol_stack_interface_info_get(interface_id);`
	`188`	`+ protocol_interface_info_entry_t *interface = protocol_stack_interface_info_get_by_id(interface_id);`
`189`	`189`	`if (!interface) {`
`190`	`190`	`return -1;`
`191`	`191`	`}`