Skip to content

Fix #84, Remove superfluous assignments at the top of functions #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thnkslprpt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix #84, Remove superfluous assignments at the top of functions #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions fsw/src/fm_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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));
Expand Down
32 changes: 16 additions & 16 deletions fsw/src/fm_child.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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));

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
6 changes: 2 additions & 4 deletions fsw/src/fm_cmd_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions fsw/src/fm_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion fsw/src/fm_table_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading