From 89ede564cd4e01e3e30ad3a0484d4f79e204e719 Mon Sep 17 00:00:00 2001 From: Avi Date: Tue, 4 Oct 2022 11:04:02 +1000 Subject: [PATCH] Fix additional parentheses around return values introduced after merge conflict resolution --- fsw/src/sc_app.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fsw/src/sc_app.c b/fsw/src/sc_app.c index 60d6c90..ed0a8df 100644 --- a/fsw/src/sc_app.c +++ b/fsw/src/sc_app.c @@ -313,17 +313,17 @@ int32 SC_RegisterAllTables(void) if (Result != CFE_SUCCESS) { - return (Result); + return Result; } Result = SC_RegisterLoadableTables(); if (Result != CFE_SUCCESS) { - return (Result); + return Result; } - return (CFE_SUCCESS); + return CFE_SUCCESS; } /* end SC_RegisterAllTables() */ @@ -352,7 +352,7 @@ int32 SC_RegisterDumpOnlyTables(void) { CFE_EVS_SendEvent(EventID[i], CFE_EVS_EventType_ERROR, "%s table register failed, returned: 0x%08X", Spec[i], (unsigned int)Result); - return (Result); + return Result; } } @@ -373,7 +373,7 @@ int32 SC_RegisterDumpOnlyTables(void) } - return (CFE_SUCCESS); + return CFE_SUCCESS; } /* end SC_RegisterDumpOnlyTables() */ @@ -407,7 +407,7 @@ int32 SC_RegisterLoadableTables(void) CFE_EVS_SendEvent(EventID[i], CFE_EVS_EventType_ERROR, "Table Registration Failed for %s %d, returned: 0x%08X", Spec[i], j + 1, (unsigned int)Result); - return (Result); + return Result; } } } @@ -453,7 +453,7 @@ int32 SC_GetDumpTablePointers(void) { CFE_EVS_SendEvent(EventID[i], CFE_EVS_EventType_ERROR, "Table failed Getting Address, returned: 0x%08X", (unsigned int)Result); - return (Result); + return Result; } }