Skip to content
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

Jump to bottom

Fix #57, Remove redundant/inconsistent comments (/* end of function */, /* end if */ etc.) and clean up empty lines. #58

Merged
merged 1 commit into from
Oct 19, 2022
Merged

Fix #57, Remove redundant/inconsistent comments (/* end of function */, /* end if */ etc.) and clean up empty lines. #58

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
19 changes: 5 additions & 14 deletions fsw/src/fm_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,7 @@ void FM_AppMain(void)
** Let cFE kill the task (and any child tasks)...
*/
CFE_ES_ExitApp(RunStatus);

} /* End FM_AppMain */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -238,8 +237,7 @@ int32 FM_AppInit(void)
}

return Result;

} /* End of FM_AppInit() */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -271,8 +269,7 @@ void FM_ProcessPkt(const CFE_SB_Buffer_t *BufPtr)
(unsigned long)CFE_SB_MsgIdToValue(MessageID));
break;
}

} /* End of FM_ProcessPkt */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -381,8 +378,7 @@ void FM_ProcessCmd(const CFE_SB_Buffer_t *BufPtr)
/* Increment command error counter */
FM_GlobalData.CommandErrCounter++;
}

} // End of FM_ProcessCmd
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -427,9 +423,4 @@ void FM_ReportHK(const CFE_MSG_CommandHeader_t *Msg)
CFE_SB_TimeStampMsg(&FM_GlobalData.HousekeepingPkt.TlmHeader.Msg);
CFE_SB_TransmitMsg(&FM_GlobalData.HousekeepingPkt.TlmHeader.Msg, true);
}

} // End of FM_ReportHK

/************************/
/* End of File Comment */
/************************/
}
67 changes: 21 additions & 46 deletions fsw/src/fm_child.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ int32 FM_ChildInit(void)

if (Result != CFE_SUCCESS)
{

TaskEID = FM_CHILD_INIT_QSEM_ERR_EID;
strncpy(TaskText, "create queue count semaphore failed", TaskTextLen - 1);
TaskText[TaskTextLen - 1] = '\0';
Expand All @@ -106,8 +105,7 @@ int32 FM_ChildInit(void)
}

return Result;

} /* End of FM_ChildInit() */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand All @@ -133,8 +131,7 @@ void FM_ChildTask(void)

/* This call allows cFE to clean-up system resources */
CFE_ES_ExitChildTask();

} /* End of FM_ChildTask() */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -189,8 +186,7 @@ void FM_ChildLoop(void)

CFE_ES_PerfLogExit(FM_CHILD_TASK_PERF_ID);
}

} /* End of FM_ChildLoop() */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -277,8 +273,7 @@ void FM_ChildProcess(void)
OS_MutSemTake(FM_GlobalData.ChildQueueCountSem);
FM_GlobalData.ChildQueueCount--;
OS_MutSemGive(FM_GlobalData.ChildQueueCountSem);

} /* End of FM_ChildProcess() */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -318,8 +313,7 @@ void FM_ChildCopyCmd(const FM_ChildQueueEntry_t *CmdArgs)
/* Report previous child task activity */
FM_GlobalData.ChildPreviousCC = CmdArgs->CommandCode;
FM_GlobalData.ChildCurrentCC = 0;

} /* End of FM_ChildCopyCmd() */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -358,8 +352,7 @@ void FM_ChildMoveCmd(const FM_ChildQueueEntry_t *CmdArgs)
/* Report previous child task activity */
FM_GlobalData.ChildPreviousCC = CmdArgs->CommandCode;
FM_GlobalData.ChildCurrentCC = 0;

} /* End of FM_ChildMoveCmd() */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -398,8 +391,7 @@ void FM_ChildRenameCmd(const FM_ChildQueueEntry_t *CmdArgs)
/* Report previous child task activity */
FM_GlobalData.ChildPreviousCC = CmdArgs->CommandCode;
FM_GlobalData.ChildCurrentCC = 0;

} /* End of FM_ChildRenameCmd() */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -438,8 +430,7 @@ void FM_ChildDeleteCmd(const FM_ChildQueueEntry_t *CmdArgs)
/* Report previous child task activity */
FM_GlobalData.ChildPreviousCC = CmdArgs->CommandCode;
FM_GlobalData.ChildCurrentCC = 0;

} /* End of FM_ChildDeleteCmd() */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -590,8 +581,7 @@ void FM_ChildDeleteAllCmd(FM_ChildQueueEntry_t *CmdArgs)
/* Report previous child task activity */
FM_GlobalData.ChildPreviousCC = CmdArgs->CommandCode;
FM_GlobalData.ChildCurrentCC = 0;

} /* End of FM_ChildDeleteAllCmd() */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -633,8 +623,7 @@ void FM_ChildDecompressCmd(const FM_ChildQueueEntry_t *CmdArgs)
/* Report previous child task activity */
FM_GlobalData.ChildPreviousCC = CmdArgs->CommandCode;
FM_GlobalData.ChildCurrentCC = 0;

} /* End of FM_ChildDecompressCmd() */
}

