From cd7c2a9d2be5c5f0653db34a7b3ab8b66cb1fdd3 Mon Sep 17 00:00:00 2001 From: Avi Weiss Date: Mon, 24 Apr 2023 12:12:05 +1000 Subject: [PATCH] Fix #141, Convert `int32` return codes and variables to `CFE_Status_t` --- .github/workflows/codeql-build.yml | 4 ++-- .github/workflows/format-check.yml | 1 - .github/workflows/static-analysis.yml | 1 - fsw/src/sch_lab_app.c | 6 +++--- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/codeql-build.yml b/.github/workflows/codeql-build.yml index 5d091ec..c614cab 100644 --- 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 index 2d73eeb..b9d1f11 100644 --- 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 - \ No newline at end of file diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 706eaae..c3e1ebd 100644 --- 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 - \ No newline at end of file diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c index d699768..6619ea0 100644 --- a/fsw/src/sch_lab_app.c +++ b/fsw/src/sch_lab_app.c @@ -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 @@ -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;