refactor: initialize Device_Reinitialize_Data at runtime and clean up unused variables in Device_Configuration_Files_Value (#1325)
BACnet/SC linux tests / job_bsc_tests_linux (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
GCC / bip-apps (push) Has been cancelled
GCC / bip-no-bbmd-apps (push) Has been cancelled
GCC / bip-client-bbmd-apps (push) Has been cancelled
GCC / gateway (push) Has been cancelled
GCC / bacnet-sc-hub (push) Has been cancelled
GCC / router (push) Has been cancelled
GCC / router-ipv6 (push) Has been cancelled
GCC / router-mstp (push) Has been cancelled
GCC / bip6 (push) Has been cancelled
GCC / mstp (push) Has been cancelled
GCC / ethernet (push) Has been cancelled
GCC / ports-arm-makefile (push) Has been cancelled
GCC / ports-arm-cmake (push) Has been cancelled
GCC / ports-avr (push) Has been cancelled
GCC / ports-lwip (push) Has been cancelled
GCC / mingw (push) Has been cancelled
GCC / piface (push) Has been cancelled
GCC / blinkt (push) Has been cancelled
GCC / gtk-discover (push) Has been cancelled
GCC / ports-esp32 (push) Has been cancelled
Quality / pre-commit (push) Has been cancelled
Quality / scan-build (push) Has been cancelled
Quality / splint (push) Has been cancelled
Quality / cppcheck (push) Has been cancelled
Quality / flawfinder (push) Has been cancelled
Quality / codespell (push) Has been cancelled
Quality / unittest (push) Has been cancelled
Quality / unittest-secure-connect (push) Has been cancelled
CMake / build (macOS-latest, root) (push) Has been cancelled
CMake / build (macOS-latest, test) (push) Has been cancelled
CMake / build (ubuntu-latest, root) (push) Has been cancelled
CMake / build (ubuntu-latest, test) (push) Has been cancelled
CMake / build (windows-latest, root) (push) Has been cancelled

This commit is contained in:
Steve Karg
2026-04-30 12:19:50 -05:00
committed by GitHub
parent 9f4c34f23a
commit bf5dac2471
+6 -6
View File
@@ -1465,9 +1465,7 @@ static uint32_t Database_Revision = 0;
/* Auto_Slave_Discovery */ /* Auto_Slave_Discovery */
/* Slave_Address_Binding */ /* Slave_Address_Binding */
/* Profile_Name */ /* Profile_Name */
static BACNET_DEVICE_REINITIALIZE_DATA Reinitialize_Data = { static BACNET_DEVICE_REINITIALIZE_DATA Reinitialize_Data;
.State = BACNET_REINIT_IDLE, .Password = "filister"
};
static write_property_function Device_Write_Property_Store_Callback; static write_property_function Device_Write_Property_Store_Callback;
static list_element_function Device_Add_List_Element_Callback; static list_element_function Device_Add_List_Element_Callback;
static list_element_function Device_Remove_List_Element_Callback; static list_element_function Device_Remove_List_Element_Callback;
@@ -2692,11 +2690,10 @@ int Device_Configuration_File_Encode(
uint32_t object_instance, BACNET_ARRAY_INDEX array_index, uint8_t *apdu) uint32_t object_instance, BACNET_ARRAY_INDEX array_index, uint8_t *apdu)
{ {
int apdu_len = BACNET_STATUS_ERROR; int apdu_len = BACNET_STATUS_ERROR;
(void)object_instance;
#if defined(BACNET_BACKUP_RESTORE) #if defined(BACNET_BACKUP_RESTORE)
uint32_t *configuration_files = Device_Configuration_Files_Value(); uint32_t *configuration_files;
configuration_files = Device_Configuration_Files_Value();
if (array_index < BACNET_BACKUP_FILE_COUNT) { if (array_index < BACNET_BACKUP_FILE_COUNT) {
apdu_len = encode_application_object_id( apdu_len = encode_application_object_id(
apdu, OBJECT_FILE, configuration_files[array_index]); apdu, OBJECT_FILE, configuration_files[array_index]);
@@ -2705,6 +2702,7 @@ int Device_Configuration_File_Encode(
(void)array_index; (void)array_index;
(void)apdu; (void)apdu;
#endif #endif
(void)object_instance;
return apdu_len; return apdu_len;
} }
@@ -4285,6 +4283,8 @@ void Device_Init(object_functions_t *object_table)
/* link WriteProperty to Timer object for references */ /* link WriteProperty to Timer object for references */
Timer_Write_Property_Internal_Callback_Set(Device_Write_Property); Timer_Write_Property_Internal_Callback_Set(Device_Write_Property);
#endif #endif
Reinitialize_Data.State = BACNET_REINIT_IDLE;
Reinitialize_Data.Password = "filister";
} }
bool DeviceGetRRInfo( bool DeviceGetRRInfo(