Merge pull request #142 from thnkslprpt:fix-141-convert-int32-return-…

…codes-to-CFE_Status_t Fix #141, Convert int32 return codes and variables to CFE_Status_t
nasa · Nov 13, 2023 · ef6e0ea · ef6e0ea
2 parents 2ba0ff6 + 9b24dd9
commit ef6e0ea
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/codeql-build.yml b/.github/workflows/codeql-build.yml
@@ -3,12 +3,12 @@ name: "CodeQL Analysis"
 on:
   push:
   pull_request:
-  
+
 jobs:
   codeql:
     name: Codeql
     uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main
-    with: 
+    with:
       component-path: apps/sch_lab
       prep: 'make prep; make -C build/tools/elf2cfetbl'
       make: 'make -C build/native/default_cpu1/apps/sch_lab'
diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml
@@ -9,4 +9,3 @@ jobs:
   format-check:
     name: Run format check
     uses: nasa/cFS/.github/workflows/format-check.yml@main
-
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -9,4 +9,3 @@ jobs:
   static-analysis:
     name: Run cppcheck
     uses: nasa/cFS/.github/workflows/static-analysis.yml@main
-
diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c
@@ -63,7 +63,7 @@ SCH_LAB_GlobalData_t SCH_LAB_Global;
 /*
 ** Local Function Prototypes
 */
-int32 SCH_LAB_AppInit(void);
+CFE_Status_t SCH_LAB_AppInit(void);
 
 /*
 ** AppMain
@@ -148,10 +148,10 @@ void SCH_LAB_LocalTimerCallback(osal_id_t object_id, void *arg)
 /* Initialization                                                  */
 /*                                                                 */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-int32 SCH_LAB_AppInit(void)
+CFE_Status_t SCH_LAB_AppInit(void)
 {
     int                           i, x;
-    int32                         Status;
+    CFE_Status_t                  Status;
     int32                         OsStatus;
     uint32                        TimerPeriod;
     osal_id_t                     TimeBaseId = OS_OBJECT_ID_UNDEFINED;