Skip to content

Commit

Permalink
Fix #141, Convert int32 return codes and variables to CFE_Status_t
Browse files Browse the repository at this point in the history
  • Loading branch information
thnkslprpt committed May 24, 2023
1 parent 82645f5 commit cd7c2a9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
1 change: 0 additions & 1 deletion .github/workflows/format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ jobs:
format-check:
name: Run format check
uses: nasa/cFS/.github/workflows/format-check.yml@main

1 change: 0 additions & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ jobs:
static-analysis:
name: Run cppcheck
uses: nasa/cFS/.github/workflows/static-analysis.yml@main

6 changes: 3 additions & 3 deletions fsw/src/sch_lab_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ SCH_LAB_GlobalData_t SCH_LAB_Global;
/*
** Local Function Prototypes
*/
int32 SCH_LAB_AppInit(void);
CFE_Status_t SCH_LAB_AppInit(void);

/*
** AppMain
Expand Down Expand Up @@ -155,10 +155,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;
Expand Down

0 comments on commit cd7c2a9

Please sign in to comment.