Merge pull request #2031 from jphickey:fix-2030-es-perf-array-len

Fix #2030, array length calculation for perf structs
nasa · Jan 19, 2022 · f8661cf · f8661cf
2 parents 5cc196e + f598216
commit f8661cf
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/modules/es/fsw/src/cfe_es_task.c b/modules/es/fsw/src/cfe_es_task.c
@@ -48,13 +48,16 @@
 /*
 ** Defines
 */
+#define CFE_ES_PERF_MASK_ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
+
 #define CFE_ES_PERF_TRIGGERMASK_INT_SIZE \
-    (sizeof(CFE_ES_Global.ResetDataPtr->Perf.MetaData.TriggerMask) / sizeof(uint32))
+    CFE_ES_PERF_MASK_ARRAY_SIZE(CFE_ES_Global.ResetDataPtr->Perf.MetaData.TriggerMask)
 #define CFE_ES_PERF_TRIGGERMASK_EXT_SIZE \
-    (sizeof(CFE_ES_Global.TaskData.HkPacket.Payload.PerfTriggerMask) / sizeof(uint32))
-#define CFE_ES_PERF_FILTERMASK_INT_SIZE (sizeof(CFE_ES_Global.ResetDataPtr->Perf.MetaData.FilterMask) / sizeof(uint32))
+    CFE_ES_PERF_MASK_ARRAY_SIZE(CFE_ES_Global.TaskData.HkPacket.Payload.PerfTriggerMask)
+#define CFE_ES_PERF_FILTERMASK_INT_SIZE \
+    CFE_ES_PERF_MASK_ARRAY_SIZE(CFE_ES_Global.ResetDataPtr->Perf.MetaData.FilterMask)
 #define CFE_ES_PERF_FILTERMASK_EXT_SIZE \
-    (sizeof(CFE_ES_Global.TaskData.HkPacket.Payload.PerfFilterMask) / sizeof(uint32))
+    CFE_ES_PERF_MASK_ARRAY_SIZE(CFE_ES_Global.TaskData.HkPacket.Payload.PerfFilterMask)
 
 /*
 ** This define should be put in the OS API headers -- Right now it matches what the OS API uses