Skip to content

Commit

Permalink
Merge pull request #1294 from thnkslprpt/fix-1293-void-returns
Browse files Browse the repository at this point in the history
Fix #1293, Remove 'return;' from last line of void functions.
  • Loading branch information
dzbaker committed Oct 3, 2022
2 parents 063221a + 81ccbf7 commit 78f64f3
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
7 changes: 0 additions & 7 deletions src/tests/osal-core-test/osal-core-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,12 @@ void task_generic_no_exit(void)
{
OS_TaskDelay(100);
}

return;
} /* end task_0 */

/* **************** A TASK THAT EXITS ITSELF **************************** */

void task_generic_with_exit(void)
{
return;
} /* end task_0 */

typedef struct
Expand Down Expand Up @@ -524,7 +521,6 @@ void InitializeTaskIds(void)
task_1_id = OS_OBJECT_ID_UNDEFINED;
task_2_id = OS_OBJECT_ID_UNDEFINED;
task_3_id = OS_OBJECT_ID_UNDEFINED;
return;
} /* end InitializeTaskIds */

/* **************************************************************************** */
Expand All @@ -534,7 +530,6 @@ void InitializeQIds(void)
msgq_1 = OS_OBJECT_ID_UNDEFINED;
msgq_2 = OS_OBJECT_ID_UNDEFINED;
msgq_3 = OS_OBJECT_ID_UNDEFINED;
return;
} /* end InitializeQIds */

/* ***************************************************************************** */
Expand All @@ -544,7 +539,6 @@ void InitializeBinIds(void)
bin_1 = OS_OBJECT_ID_UNDEFINED;
bin_2 = OS_OBJECT_ID_UNDEFINED;
bin_3 = OS_OBJECT_ID_UNDEFINED;
return;
} /* end InitializeBinIds */

/* ***************************************************************************** */
Expand All @@ -554,7 +548,6 @@ void InitializeMutIds(void)
mut_1 = OS_OBJECT_ID_UNDEFINED;
mut_2 = OS_OBJECT_ID_UNDEFINED;
mut_3 = OS_OBJECT_ID_UNDEFINED;
return;
} /* end InitializeMutIds */

/* ***************************************************************************** */
Expand Down
1 change: 0 additions & 1 deletion src/unit-tests/osloader-test/ut_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,4 @@ void MODULE_NAME(void)
i = 1;
i = i + 1; /* squelch set-but-not-used compiler warning */
(void)i;
return;
}

0 comments on commit 78f64f3

Please sign in to comment.