Merge pull request nasa#1173 from skliper/fix1172-defaultreturnvalue

astrogeco · web-flow · commit b19a65d93b1a · 2021-02-26T10:37:47.000-05:00
Fix nasa#1172, Update to use Ut_Stub_CheckDefaultReturnValue API
diff --git a/fsw/cfe-core/ut-stubs/ut_tbl_stubs.c b/fsw/cfe-core/ut-stubs/ut_tbl_stubs.c
@@ -132,7 +132,7 @@ int32 CFE_TBL_GetAddress (void **TblPtr, CFE_TBL_Handle_t TblHandle)
     int32 ForceValue;
     
     status = UT_DEFAULT_IMPL(CFE_TBL_GetAddress);
-    if (status >= 0 && !UT_Stub_CheckForceFail(UT_KEY(CFE_TBL_GetAddress), &ForceValue))
+    if (status >= 0 && !UT_Stub_CheckDefaultReturnValue(UT_KEY(CFE_TBL_GetAddress), &ForceValue))
     {
         UT_Stub_CopyToLocal(UT_KEY(CFE_TBL_GetAddress), (uint8 *)TblPtr, sizeof(void*));
     }

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ int32 CFE_TBL_GetAddress (void **TblPtr, CFE_TBL_Handle_t TblHandle)`
`132`	`132`	`int32 ForceValue;`
`133`	`133`
`134`	`134`	`status = UT_DEFAULT_IMPL(CFE_TBL_GetAddress);`
`135`		`- if (status >= 0 && !UT_Stub_CheckForceFail(UT_KEY(CFE_TBL_GetAddress), &ForceValue))`
	`135`	`+ if (status >= 0 && !UT_Stub_CheckDefaultReturnValue(UT_KEY(CFE_TBL_GetAddress), &ForceValue))`
`136`	`136`	`{`
`137`	`137`	`UT_Stub_CopyToLocal(UT_KEY(CFE_TBL_GetAddress), (uint8 )TblPtr, sizeof(void));`
`138`	`138`	`}`