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

update keylist to use bool and stdint value for key not found. (#572)

Browse Source 
* Updated keylist to use bool and stdint value for key not found.

* Added Keylist_Index_Key to deprecate Keylist_Key function

* Changed the deprecated Keylist_Key API to Keylist_Index_Key

* Added unit test for Keylist_Index_Key API
This commit is contained in:
Steve Karg
2024-02-12 17:35:15 -06:00
committed by GitHub
parent 7eedaa406d
commit 190183966c
16 changed files with 143 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/basic/bbmd6/vmac.c
+6 -8
View File
@@ -241,10 +241,7 @@ bool VMAC_Find_By_Data(struct vmac_data *vmac, uint32_t *device_id)
list_vmac = Keylist_Data_Index(VMAC_List, index);
if (list_vmac) {
if (VMAC_Match(vmac, list_vmac)) {
if (device_id) {
*device_id = Keylist_Key(VMAC_List, index);
}
status = true;
status = Keylist_Index_Key(VMAC_List, index, device_id);
break;
}
}
@@ -260,24 +257,25 @@ bool VMAC_Find_By_Data(struct vmac_data *vmac, uint32_t *device_id)
void VMAC_Cleanup(void)
{
struct vmac_data *pVMAC;
uint32_t device_id;
const int index = 0;
unsigned i = 0;
if (VMAC_List) {
do {
device_id = Keylist_Key(VMAC_List, index);
#if !PRINT_ENABLED
UNUSED(device_id);
#if PRINT_ENABLED
uint32_t device_id;
Keylist_Index_Key(VMAC_List, index, &device_id);
#endif
pVMAC = Keylist_Data_Delete_By_Index(VMAC_List, index);
if (pVMAC) {
#if PRINT_ENABLED
PRINTF("VMAC List: %lu [", (unsigned long)device_id);
/* print the MAC */
for (i = 0; i < pVMAC->mac_len; i++) {
PRINTF("%02X", pVMAC->mac[i]);
}
PRINTF("]\n");
#endif
free(pVMAC);
}
} while (pVMAC);