Merge pull request #2329 from thnkslprpt:fix-1929-remove-redundant-st…

…atus-check-in-CFE_ES_RegisterCDSEx Fix #1929, Remove redundant status check in CFE_ES_RegisterCDSEx()
nasa · Nov 5, 2024 · 012ca67 · 012ca67
2 parents 78b8fd7 + 5236e56
commit 012ca67
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/modules/es/fsw/src/cfe_es_cds.c b/modules/es/fsw/src/cfe_es_cds.c
@@ -427,14 +427,7 @@ int32 CFE_ES_RegisterCDSEx(CFE_ES_CDSHandle_t *HandlePtr, size_t UserBlockSize,
         CFE_ES_WriteToSysLog("%s: Failed to update CDS Registry (Stat=0x%08X)\n", __func__,
                              (unsigned int)RegUpdateStatus);
 
-        /*
-         * Return failure only if this was the primary error,
-         * do not overwrite a preexisting error.
-         */
-        if (Status == CFE_SUCCESS)
-        {
-            Status = RegUpdateStatus;
-        }
+        Status = RegUpdateStatus;
     }
 
     if (Status == CFE_SUCCESS && !IsNewOffset)