Run clang-format and enable CI check for it (#755)

* pre-commit: Update and enable clang-format check

There is newer version from clang-format so use that. We do not yet want
18 as that is little bit too new.

* Format some thing by hand which clang-format "breaks"

Clang-format will format some things little bit off in some cases.
Format some things by hand so we get cleaner end result.

* Run clang-format with

```
pre-commit run --all-files clang-format
```

We have already in previously checked places where clang-format does not
make good format and ignored those (hopefully most of the things).

---------

Co-authored-by: Kari Argillander <kari.argillander@fidelix.com>
This commit is contained in:
Kari Argillander
2024-08-30 19:20:58 +03:00
committed by GitHub
parent 622a9e609e
commit f806c5829b
547 changed files with 18286 additions and 16575 deletions
+1 -3
View File
@@ -41,9 +41,7 @@ static void testAnalogInput(void)
Analog_Input_Read_Property, Analog_Input_Write_Property,
skip_fail_property_list);
bacnet_object_name_ascii_test(
object_instance,
Analog_Input_Name_Set,
Analog_Input_Name_ASCII);
object_instance, Analog_Input_Name_Set, Analog_Input_Name_ASCII);
status = Analog_Input_Delete(object_instance);
zassert_true(status, NULL);
}
+1 -3
View File
@@ -41,9 +41,7 @@ static void testAnalogOutput(void)
Analog_Output_Read_Property, Analog_Output_Write_Property,
skip_fail_property_list);
bacnet_object_name_ascii_test(
object_instance,
Analog_Output_Name_Set,
Analog_Output_Name_ASCII);
object_instance, Analog_Output_Name_Set, Analog_Output_Name_ASCII);
status = Analog_Output_Delete(object_instance);
zassert_true(status, NULL);
}
+1 -3
View File
@@ -41,9 +41,7 @@ static void testAnalog_Value(void)
Analog_Value_Read_Property, Analog_Value_Write_Property,
skip_fail_property_list);
bacnet_object_name_ascii_test(
object_instance,
Analog_Value_Name_Set,
Analog_Value_Name_ASCII);
object_instance, Analog_Value_Name_Set, Analog_Value_Name_ASCII);
status = Analog_Value_Delete(object_instance);
zassert_true(status, NULL);
}
+1 -3
View File
@@ -42,9 +42,7 @@ static void testBinaryInput(void)
Binary_Input_Read_Property, Binary_Input_Write_Property,
skip_fail_property_list);
bacnet_object_name_ascii_test(
object_instance,
Binary_Input_Name_Set,
Binary_Input_Name_ASCII);
object_instance, Binary_Input_Name_Set, Binary_Input_Name_ASCII);
status = Binary_Input_Delete(object_instance);
zassert_true(status, NULL);
}
@@ -40,7 +40,7 @@ static void test_BitString_Value_Object(void)
zassert_true(status, NULL);
status = BitString_Value_Valid_Instance(instance);
zassert_true(status, NULL);
status = BitString_Value_Valid_Instance(instance+1);
status = BitString_Value_Valid_Instance(instance + 1);
zassert_false(status, NULL);
test_count = BitString_Value_Count();
zassert_equal(test_count, 1, NULL);
@@ -53,9 +53,7 @@ static void test_BitString_Value_Object(void)
BitString_Value_Read_Property, BitString_Value_Write_Property,
skip_fail_property_list);
bacnet_object_name_ascii_test(
instance,
BitString_Value_Name_Set,
BitString_Value_Name_ASCII);
instance, BitString_Value_Name_Set, BitString_Value_Name_ASCII);
/* test specific WriteProperty values */
BitString_Value_Write_Disable(instance);
status = BitString_Value_Write_Enabled(instance);
@@ -73,24 +71,24 @@ static void test_BitString_Value_Object(void)
wpdata.object_property = PROP_PRESENT_VALUE;
value.tag = BACNET_APPLICATION_TAG_BIT_STRING;
bitstring_init(&value.type.Bit_String);
wpdata.application_data_len = bacapp_encode_application_data(
wpdata.application_data, &value);
wpdata.application_data_len =
bacapp_encode_application_data(wpdata.application_data, &value);
status = BitString_Value_Write_Property(&wpdata);
zassert_true(status, NULL);
/* WP to out-of-service */
wpdata.object_property = PROP_OUT_OF_SERVICE;
value.tag = BACNET_APPLICATION_TAG_BOOLEAN;
value.type.Boolean = false;
wpdata.application_data_len = bacapp_encode_application_data(
wpdata.application_data, &value);
wpdata.application_data_len =
bacapp_encode_application_data(wpdata.application_data, &value);
status = BitString_Value_Write_Property(&wpdata);
zassert_true(status, NULL);
/* WP to status-flags - read-only */
wpdata.object_property = PROP_STATUS_FLAGS;
value.tag = BACNET_APPLICATION_TAG_BIT_STRING;
bitstring_init(&value.type.Bit_String);
wpdata.application_data_len = bacapp_encode_application_data(
wpdata.application_data, &value);
wpdata.application_data_len =
bacapp_encode_application_data(wpdata.application_data, &value);
status = BitString_Value_Write_Property(&wpdata);
zassert_false(status, NULL);
zassert_equal(wpdata.error_class, ERROR_CLASS_PROPERTY, NULL);
@@ -99,8 +97,8 @@ static void test_BitString_Value_Object(void)
wpdata.object_property = PROP_PRESENT_VALUE;
value.tag = BACNET_APPLICATION_TAG_BIT_STRING;
wpdata.array_index = 0;
wpdata.application_data_len = bacapp_encode_application_data(
wpdata.application_data, &value);
wpdata.application_data_len =
bacapp_encode_application_data(wpdata.application_data, &value);
status = BitString_Value_Write_Property(&wpdata);
zassert_false(status, NULL);
zassert_equal(wpdata.error_class, ERROR_CLASS_PROPERTY, NULL);
@@ -114,21 +112,21 @@ static void test_BitString_Value_Object(void)
zassert_false(status, NULL);
/* set same value */
BitString_Value_Change_Of_Value_Clear(instance);
status = BitString_Value_Present_Value_Set(instance,
&value.type.Bit_String);
status =
BitString_Value_Present_Value_Set(instance, &value.type.Bit_String);
zassert_true(status, NULL);
status = BitString_Value_Change_Of_Value(instance);
zassert_false(status, NULL);
/* set different value */
bitstring_set_bit(&value.type.Bit_String, 1, true);
status = BitString_Value_Present_Value_Set(instance,
&value.type.Bit_String);
status =
BitString_Value_Present_Value_Set(instance, &value.type.Bit_String);
zassert_true(status, NULL);
status = BitString_Value_Change_Of_Value(instance);
zassert_true(status, NULL);
/* COV */
cov_property_value_list_link(value_list,
sizeof(value_list)/sizeof(value_list[0]));
cov_property_value_list_link(
value_list, sizeof(value_list) / sizeof(value_list[0]));
status = BitString_Value_Encode_Value_List(instance, value_list);
zassert_true(status, NULL);
/* delete */
@@ -149,9 +147,9 @@ ZTEST_SUITE(bitstring_value_object_tests, NULL, NULL, NULL, NULL, NULL);
#else
void test_main(void)
{
ztest_test_suite(bitstring_value_object_tests,
ztest_unit_test(test_BitString_Value_Object)
);
ztest_test_suite(
bitstring_value_object_tests,
ztest_unit_test(test_BitString_Value_Object));
ztest_run_test_suite(bitstring_value_object_tests);
}
+1 -3
View File
@@ -41,9 +41,7 @@ static void testBinaryOutput(void)
Binary_Output_Read_Property, Binary_Output_Write_Property,
skip_fail_property_list);
bacnet_object_name_ascii_test(
object_instance,
Binary_Output_Name_Set,
Binary_Output_Name_ASCII);
object_instance, Binary_Output_Name_Set, Binary_Output_Name_ASCII);
status = Binary_Output_Delete(object_instance);
zassert_true(status, NULL);
}
+1 -3
View File
@@ -43,9 +43,7 @@ static void testBinary_Value(void)
Binary_Value_Read_Property, Binary_Value_Write_Property,
skip_fail_property_list);
bacnet_object_name_ascii_test(
object_instance,
Binary_Value_Name_Set,
Binary_Value_Name_ASCII);
object_instance, Binary_Value_Name_Set, Binary_Value_Name_ASCII);
status = Binary_Value_Delete(object_instance);
zassert_true(status, NULL);
}
+4 -2
View File
@@ -230,16 +230,18 @@ static void testPresentValue(void)
value->type.WeekNDay.weekofmonth = (date.day - 1) % 7 + 1;
zassert_true(Calendar_Present_Value(instance), NULL);
value->type.WeekNDay.weekofmonth++;
if (value->type.WeekNDay.weekofmonth > 5)
if (value->type.WeekNDay.weekofmonth > 5) {
value->type.WeekNDay.weekofmonth = 1;
}
zassert_false(Calendar_Present_Value(instance), NULL);
value->type.WeekNDay.weekofmonth = 0xff;
value->type.WeekNDay.dayofweek = date.wday;
zassert_true(Calendar_Present_Value(instance), NULL);
value->type.WeekNDay.dayofweek++;
if (value->type.WeekNDay.dayofweek > 7)
if (value->type.WeekNDay.dayofweek > 7) {
value->type.WeekNDay.dayofweek = 1;
}
zassert_false(Calendar_Present_Value(instance), NULL);
Calendar_Date_List_Delete_All(instance);
+4 -7
View File
@@ -255,8 +255,7 @@ static bool Test_Present_Value_Priority_Set(float value, unsigned priority)
* @param priority - priority-array index value 1..16
* @return true if values are within range and present-value is relinquished.
*/
static bool Test_Present_Value_Priority_Relinquish(
unsigned priority)
static bool Test_Present_Value_Priority_Relinquish(unsigned priority)
{
bool status = false;
@@ -615,8 +614,8 @@ static void testLoadControlStateMachine(void)
Load_Control_Present_Value(object_instance), BACNET_SHED_COMPLIANT,
NULL);
level = Test_Present_Value();
zassert_true(islessgreater(100.0f, level),
"Present Value = %f", (double)level);
zassert_true(
islessgreater(100.0f, level), "Present Value = %f", (double)level);
priority = Test_Present_Value_Priority();
zassert_equal(
Load_Control_Priority_For_Writing(object_instance), priority, NULL);
@@ -658,9 +657,7 @@ static void test_Load_Control_Read_Write_Property(void)
Load_Control_Read_Property, Load_Control_Write_Property,
skip_fail_property_list);
bacnet_object_name_ascii_test(
object_instance,
Load_Control_Name_Set,
Load_Control_Name_ASCII);
object_instance, Load_Control_Name_Set, Load_Control_Name_ASCII);
test_teardown(object_instance);
}
-1
View File
@@ -55,7 +55,6 @@ static void testLifeSafetyZone(void)
zassert_equal(test_name, NULL, NULL);
/* cleanup */
status = Life_Safety_Zone_Delete(object_instance);
}
/**
* @}
+1 -2
View File
@@ -42,8 +42,7 @@ static void testMultistateInput(void)
Multistate_Input_Property_Lists, Multistate_Input_Read_Property,
Multistate_Input_Write_Property, skip_fail_property_list);
bacnet_object_name_ascii_test(
object_instance,
Multistate_Input_Name_Set,
object_instance, Multistate_Input_Name_Set,
Multistate_Input_Name_ASCII);
status = Multistate_Input_Delete(object_instance);
zassert_true(status, NULL);
+1 -2
View File
@@ -41,8 +41,7 @@ static void testMultistateOutput(void)
Multistate_Output_Property_Lists, Multistate_Output_Read_Property,
Multistate_Output_Write_Property, skip_fail_property_list);
bacnet_object_name_ascii_test(
object_instance,
Multistate_Output_Name_Set,
object_instance, Multistate_Output_Name_Set,
Multistate_Output_Name_ASCII);
status = Multistate_Output_Delete(object_instance);
zassert_true(status, NULL);
+1 -2
View File
@@ -42,8 +42,7 @@ static void testMultistateValue(void)
Multistate_Value_Property_Lists, Multistate_Value_Read_Property,
Multistate_Value_Write_Property, skip_fail_property_list);
bacnet_object_name_ascii_test(
object_instance,
Multistate_Value_Name_Set,
object_instance, Multistate_Value_Name_Set,
Multistate_Value_Name_ASCII);
status = Multistate_Value_Delete(object_instance);
zassert_true(status, NULL);
+1 -2
View File
@@ -58,8 +58,7 @@ static void test_network_port(void)
Network_Port_Read_Property, Network_Port_Write_Property,
known_fail_property_list);
bacnet_object_name_ascii_test(
object_instance,
Network_Port_Name_Set,
object_instance, Network_Port_Name_Set,
Network_Port_Object_Name_ASCII);
port++;
}
+1 -3
View File
@@ -27,9 +27,7 @@ static void testSchedule(void)
{
unsigned count = 0;
uint32_t object_instance = 0;
const int skip_fail_property_list[] = {
-1
};
const int skip_fail_property_list[] = { -1 };
Schedule_Init();
count = Schedule_Count();
@@ -41,9 +41,7 @@ static void test_object_structured_view(void)
OBJECT_STRUCTURED_VIEW, instance, Structured_View_Property_Lists,
Structured_View_Read_Property, NULL, skip_fail_property_list);
bacnet_object_name_ascii_test(
instance,
Structured_View_Name_Set,
Structured_View_Name_ASCII);
instance, Structured_View_Name_Set, Structured_View_Name_ASCII);
}
/**
* @}
@@ -31,8 +31,7 @@ bool datetime_local(
return true;
}
void datetime_timesync(
BACNET_DATE *bdate, BACNET_TIME *btime, bool utc)
void datetime_timesync(BACNET_DATE *bdate, BACNET_TIME *btime, bool utc)
{
if (bdate) {
datetime_copy_date(&BACnet_Date, bdate);
@@ -14,10 +14,9 @@
#include <bacnet/wp.h>
/* function API pattern for testing ASCII name get/set */
typedef bool (*object_name_ascii_set_function) (uint32_t object_instance,
const char *new_name);
typedef const char * (*object_name_ascii_function) (
uint32_t object_instance);
typedef bool (*object_name_ascii_set_function)(
uint32_t object_instance, const char *new_name);
typedef const char *(*object_name_ascii_function)(uint32_t object_instance);
void bacnet_object_name_ascii_test(
uint32_t object_instance,
@@ -41,9 +41,7 @@ static void testTimeValue(void)
Time_Value_Read_Property, Time_Value_Write_Property,
skip_fail_property_list);
bacnet_object_name_ascii_test(
object_instance,
Time_Value_Name_Set,
Time_Value_Name_ASCII);
object_instance, Time_Value_Name_Set, Time_Value_Name_ASCII);
/* check the delete function */
status = Time_Value_Delete(object_instance);
zassert_true(status, NULL);
+2 -1
View File
@@ -291,8 +291,9 @@ static void testKeyListLarge(void)
const unsigned num_keys = 1024 * 16;
list = Keylist_Create();
if (!list)
if (!list) {
return;
}
for (key = 0; key < num_keys; key++) {
data_list[key] = 42 + key;