dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Enabled style and CERT-C addon for CPPCHECK (#869)

Browse Source 
* Enabled style and CERT-C addon for CPPCHECK with some suppressions and fixed the defects found..
This commit is contained in:
Steve Karg
2024-12-10 07:56:24 -06:00
committed by GitHub
parent f38b75b389
commit d4cbec91e2
21 changed files with 79 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/basic/object/ai.c
+2 -2
View File
@@ -1409,9 +1409,9 @@ int Analog_Input_Event_Information(
(TO-OFFNORMAL, TO-FAULT, TONORMAL) set to FALSE. */
IsNotAckedTransitions =
(pObject->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked ==
false) |
false) ||
(pObject->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked ==
false) |
false) ||
(pObject->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked ==
false);
} else {
src/bacnet/basic/object/av.c
+2 -2
View File
@@ -1465,9 +1465,9 @@ int Analog_Value_Event_Information(
(TO-OFFNORMAL, TO-FAULT, TONORMAL) set to FALSE. */
IsNotAckedTransitions =
(pObject->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked ==
false) |
false) ||
(pObject->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked ==
false) |
false) ||
(pObject->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked ==
false);
} else {
src/bacnet/basic/object/iv.c
+3 -3
View File
@@ -348,9 +348,9 @@ bool Integer_Value_Description_Set(
* @param object_instance - object-instance number of the object
* @return description text or NULL if not found
*/
char *Integer_Value_Description_ANSI(uint32_t object_instance)
const char *Integer_Value_Description_ANSI(uint32_t object_instance)
{
char *name = NULL;
const char *name = NULL;
struct integer_object *pObject;
pObject = Integer_Value_Object(object_instance);
@@ -358,7 +358,7 @@ char *Integer_Value_Description_ANSI(uint32_t object_instance)
if (pObject->Description == NULL) {
name = "";
} else {
name = (char *)pObject->Description;
name = pObject->Description;
}
}
src/bacnet/basic/object/iv.h
+1 -1
View File
@@ -70,7 +70,7 @@ bool Integer_Value_Description(
BACNET_STACK_EXPORT
bool Integer_Value_Description_Set(uint32_t instance, const char *new_name);
BACNET_STACK_EXPORT
char *Integer_Value_Description_ANSI(uint32_t object_instance);
const char *Integer_Value_Description_ANSI(uint32_t object_instance);
BACNET_STACK_EXPORT
uint16_t Integer_Value_Units(uint32_t instance);
src/bacnet/basic/object/lsp.c
+1 -3
View File
@@ -401,9 +401,7 @@ void Life_Safety_Point_Out_Of_Service_Set(uint32_t object_instance, bool value)
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
if (pObject->Out_Of_Service != value) {
pObject->Out_Of_Service = value;
}
pObject->Out_Of_Service = value;
}
}
src/bacnet/basic/object/lsz.c
+2 -6
View File
@@ -412,9 +412,7 @@ void Life_Safety_Zone_Out_Of_Service_Set(uint32_t object_instance, bool value)
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
if (pObject->Out_Of_Service != value) {
pObject->Out_Of_Service = value;
}
pObject->Out_Of_Service = value;
}
}
@@ -614,9 +612,7 @@ void Life_Safety_Zone_Maintenance_Required_Set(
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
if (pObject->Maintenance_Required != value) {
pObject->Maintenance_Required = value;
}
pObject->Maintenance_Required = value;
}
}
src/bacnet/basic/object/netport.c
+2 -2
View File
@@ -3286,7 +3286,7 @@ int Network_Port_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
BACNET_OCTET_STRING octet_string;
BACNET_CHARACTER_STRING char_string;
#if defined(BACDL_BIP) && (BBMD_ENABLED || BBMD_CLIENT_ENABLED)
BACNET_IP_ADDRESS ip_address;
BACNET_IP_ADDRESS ip_address = { 0 };
#endif
#if defined(BACDL_BIP6) && (BBMD_CLIENT_ENABLED)
BACNET_IP6_ADDRESS ip6_address;
@@ -3918,9 +3918,9 @@ bool Network_Port_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
#else
wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
#endif
#endif
break;
#endif
case PROP_FD_SUBSCRIPTION_LIFETIME:
#if (BBMD_CLIENT_ENABLED)
if (write_property_type_valid(
src/bacnet/basic/object/sc_netport.c
+5 -7
View File
@@ -1997,16 +1997,12 @@ void Network_Port_SC_Pending_Params_Apply(uint32_t object_instance)
void Network_Port_SC_Pending_Params_Discard(uint32_t object_instance)
{
BACNET_SC_PARAMS *params = Network_Port_SC_Params(object_instance);
uint16_t port;
char *ifname;
uint16_t port = 0;
char *ifname = NULL;
if (!params) {
return;
}
(void)port;
(void)ifname;
params->Max_BVLC_Length_Accepted_dirty = params->Max_BVLC_Length_Accepted;
params->Max_NPDU_Length_Accepted_dirty = params->Max_NPDU_Length_Accepted;
params->SC_Minimum_Reconnect_Time_dirty = params->SC_Minimum_Reconnect_Time;
@@ -2015,7 +2011,6 @@ void Network_Port_SC_Pending_Params_Discard(uint32_t object_instance)
params->SC_Disconnect_Wait_Timeout_dirty =
params->SC_Disconnect_Wait_Timeout;
params->SC_Heartbeat_Timeout_dirty = params->SC_Heartbeat_Timeout;
#if BSC_CONF_HUB_FUNCTIONS_NUM != 0
memcpy(
params->SC_Primary_Hub_URI_dirty, params->SC_Primary_Hub_URI,
@@ -2035,6 +2030,9 @@ void Network_Port_SC_Pending_Params_Discard(uint32_t object_instance)
snprintf(
params->SC_Hub_Function_Binding_dirty,
sizeof(params->SC_Hub_Function_Binding_dirty), "%s:%d", ifname, port);
#else
(void)port;
(void)ifname;
#endif /* BSC_CONF_HUB_FUNCTIONS_NUM!=0 */
#if BSC_CONF_HUB_CONNECTORS_NUM != 0
src/bacnet/basic/object/schedule.c
+5 -2
View File
@@ -84,10 +84,13 @@ static SCHEDULE_DESCR *Schedule_Object(uint32_t object_instance)
*/
void Schedule_Init(void)
{
unsigned i, j, e;
unsigned i, j;
BACNET_DATE start_date = { 0 }, end_date = { 0 };
BACNET_SPECIAL_EVENT *event;
SCHEDULE_DESCR *psched;
#if BACNET_EXCEPTION_SCHEDULE_SIZE
unsigned e;
BACNET_SPECIAL_EVENT *event;
#endif
/* whole year, change as necessary */
datetime_set_date(&start_date, 0, 1, 1);
src/bacnet/basic/sys/days.c
+2 -3
View File
@@ -37,9 +37,8 @@ uint8_t days_per_month(uint16_t year, uint8_t month)
{
/* note: start with a zero in the first element to save us from a
month - 1 calculation in the lookup */
uint8_t month_days[13] = {
0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
};
const uint8_t month_days[13] = { 0, 31, 28, 31, 30, 31, 30,
31, 31, 30, 31, 30, 31 };
if ((month == 2) && days_is_leap_year(year)) {
return (29);