#endif

Expand Down Expand Up @@ -810,8 +799,7 @@ void FM_ChildConcatCmd(const FM_ChildQueueEntry_t *CmdArgs)
/* Report previous child task activity */
FM_GlobalData.ChildPreviousCC = CmdArgs->CommandCode;
FM_GlobalData.ChildCurrentCC = 0;

} /* End of FM_ChildConcatCmd() */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -969,8 +957,7 @@ void FM_ChildFileInfoCmd(FM_ChildQueueEntry_t *CmdArgs)
/* Report previous child task activity */
FM_GlobalData.ChildPreviousCC = CmdArgs->CommandCode;
FM_GlobalData.ChildCurrentCC = 0;

} /* End of FM_ChildFileInfoCmd() */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -1009,8 +996,7 @@ void FM_ChildCreateDirCmd(const FM_ChildQueueEntry_t *CmdArgs)
/* Report previous child task activity */
FM_GlobalData.ChildPreviousCC = CmdArgs->CommandCode;
FM_GlobalData.ChildCurrentCC = 0;

} /* End of FM_ChildCreateDirCmd() */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -1088,8 +1074,7 @@ void FM_ChildDeleteDirCmd(const FM_ChildQueueEntry_t *CmdArgs)
/* Report previous child task activity */
FM_GlobalData.ChildPreviousCC = CmdArgs->CommandCode;
FM_GlobalData.ChildCurrentCC = 0;

} /* End of FM_ChildDeleteDirCmd() */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -1149,8 +1134,7 @@ void FM_ChildDirListFileCmd(const FM_ChildQueueEntry_t *CmdArgs)
/* Report previous child task activity */
FM_GlobalData.ChildPreviousCC = CmdArgs->CommandCode;
FM_GlobalData.ChildCurrentCC = 0;

} /* End of FM_ChildDirListFileCmd() */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -1283,8 +1267,7 @@ void FM_ChildDirListPktCmd(const FM_ChildQueueEntry_t *CmdArgs)
/* Report previous child task activity */
FM_GlobalData.ChildPreviousCC = CmdArgs->CommandCode;
FM_GlobalData.ChildCurrentCC = 0;

} /* End of FM_ChildDirListPktCmd() */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -1319,8 +1302,7 @@ void FM_ChildSetPermissionsCmd(const FM_ChildQueueEntry_t *CmdArgs)
/* Report previous child task activity */
FM_GlobalData.ChildPreviousCC = CmdArgs->CommandCode;
FM_GlobalData.ChildCurrentCC = 0;

} /* End of FM_ChildSetPermissionsCmd() */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -1400,8 +1382,7 @@ bool FM_ChildDirListFileInit(osal_id_t *FileHandlePtr, const char *Directory, co
}

return CommandResult;

} /* End FM_ChildDirListFileInit */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -1537,8 +1518,7 @@ void FM_ChildDirListFileLoop(osal_id_t DirId, osal_id_t FileHandle, const char *
"%s command: wrote %d of %d names: dir = %s, filename = %s", CmdText, (int)FileEntries,
(int)DirEntries, Directory, Filename);
}

} /* End of FM_ChildDirListFileLoop */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -1569,8 +1549,7 @@ int32 FM_ChildSizeTimeMode(const char *Filename, uint32 *FileSize, uint32 *FileT
}

return Result;

} /* End of FM_ChildSizeTimeMode */
}

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -1603,8 +1582,4 @@ void FM_ChildSleepStat(const char *Filename, FM_DirListEntry_t *DirListData, int
DirListData->ModifyTime = 0;
DirListData->Mode = 0;
}
} /* FM_ChildSleepStat */

/************************/
/* End of File Comment */
/************************/
}
Loading