Skip to content

Commit

Permalink
Fix additional parentheses around return values introduced after merg…
Browse files Browse the repository at this point in the history
…e conflict resolution
  • Loading branch information
thnkslprpt committed Oct 4, 2022
1 parent 210d7e7 commit 89ede56
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions fsw/src/sc_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -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() */

Expand Down Expand Up @@ -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;
}
}

Expand All @@ -373,7 +373,7 @@ int32 SC_RegisterDumpOnlyTables(void)
}


return (CFE_SUCCESS);
return CFE_SUCCESS;

} /* end SC_RegisterDumpOnlyTables() */

Expand Down Expand Up @@ -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;
}
}
}
Expand Down Expand Up @@ -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;
}
}

Expand Down

0 comments on commit 89ede56

Please sign in to comment.