Fix armc6 compiler warnings

Arto Kinnunen · Arto Kinnunen · commit 924acad3bd84 · 2019-03-27T16:05:28.000+02:00
- use of logical '||' with constant operand
- null passed to a callee that requires a non-null argument
- array argument is too small; contains 8 elements, callee requires
  at least 16
- implicit conversion from 'long long' to 'uint32_t'
- equality comparison with extraneous parentheses
diff --git a/source/6LoWPAN/Thread/thread_bootstrap.c b/source/6LoWPAN/Thread/thread_bootstrap.c
@@ -2540,7 +2540,7 @@ int thread_bootstrap_network_data_process(protocol_interface_info_entry_t *cur,
                                                         } else {
                                                             tr_debug("SLAAC address set as NOT preferred.");
                                                         }
-                                                        addr_set_preferred_lifetime(cur, e, genericService.P_preferred ? 0xfffffffff : 0);
+                                                        addr_set_preferred_lifetime(cur, e, genericService.P_preferred ? 0xffffffff : 0);
                                                     }
                                                 }
                                             }
diff --git a/source/6LoWPAN/Thread/thread_joiner_application.c b/source/6LoWPAN/Thread/thread_joiner_application.c
@@ -519,8 +519,8 @@ static void device_configuration_validate(device_configuration_s *this)
         this->vendor_stack_version[1] = (uint8_t)(THREAD_ARM_OUI >> 8);
         this->vendor_stack_version[2] = (uint8_t)(THREAD_ARM_OUI);
         this->vendor_stack_version[3] = (uint8_t)(THREAD_BUILD_NUMBER >> 4);
-        this->vendor_stack_version[4] = (uint8_t)(((THREAD_BUILD_NUMBER & 0x0f) << 4) || THREAD_REVISION_NUMBER);
-        this->vendor_stack_version[5] = (uint8_t)((THREAD_VERSION_MIN  << 4) || THREAD_VERSION_MAJ);
+        this->vendor_stack_version[4] = (uint8_t)(((THREAD_BUILD_NUMBER & 0x0f) << 4) + THREAD_REVISION_NUMBER);
+        this->vendor_stack_version[5] = (uint8_t)((THREAD_VERSION_MIN  << 4) + THREAD_VERSION_MAJ);
     }
 }
 
diff --git a/source/DHCPv6_Server/DHCPv6_Server_service.c b/source/DHCPv6_Server/DHCPv6_Server_service.c
@@ -272,7 +272,7 @@ void DHCPv6_server_service_timeout_cb(uint32_t timeUpdateInSeconds)
  *  /param guaPrefix Prefix which will be removed
  *  /param delete_gua_addresses Whether or not assigned addresses with the prefix should be removed from the interface.
  */
