Merge pull request #23 from skliper/fix22-static_analysis

Fix #22, Resolve strict cppcheck warnings
nasa · May 11, 2022 · 3a8d00a · 3a8d00a
2 parents bb70184 + efe5533
commit 3a8d00a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/fsw/src/fm_cmd_utils.h b/fsw/src/fm_cmd_utils.h
@@ -200,7 +200,7 @@ bool FM_VerifyFileExists(char *Filename, uint32 BufferSize, uint32 EventID, cons
  *
  *  \par Assumptions, External Events, and Notes:
  *
- *  \param [in]  Name       Pointer to buffer containing name
+ *  \param [in]  Filename   Pointer to buffer containing name
  *  \param [in]  BufferSize Size of name character buffer
  *  \param [in]  EventID    Error event ID (command specific)
  *  \param [in]  CmdText    Error event text (command specific)
@@ -211,7 +211,7 @@ bool FM_VerifyFileExists(char *Filename, uint32 BufferSize, uint32 EventID, cons
  *
  *  \sa #FM_GetFilenameState
  */
-bool FM_VerifyFileNoExist(char *Name, uint32 BufferSize, uint32 EventID, const char *CmdText);
+bool FM_VerifyFileNoExist(char *Filename, uint32 BufferSize, uint32 EventID, const char *CmdText);
 
 /**
  *  \brief Verify File Is Not Open Function
@@ -222,7 +222,7 @@ bool FM_VerifyFileNoExist(char *Name, uint32 BufferSize, uint32 EventID, const c
  *
  *  \par Assumptions, External Events, and Notes:
  *
- *  \param [in]  Name       Pointer to buffer containing name
+ *  \param [in]  Filename   Pointer to buffer containing name
  *  \param [in]  BufferSize Size of name character buffer
  *  \param [in]  EventID    Error event ID (command specific)
  *  \param [in]  CmdText    Error event text (command specific)
@@ -233,7 +233,7 @@ bool FM_VerifyFileNoExist(char *Name, uint32 BufferSize, uint32 EventID, const c
  *
  *  \sa #FM_GetFilenameState
  */
-bool FM_VerifyFileNotOpen(char *Name, uint32 BufferSize, uint32 EventID, const char *CmdText);
+bool FM_VerifyFileNotOpen(char *Filename, uint32 BufferSize, uint32 EventID, const char *CmdText);
 
 /**
  *  \brief Verify Directory Exists Function

diff --git a/fsw/src/fm_tbl.c b/fsw/src/fm_tbl.c
@@ -40,7 +40,7 @@
 
 int32 FM_TableInit(void)
 {
-    int32 Status = CFE_SUCCESS;
+    int32 Status;
 
     /* Initialize file system free space table pointer */
     FM_GlobalData.FreeSpaceTablePtr = (FM_FreeSpaceTable_t *)NULL;
@@ -188,7 +188,7 @@ int32 FM_ValidateTable(FM_FreeSpaceTable_t *TablePtr)
 
 void FM_AcquireTablePointers(void)
 {
-    int32 Status = CFE_TBL_ERR_NEVER_LOADED;
+    int32 Status;
 
     /* Allow cFE an opportunity to make table updates */
     CFE_TBL_Manage(FM_GlobalData.FreeSpaceTableHandle);

diff --git a/fsw/src/fm_tbl.h b/fsw/src/fm_tbl.h
@@ -62,15 +62,15 @@ int32 FM_TableInit(void);
  *
  *  \par Assumptions, External Events, and Notes:
  *
- *  \param [in]  TableData - Pointer to table data for verification.
+ *  \param [in]  TablePtr - Pointer to table data for verification.
  *
  *  \return Validation status
  *  \retval #CFE_SUCCESS             \copydoc CFE_SUCCESS
  *  \retval #FM_TABLE_VALIDATION_ERR \copybrief FM_TABLE_VALIDATION_ERR
  *
  *  \sa /FM_AppInit
  */
-int32 FM_ValidateTable(FM_FreeSpaceTable_t *TableData);
+int32 FM_ValidateTable(FM_FreeSpaceTable_t *TablePtr);
 
 /**
  *  \brief Acquire Table Data Pointer Function