From d78f97eb4df190aee58849ab9aaea94b13417006 Mon Sep 17 00:00:00 2001 From: Avi Weiss Date: Sun, 15 Mar 2026 08:44:33 +0100 Subject: [PATCH] Fix #84, Remove superfluous assignments at the top of functions --- fsw/src/fm_app.c | 4 ++-- fsw/src/fm_child.c | 32 ++++++++++++++++---------------- fsw/src/fm_cmd_utils.c | 6 ++---- fsw/src/fm_cmds.c | 4 ++-- fsw/src/fm_table_utils.c | 2 +- 5 files changed, 23 insertions(+), 25 deletions(-) diff --git a/fsw/src/fm_app.c b/fsw/src/fm_app.c index 9c33a23..403c947 100644 --- a/fsw/src/fm_app.c +++ b/fsw/src/fm_app.c @@ -66,7 +66,7 @@ void FM_AppMain(void) { uint32 RunStatus = CFE_ES_RunStatus_APP_RUN; CFE_SB_Buffer_t *BufPtr = NULL; - CFE_Status_t Result = CFE_SUCCESS; + CFE_Status_t Result; /* Performance Log (start time counter) */ CFE_ES_PerfLogEntry(FM_APPMAIN_PERF_ID); @@ -160,7 +160,7 @@ void FM_AppMain(void) CFE_Status_t FM_AppInit(void) { const char * ErrText = "Initialization error:"; - CFE_Status_t Result = CFE_SUCCESS; + CFE_Status_t Result; /* Initialize global data */ memset(&FM_AppData, 0, sizeof(FM_AppData)); diff --git a/fsw/src/fm_child.c b/fsw/src/fm_child.c index 6aaa72f..7cc2972 100644 --- a/fsw/src/fm_child.c +++ b/fsw/src/fm_child.c @@ -58,8 +58,8 @@ CFE_Status_t FM_ChildInit(void) { int32 TaskTextLen = CFE_MISSION_MAX_PATH_LEN; char TaskText[CFE_MISSION_MAX_PATH_LEN] = "\0"; - CFE_Status_t Result = CFE_SUCCESS; - uint32 TaskEID = 0; + CFE_Status_t Result; + uint32 TaskEID = 0; /* Create counting semaphore (given by parent to wake-up child) */ Result = OS_CountSemCreate(&FM_AppData.ChildSemaphore, FM_CHILD_SEM_NAME, 0, 0); @@ -279,8 +279,8 @@ void FM_ChildProcess(void) void FM_ChildCopyCmd(const FM_ChildQueueEntry_t *CmdArgs) { - const char *CmdText = "Copy File"; - int32 OS_Status = OS_SUCCESS; + const char *CmdText = "Copy File"; + int32 OS_Status; /* Report current child task activity */ FM_AppData.HkTlm.Payload.ChildCurrentCC = CmdArgs->CommandCode; @@ -319,8 +319,8 @@ void FM_ChildCopyCmd(const FM_ChildQueueEntry_t *CmdArgs) void FM_ChildMoveCmd(const FM_ChildQueueEntry_t *CmdArgs) { - const char *CmdText = "Move File"; - int32 OS_Status = OS_SUCCESS; + const char *CmdText = "Move File"; + int32 OS_Status; /* Report current child task activity */ FM_AppData.HkTlm.Payload.ChildCurrentCC = CmdArgs->CommandCode; @@ -358,8 +358,8 @@ void FM_ChildMoveCmd(const FM_ChildQueueEntry_t *CmdArgs) void FM_ChildRenameCmd(const FM_ChildQueueEntry_t *CmdArgs) { - const char *CmdText = "Rename File"; - int32 OS_Status = OS_SUCCESS; + const char *CmdText = "Rename File"; + int32 OS_Status; /* Report current child task activity */ FM_AppData.HkTlm.Payload.ChildCurrentCC = CmdArgs->CommandCode; @@ -397,8 +397,8 @@ void FM_ChildRenameCmd(const FM_ChildQueueEntry_t *CmdArgs) void FM_ChildDeleteCmd(const FM_ChildQueueEntry_t *CmdArgs) { - const char *CmdText = "Delete File"; - int32 OS_Status = OS_SUCCESS; + const char *CmdText = "Delete File"; + int32 OS_Status; /* Report current child task activity */ FM_AppData.HkTlm.Payload.ChildCurrentCC = CmdArgs->CommandCode; @@ -588,7 +588,7 @@ void FM_ChildDeleteAllFilesCmd(FM_ChildQueueEntry_t *CmdArgs) void FM_ChildDecompressFileCmd(const FM_ChildQueueEntry_t *CmdArgs) { const char * CmdText = "Decompress File"; - CFE_Status_t CFE_Status = CFE_SUCCESS; + CFE_Status_t CFE_Status; /* Report current child task activity */ FM_AppData.HkTlm.Payload.ChildCurrentCC = CmdArgs->CommandCode; @@ -931,8 +931,8 @@ void FM_ChildFileInfoCmd(FM_ChildQueueEntry_t *CmdArgs) void FM_ChildCreateDirectoryCmd(const FM_ChildQueueEntry_t *CmdArgs) { - const char *CmdText = "Create Directory"; - int32 OS_Status = OS_SUCCESS; + const char *CmdText = "Create Directory"; + int32 OS_Status; /* Report current child task activity */ FM_AppData.HkTlm.Payload.ChildCurrentCC = CmdArgs->CommandCode; @@ -974,7 +974,7 @@ void FM_ChildDeleteDirectoryCmd(const FM_ChildQueueEntry_t *CmdArgs) bool RemoveTheDir = true; osal_id_t DirId = OS_OBJECT_ID_UNDEFINED; os_dirent_t DirEntry; - int32 OS_Status = OS_SUCCESS; + int32 OS_Status; memset(&DirEntry, 0, sizeof(DirEntry)); @@ -1052,7 +1052,7 @@ void FM_ChildDirListFileCmd(const FM_ChildQueueEntry_t *CmdArgs) bool Result; osal_id_t FileHandle = OS_OBJECT_ID_UNDEFINED; osal_id_t DirId = OS_OBJECT_ID_UNDEFINED; - int32 Status = 0; + int32 Status; /* Report current child task activity */ FM_AppData.HkTlm.Payload.ChildCurrentCC = CmdArgs->CommandCode; @@ -1495,7 +1495,7 @@ void FM_ChildDirListFileLoop(osal_id_t DirId, osal_id_t FileHandle, const char * int32 FM_ChildSizeTimeMode(const char *Filename, uint32 *FileSize, uint32 *FileTime, uint32 *FileMode) { - int32 Result = OS_SUCCESS; + int32 Result; os_fstat_t FileStatus; memset(&FileStatus, 0, sizeof(FileStatus)); diff --git a/fsw/src/fm_cmd_utils.c b/fsw/src/fm_cmd_utils.c index fd29ed6..f8e0697 100644 --- a/fsw/src/fm_cmd_utils.c +++ b/fsw/src/fm_cmd_utils.c @@ -506,7 +506,7 @@ void FM_AppendPathSep(char *Directory, uint32 BufferSize) ** the string is both non-zero and less than the size ** of the string buffer. */ - size_t StringLength = 0; + size_t StringLength; StringLength = OS_strnlen(Directory, CFE_MISSION_MAX_PATH_LEN); @@ -571,11 +571,9 @@ CFE_Status_t FM_GetDirectorySpaceEstimate(const char *Directory, uint64 *BlockCo osal_status_t OS_Status; CFE_Status_t Result; char FullPath[CFE_MISSION_MAX_PATH_LEN]; - uint64 TotalBytes; + uint64 TotalBytes = 0; size_t DirLen; - TotalBytes = 0; - memset(&DirEntry, 0, sizeof(DirEntry)); snprintf(FullPath, sizeof(FullPath), "%s", Directory); DirLen = OS_strnlen(FullPath, CFE_MISSION_MAX_PATH_LEN); diff --git a/fsw/src/fm_cmds.c b/fsw/src/fm_cmds.c index 1c60540..9e82b74 100644 --- a/fsw/src/fm_cmds.c +++ b/fsw/src/fm_cmds.c @@ -576,8 +576,8 @@ CFE_Status_t FM_GetFileInfoCmd(const FM_GetFileInfoCmd_t* Msg) CFE_Status_t FM_GetOpenFilesCmd(const FM_GetOpenFilesCmd_t* Msg) { - const char *CmdText = "Get Open Files"; - uint32 NumOpenFiles = 0; + const char *CmdText = "Get Open Files"; + uint32 NumOpenFiles; FM_OpenFilesPkt_Payload_t *ReportPtr = &FM_AppData.OpenFilesPkt.Payload; diff --git a/fsw/src/fm_table_utils.c b/fsw/src/fm_table_utils.c index 4653438..d6bd70a 100644 --- a/fsw/src/fm_table_utils.c +++ b/fsw/src/fm_table_utils.c @@ -72,7 +72,7 @@ CFE_Status_t FM_ValidateTable(FM_MonitorTable_t *TablePtr) { CFE_Status_t Result = CFE_SUCCESS; int32 NameLength; - int32 i = 0; + int32 i; int32 CountGood = 0; int32 CountBad = 0;