-void DHCPv6_server_service_delete(int8_t interface, uint8_t guaPrefix[static 16], bool delete_gua_addresses)
+void DHCPv6_server_service_delete(int8_t interface, uint8_t guaPrefix[static 8], bool delete_gua_addresses)
 {
     dhcpv6_gua_server_entry_s *serverInfo = libdhcpv6_server_data_get_by_prefix_and_interfaceid(interface, guaPrefix);
     if (serverInfo) {
@@ -390,7 +390,7 @@ int DHCPv6_server_service_init(int8_t interface, uint8_t guaPrefix[static 16], u
 
     return -1;
 }
-void DHCPv6_server_service_delete(int8_t interface, uint8_t guaPrefix[static 16], bool delete_gua_addresses)
+void DHCPv6_server_service_delete(int8_t interface, uint8_t guaPrefix[static 8], bool delete_gua_addresses)
 {
     (void) interface;
     (void) guaPrefix;
diff --git a/source/DHCPv6_Server/DHCPv6_server_service.h b/source/DHCPv6_Server/DHCPv6_server_service.h
@@ -54,7 +54,7 @@ void DHCPv6_server_service_callback_set(int8_t interface, uint8_t guaPrefix[stat
  *  /param guaPrefix Prefix which will be removed
  *  /param delete_gua_addresses Whether or not assigned addresses with the prefix should be removed from the interface.
  */
-void DHCPv6_server_service_delete(int8_t interface, uint8_t guaPrefix[static 16], bool delete_gua_addresses);
+void DHCPv6_server_service_delete(int8_t interface, uint8_t guaPrefix[static 8], bool delete_gua_addresses);
 
 
 void DHCPv6_server_service_timeout_cb(uint32_t timeUpdateInSeconds);
diff --git a/source/DHCPv6_client/dhcpv6_client_api.h b/source/DHCPv6_client/dhcpv6_client_api.h
@@ -92,7 +92,7 @@ void dhcp_client_global_address_renew(int8_t interface);
  * /param prefix dhcp server ML16 address where address is registered.
  *
  */
-void dhcp_client_global_address_delete(int8_t interface, uint8_t dhcp_addr[static 16], uint8_t prefix[static 16]);
+void dhcp_client_global_address_delete(int8_t interface, uint8_t *dhcp_addr, uint8_t prefix[static 16]);
 
 
 void dhcp_relay_agent_enable(int8_t interface, uint8_t border_router_address[static 16]);
diff --git a/source/DHCPv6_client/dhcpv6_client_service.c b/source/DHCPv6_client/dhcpv6_client_service.c
@@ -272,7 +272,7 @@ void dhcp_client_global_address_renew(int8_t interface)
     return;
 }
 
-void dhcp_client_global_address_delete(int8_t interface, uint8_t dhcp_addr[static 16], uint8_t prefix[static 16])
+void dhcp_client_global_address_delete(int8_t interface, uint8_t *dhcp_addr, uint8_t prefix[static 16])
 {
     protocol_interface_info_entry_t *cur;
     dhcpv6_client_server_data_t *srv_data_ptr;
diff --git a/source/Security/TLS/tls_lib.c b/source/Security/TLS/tls_lib.c
@@ -1161,7 +1161,7 @@ buffer_t *tls_client_up(buffer_t *buf, sec_suite_t *tls_suite)
         if (tls_header_ptr) {
             if (tls_header_ptr->type == TLS_HANDSHAKE && (tls_heap != 0)) {
                 tr_debug("Type:Handshake");
-                if ((tls_suite->state == TLS_CHANGE_CHIPHER)) {
+                if (tls_suite->state == TLS_CHANGE_CHIPHER) {
                     if (tls_header_ptr->length < 32) {
                         tr_debug("Too short Chiher Text");
                     } else if ((algo_ok & 0x20) && (tls_suite->state == PRF_CALC)) {
@@ -1477,7 +1477,7 @@ buffer_t *tls_server_up(buffer_t *buf, sec_suite_t *tls_suite)
         if (tls_header_ptr) {
             if (tls_header_ptr->type == TLS_HANDSHAKE && (tls_heap != 0)) {
                 tr_debug("Type:Handshake");
-                if ((tls_suite->state == TLS_CHANGE_CHIPHER)) {
+                if (tls_suite->state == TLS_CHANGE_CHIPHER) {
                     if (tls_header_ptr->length < 32) {
                         tr_debug("Too short Chiher Text");
                     } else if ((algo_ok & 0x20) && (tls_suite->state == PRF_CALC)) {
diff --git a/test/nanostack/unittest/stub/dhcpv6_client_stub.c b/test/nanostack/unittest/stub/dhcpv6_client_stub.c
@@ -72,7 +72,7 @@ void dhcp_client_global_address_renew(int8_t interface)
 {
 }
 
-void dhcp_client_global_address_delete(int8_t interface, uint8_t dhcp_addr[static 16], uint8_t prefix[static 16])
+void dhcp_client_global_address_delete(int8_t interface, uint8_t *dhcp_addr, uint8_t prefix[static 16])
 {
 }
 
diff --git a/test/nanostack/unittest/stub/dhcpv6_server_service_stub.c b/test/nanostack/unittest/stub/dhcpv6_server_service_stub.c
@@ -83,7 +83,7 @@ void DHCPv6_server_service_timeout_cb(uint32_t timeUpdateInSeconds)
  *  /param guaPrefix Prefix which will be removed
  *  /param delete_gua_addresses Whether or not assigned addresses with the prefix should be removed from the interface.
  */
-void DHCPv6_server_service_delete(int8_t interface, uint8_t guaPrefix[static 16], bool delete_gua_addresses)
+void DHCPv6_server_service_delete(int8_t interface, uint8_t guaPrefix[static 8], bool delete_gua_addresses)
 {
 
 }

Original file line number	Diff line number	Diff line change
`@@ -2540,7 +2540,7 @@ int thread_bootstrap_network_data_process(protocol_interface_info_entry_t *cur,`
`2540`	`2540`	`} else {`
`2541`	`2541`	`tr_debug("SLAAC address set as NOT preferred.");`
`2542`	`2542`	`}`
`2543`		`- addr_set_preferred_lifetime(cur, e, genericService.P_preferred ? 0xfffffffff : 0);`
	`2543`	`+ addr_set_preferred_lifetime(cur, e, genericService.P_preferred ? 0xffffffff : 0);`
`2544`	`2544`	`}`
`2545`	`2545`	`}`
`2546`	`2546`	`}`
Original file line number	Diff line number	Diff line change
`@@ -519,8 +519,8 @@ static void device_configuration_validate(device_configuration_s *this)`
`519`	`519`	`this->vendor_stack_version[1] = (uint8_t)(THREAD_ARM_OUI >> 8);`
`520`	`520`	`this->vendor_stack_version[2] = (uint8_t)(THREAD_ARM_OUI);`
`521`	`521`	`this->vendor_stack_version[3] = (uint8_t)(THREAD_BUILD_NUMBER >> 4);`
`522`		`- this->vendor_stack_version[4] = (uint8_t)(((THREAD_BUILD_NUMBER & 0x0f) << 4) \|\| THREAD_REVISION_NUMBER);`
`523`		`- this->vendor_stack_version[5] = (uint8_t)((THREAD_VERSION_MIN << 4) \|\| THREAD_VERSION_MAJ);`
	`522`	`+ this->vendor_stack_version[4] = (uint8_t)(((THREAD_BUILD_NUMBER & 0x0f) << 4) + THREAD_REVISION_NUMBER);`
	`523`	`+ this->vendor_stack_version[5] = (uint8_t)((THREAD_VERSION_MIN << 4) + THREAD_VERSION_MAJ);`
`524`	`524`	`}`
`525`	`525`	`}`
`526`	`526`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ void DHCPv6_server_service_timeout_cb(uint32_t timeUpdateInSeconds)`
`272`	`272`	`* /param guaPrefix Prefix which will be removed`
`273`	`273`	`* /param delete_gua_addresses Whether or not assigned addresses with the prefix should be removed from the interface.`
`274`	`274`	`*/`
`275`		`-void DHCPv6_server_service_delete(int8_t interface, uint8_t guaPrefix[static 16], bool delete_gua_addresses)`
	`275`	`+void DHCPv6_server_service_delete(int8_t interface, uint8_t guaPrefix[static 8], bool delete_gua_addresses)`
`276`	`276`	`{`
`277`	`277`	`dhcpv6_gua_server_entry_s *serverInfo = libdhcpv6_server_data_get_by_prefix_and_interfaceid(interface, guaPrefix);`
`278`	`278`	`if (serverInfo) {`
`@@ -390,7 +390,7 @@ int DHCPv6_server_service_init(int8_t interface, uint8_t guaPrefix[static 16], u`
`390`	`390`
`391`	`391`	`return -1;`
`392`	`392`	`}`
`393`		`-void DHCPv6_server_service_delete(int8_t interface, uint8_t guaPrefix[static 16], bool delete_gua_addresses)`
	`393`	`+void DHCPv6_server_service_delete(int8_t interface, uint8_t guaPrefix[static 8], bool delete_gua_addresses)`
`394`	`394`	`{`
`395`	`395`	`(void) interface;`
`396`	`396`	`(void) guaPrefix;`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ void dhcp_client_global_address_renew(int8_t interface);`
`92`	`92`	`* /param prefix dhcp server ML16 address where address is registered.`
`93`	`93`	`*`
`94`	`94`	`*/`
`95`		`-void dhcp_client_global_address_delete(int8_t interface, uint8_t dhcp_addr[static 16], uint8_t prefix[static 16]);`
	`95`	`+void dhcp_client_global_address_delete(int8_t interface, uint8_t *dhcp_addr, uint8_t prefix[static 16]);`
`96`	`96`
`97`	`97`
`98`	`98`	`void dhcp_relay_agent_enable(int8_t interface, uint8_t border_router_address[static 16]);`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ void dhcp_client_global_address_renew(int8_t interface)`
`272`	`272`	`return;`
`273`	`273`	`}`
`274`	`274`
`275`		`-void dhcp_client_global_address_delete(int8_t interface, uint8_t dhcp_addr[static 16], uint8_t prefix[static 16])`
	`275`	`+void dhcp_client_global_address_delete(int8_t interface, uint8_t *dhcp_addr, uint8_t prefix[static 16])`
`276`	`276`	`{`
`277`	`277`	`protocol_interface_info_entry_t *cur;`
`278`	`278`	`dhcpv6_client_server_data_t *srv_data_ptr;`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ void dhcp_client_global_address_renew(int8_t interface)`
`72`	`72`	`{`
`73`	`73`	`}`
`74`	`74`
`75`		`-void dhcp_client_global_address_delete(int8_t interface, uint8_t dhcp_addr[static 16], uint8_t prefix[static 16])`
	`75`	`+void dhcp_client_global_address_delete(int8_t interface, uint8_t *dhcp_addr, uint8_t prefix[static 16])`
`76`	`76`	`{`
`77`	`77`	`}`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ void DHCPv6_server_service_timeout_cb(uint32_t timeUpdateInSeconds)`
`83`	`83`	`* /param guaPrefix Prefix which will be removed`
`84`	`84`	`* /param delete_gua_addresses Whether or not assigned addresses with the prefix should be removed from the interface.`
`85`	`85`	`*/`
`86`		`-void DHCPv6_server_service_delete(int8_t interface, uint8_t guaPrefix[static 16], bool delete_gua_addresses)`
	`86`	`+void DHCPv6_server_service_delete(int8_t interface, uint8_t guaPrefix[static 8], bool delete_gua_addresses)`
`87`	`87`	`{`
`88`	`88`
`89`	`89`	`}`