Skip to content

Commit

Permalink
Fix nasa#1253, Resolve UT uninit vars static analysis warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@skliper
skliper committed May 12, 2022
1 parent 4c08633 commit bb78efe
Show file tree
Hide file tree
Showing 13 changed files with 71 additions and 49 deletions.
2 changes: 1 addition & 1 deletion src/tests/shell-test/shell-test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ void TestOutputToFile(void)
size_t size;
int32 filepos;
int32 status;
osal_id_t fd;
osal_id_t fd = OS_OBJECT_ID_UNDEFINED;

OS_mkfs(NULL, "/ramdev0", "RAM", 512, 20);
OS_mount("/ramdev0", "/drive0");
Expand Down
2 changes: 1 addition & 1 deletion src/tests/symbol-api-test/symbol-api-test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
void TestSymbolApi(void)
{
int32 status;
cpuaddr SymAddress;
cpuaddr SymAddress = NULL;

/* Make the file system */
status = OS_mkfs(0, "/ramdev0", "RAM", 512, 2048);
Expand Down
8 changes: 5 additions & 3 deletions src/tests/timer-test/timer-test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ uint32 timer_idlookup[OS_MAX_TIMERS];
*/
void test_func(osal_id_t timer_id)
{
osal_index_t idx;
osal_index_t idx = OSAL_INDEX_C(0);
OS_ConvertToArrayIndex(timer_id, &idx);
timer_counter[timer_idlookup[idx]]++;
}
Expand Down Expand Up @@ -114,10 +114,12 @@ void TimerTestTask(void)

int i = 0;
int32 TimerStatus[NUMBER_OF_TIMERS];
osal_index_t TableId;
osal_index_t TableId = OSAL_INDEX_C(0);
osal_id_t TimerID[NUMBER_OF_TIMERS];
char TimerName[NUMBER_OF_TIMERS][20] = {"TIMER1", "TIMER2", "TIMER3", "TIMER4", "TIMER5"};
uint32 ClockAccuracy;
uint32 ClockAccuracy = 0;

memset(TimerID, 0, sizeof(TimerID));

for (i = 0; i < NUMBER_OF_TIMERS && i < OS_MAX_TIMERS; i++)
{
Expand Down
16 changes: 9 additions & 7 deletions src/unit-tests/oscore-test/ut_oscore_binsem_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ void UT_os_bin_sem_create_test()
char long_sem_name[UT_OS_NAME_BUFF_SIZE];
osal_id_t sem_ids[OS_MAX_BIN_SEMAPHORES + 1];

memset(sem_ids, 0, sizeof(sem_ids));

/*-----------------------------------------------------*/
UT_RETVAL(OS_BinSemCreate(NULL, "BinSem1", 1, 0), OS_INVALID_POINTER);

Expand Down Expand Up @@ -128,7 +130,7 @@ void UT_os_bin_sem_create_test()
**--------------------------------------------------------------------------------*/
void UT_os_bin_sem_delete_test()
{
osal_id_t bin_sem_id;
osal_id_t bin_sem_id = OS_OBJECT_ID_UNDEFINED;

/*-----------------------------------------------------*/
UT_RETVAL(OS_BinSemDelete(UT_OBJID_INCORRECT), OS_ERR_INVALID_ID);
Expand All @@ -152,7 +154,7 @@ void UT_os_bin_sem_delete_test()
**--------------------------------------------------------------------------------*/
void UT_os_bin_sem_flush_test()
{
osal_id_t bin_sem_id;
osal_id_t bin_sem_id = OS_OBJECT_ID_UNDEFINED;

/*-----------------------------------------------------*/
UT_RETVAL(OS_BinSemFlush(UT_OBJID_INCORRECT), OS_ERR_INVALID_ID);
Expand All @@ -177,7 +179,7 @@ void UT_os_bin_sem_flush_test()
**--------------------------------------------------------------------------------*/
void UT_os_bin_sem_give_test()
{
osal_id_t bin_sem_id;
osal_id_t bin_sem_id = OS_OBJECT_ID_UNDEFINED;

/*-----------------------------------------------------*/
UT_RETVAL(OS_BinSemGive(UT_OBJID_INCORRECT), OS_ERR_INVALID_ID);
Expand All @@ -203,7 +205,7 @@ void UT_os_bin_sem_give_test()
**--------------------------------------------------------------------------------*/
void UT_os_bin_sem_take_test()
{
osal_id_t bin_sem_id;
osal_id_t bin_sem_id = OS_OBJECT_ID_UNDEFINED;

/*-----------------------------------------------------*/
UT_RETVAL(OS_BinSemTake(UT_OBJID_INCORRECT), OS_ERR_INVALID_ID);
Expand All @@ -228,7 +230,7 @@ void UT_os_bin_sem_take_test()
**--------------------------------------------------------------------------------*/
void UT_os_bin_sem_timed_wait_test()
{
osal_id_t bin_sem_id;
osal_id_t bin_sem_id = OS_OBJECT_ID_UNDEFINED;

/*-----------------------------------------------------*/
UT_RETVAL(OS_BinSemTimedWait(UT_OBJID_INCORRECT, 1000), OS_ERR_INVALID_ID);
Expand Down Expand Up @@ -261,7 +263,7 @@ void UT_os_bin_sem_timed_wait_test()
**--------------------------------------------------------------------------------*/
void UT_os_bin_sem_get_id_by_name_test()
{
osal_id_t bin_sem_id;
osal_id_t bin_sem_id = OS_OBJECT_ID_UNDEFINED;
char long_sem_name[UT_OS_NAME_BUFF_SIZE];

/*-----------------------------------------------------*/
Expand Down Expand Up @@ -297,7 +299,7 @@ void UT_os_bin_sem_get_id_by_name_test()
**--------------------------------------------------------------------------------*/
void UT_os_bin_sem_get_info_test()
{
osal_id_t bin_sem_id;
osal_id_t bin_sem_id = OS_OBJECT_ID_UNDEFINED;
OS_bin_sem_prop_t bin_sem_prop;

/*-----------------------------------------------------*/
Expand Down
14 changes: 8 additions & 6 deletions src/unit-tests/oscore-test/ut_oscore_countsem_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ void UT_os_count_sem_create_test()
char sem_name[UT_OS_NAME_BUFF_SIZE];
char long_sem_name[UT_OS_NAME_BUFF_SIZE];

memset(count_sem_ids, 0, sizeof(count_sem_ids));

/*-----------------------------------------------------*/
/* #1 Null-pointer-arg-1 */

Expand Down Expand Up @@ -155,7 +157,7 @@ void UT_os_count_sem_create_test()
**--------------------------------------------------------------------------------*/
void UT_os_count_sem_delete_test()
{
osal_id_t count_sem_id;
osal_id_t count_sem_id = OS_OBJECT_ID_UNDEFINED;

/*-----------------------------------------------------*/
/* #1 Invalid-ID-arg */
Expand Down Expand Up @@ -184,7 +186,7 @@ void UT_os_count_sem_delete_test()
**--------------------------------------------------------------------------------*/
void UT_os_count_sem_give_test()
{
osal_id_t count_sem_id;
osal_id_t count_sem_id = OS_OBJECT_ID_UNDEFINED;

/*-----------------------------------------------------*/
/* #1 Invalid-ID-arg */
Expand Down Expand Up @@ -215,7 +217,7 @@ void UT_os_count_sem_give_test()
**--------------------------------------------------------------------------------*/
void UT_os_count_sem_take_test()
{
osal_id_t count_sem_id;
osal_id_t count_sem_id = OS_OBJECT_ID_UNDEFINED;

/*-----------------------------------------------------*/
/* #1 Invalid-ID-arg */
Expand Down Expand Up @@ -245,7 +247,7 @@ void UT_os_count_sem_take_test()
**--------------------------------------------------------------------------------*/
void UT_os_count_sem_timed_wait_test()
{
osal_id_t count_sem_id;
osal_id_t count_sem_id = OS_OBJECT_ID_UNDEFINED;

/*-----------------------------------------------------*/
/* #1 Invalid-ID-arg */
Expand Down Expand Up @@ -289,7 +291,7 @@ void UT_os_count_sem_timed_wait_test()
**--------------------------------------------------------------------------------*/
void UT_os_count_sem_get_id_by_name_test()
{
osal_id_t count_sem_id;
osal_id_t count_sem_id = OS_OBJECT_ID_UNDEFINED;
char long_sem_name[UT_OS_NAME_BUFF_SIZE];

/*-----------------------------------------------------*/
Expand Down Expand Up @@ -336,7 +338,7 @@ void UT_os_count_sem_get_id_by_name_test()
**--------------------------------------------------------------------------------*/
void UT_os_count_sem_get_info_test()
{
osal_id_t count_sem_id;
osal_id_t count_sem_id = OS_OBJECT_ID_UNDEFINED;
OS_count_sem_prop_t count_sem_prop;

/*-----------------------------------------------------*/
Expand Down
19 changes: 13 additions & 6 deletions src/unit-tests/oscore-test/ut_oscore_misc_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,13 @@
*--------------------------------------------------------------------------------*/
void UT_os_apiinit_test()
{
osal_id_t qId;
osal_blockcount_t qDepth = OSAL_BLOCKCOUNT_C(10);
size_t qSize = OSAL_SIZE_C(4);
uint32 qFlags = 0;
osal_id_t semIds[3];
uint32 semInitValue = 1, semOptions = 0;
osal_id_t qId = OS_OBJECT_ID_UNDEFINED;
osal_blockcount_t qDepth = OSAL_BLOCKCOUNT_C(10);
size_t qSize = OSAL_SIZE_C(4);
uint32 qFlags = 0;
osal_id_t semIds[3] = {OS_OBJECT_ID_UNDEFINED, OS_OBJECT_ID_UNDEFINED, OS_OBJECT_ID_UNDEFINED};
uint32 semInitValue = 1;
uint32 semOptions = 0;

/*-----------------------------------------------------*/
/* #1 Init-not-call-first */
Expand Down Expand Up @@ -245,6 +246,8 @@ void UT_os_getlocaltime_test()
OS_time_t time_struct;
int32 i = 0;

memset(&time_struct, 0, sizeof(time_struct));

/*-----------------------------------------------------*/
/* API not implemented */

Expand Down Expand Up @@ -309,6 +312,8 @@ void UT_os_setlocaltime_test()
OS_time_t time_struct;
int32 i = 0;

memset(&time_struct, 0, sizeof(time_struct));

/*-----------------------------------------------------*/
/* API not implemented */

Expand Down Expand Up @@ -386,6 +391,8 @@ void UT_os_geterrorname_test(void)
{
os_err_name_t errNames[4];

memset(errNames, 0, sizeof(errNames));

/*-----------------------------------------------------*/
/* #1 Null-pointer-arg */

Expand Down
14 changes: 7 additions & 7 deletions src/unit-tests/oscore-test/ut_oscore_mutex_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
void UT_os_mut_sem_create_test()
{
int i;
osal_id_t mut_sem_id;
osal_id_t mut_sem_id2;
osal_id_t mut_sem_id = OS_OBJECT_ID_UNDEFINED;
osal_id_t mut_sem_id2 = OS_OBJECT_ID_UNDEFINED;
char sem_name[UT_OS_NAME_BUFF_SIZE];
char long_sem_name[UT_OS_NAME_BUFF_SIZE];

Expand Down Expand Up @@ -141,7 +141,7 @@ void UT_os_mut_sem_create_test()
**--------------------------------------------------------------------------------*/
void UT_os_mut_sem_delete_test()
{
osal_id_t mut_sem_id;
osal_id_t mut_sem_id = OS_OBJECT_ID_UNDEFINED;

/*-----------------------------------------------------*/
/* #1 Invalid-ID-arg */
Expand Down Expand Up @@ -169,7 +169,7 @@ void UT_os_mut_sem_delete_test()
**--------------------------------------------------------------------------------*/
void UT_os_mut_sem_give_test()
{
osal_id_t mut_sem_id;
osal_id_t mut_sem_id = OS_OBJECT_ID_UNDEFINED;

/*-----------------------------------------------------*/
/* #1 Invalid-ID-arg */
Expand Down Expand Up @@ -202,7 +202,7 @@ void UT_os_mut_sem_give_test()
**--------------------------------------------------------------------------------*/
void UT_os_mut_sem_take_test()
{
osal_id_t mut_sem_id;
osal_id_t mut_sem_id = OS_OBJECT_ID_UNDEFINED;

/*-----------------------------------------------------*/
/* #1 Invalid-ID-arg */
Expand Down Expand Up @@ -233,7 +233,7 @@ void UT_os_mut_sem_take_test()
**--------------------------------------------------------------------------------*/
void UT_os_mut_sem_get_id_by_name_test()
{
osal_id_t mut_sem_id;
osal_id_t mut_sem_id = OS_OBJECT_ID_UNDEFINED;
char long_sem_name[UT_OS_NAME_BUFF_SIZE];

/*-----------------------------------------------------*/
Expand Down Expand Up @@ -278,7 +278,7 @@ void UT_os_mut_sem_get_id_by_name_test()
**--------------------------------------------------------------------------------*/
void UT_os_mut_sem_get_info_test()
{
osal_id_t mut_sem_id;
osal_id_t mut_sem_id = OS_OBJECT_ID_UNDEFINED;
OS_mut_sem_prop_t mut_sem_prop;

/*-----------------------------------------------------*/
Expand Down
14 changes: 7 additions & 7 deletions src/unit-tests/oscore-test/ut_oscore_queue_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
void UT_os_queue_create_test()
{
int i = 0;
osal_id_t queue_id;
osal_id_t queue_id2;
osal_id_t queue_id = OS_OBJECT_ID_UNDEFINED;
osal_id_t queue_id2 = OS_OBJECT_ID_UNDEFINED;
char queue_name[UT_OS_NAME_BUFF_SIZE];
char long_queue_name[UT_OS_NAME_BUFF_SIZE];

Expand Down Expand Up @@ -153,7 +153,7 @@ void UT_os_queue_create_test()
**--------------------------------------------------------------------------------*/
void UT_os_queue_delete_test()
{
osal_id_t queue_id;
osal_id_t queue_id = OS_OBJECT_ID_UNDEFINED;

/*-----------------------------------------------------*/
/* #1 Invalid-ID-arg */
Expand Down Expand Up @@ -183,7 +183,7 @@ void UT_os_queue_delete_test()
**--------------------------------------------------------------------------------*/
void UT_os_queue_get_test()
{
osal_id_t queue_id;
osal_id_t queue_id = OS_OBJECT_ID_UNDEFINED;
uint32 queue_data_out;
uint32 queue_data_in;
size_t size_copied;
Expand Down Expand Up @@ -298,7 +298,7 @@ void UT_os_queue_get_test()
**--------------------------------------------------------------------------------*/
void UT_os_queue_put_test()
{
osal_id_t queue_id;
osal_id_t queue_id = OS_OBJECT_ID_UNDEFINED;
uint32 queue_data_out = 0;
int i;

Expand Down Expand Up @@ -364,7 +364,7 @@ void UT_os_queue_put_test()
**--------------------------------------------------------------------------------*/
void UT_os_queue_get_id_by_name_test()
{
osal_id_t queue_id;
osal_id_t queue_id = OS_OBJECT_ID_UNDEFINED;
char long_queue_name[UT_OS_NAME_BUFF_SIZE];

/*-----------------------------------------------------*/
Expand Down Expand Up @@ -410,7 +410,7 @@ void UT_os_queue_get_id_by_name_test()
**--------------------------------------------------------------------------------*/
void UT_os_queue_get_info_test()
{
osal_id_t queue_id;
osal_id_t queue_id = OS_OBJECT_ID_UNDEFINED;
OS_queue_prop_t queue_prop;

/*-----------------------------------------------------*/
Expand Down
4 changes: 4 additions & 0 deletions src/unit-tests/oscore-test/ut_oscore_task_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,10 @@ void UT_os_task_delay_test()
OS_time_t after_time;
int64 elapsed;

/* Initialize to avoid static analysis warnings */
memset(&before_time, 0, sizeof(before_time));
memset(&after_time, 0, sizeof(after_time));

/*
* Note, if running under a VM/hypervisor, the real time clock may not
* be very precise, depending on its implementation. Therefore the allowed
Expand Down
9 changes: 5 additions & 4 deletions src/unit-tests/osfile-test/ut_osfile_dirio_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void UT_os_read_n_sort_dirs(osal_id_t);
**--------------------------------------------------------------------------------*/
void UT_os_makedir_test()
{
osal_id_t fileDesc;
osal_id_t fileDesc = OS_OBJECT_ID_UNDEFINED;

/*-----------------------------------------------------*/
/* #1 Null-pointer-arg */
Expand Down Expand Up @@ -205,7 +205,7 @@ void UT_os_makedir_test()
**--------------------------------------------------------------------------------*/
void UT_os_opendir_test()
{
osal_id_t dirh;
osal_id_t dirh = OS_OBJECT_ID_UNDEFINED;

/*-----------------------------------------------------*/
/* #1 Null-pointer-arg */
Expand Down Expand Up @@ -278,7 +278,7 @@ void UT_os_opendir_test()
**--------------------------------------------------------------------------------*/
void UT_os_closedir_test()
{
osal_id_t dirh;
osal_id_t dirh = OS_OBJECT_ID_UNDEFINED;
os_dirent_t dirEntry;

UT_RETVAL(OS_DirectoryClose(UT_OBJID_INCORRECT), OS_ERR_INVALID_ID);
Expand Down Expand Up @@ -543,7 +543,7 @@ void UT_os_rewinddir_test()
**--------------------------------------------------------------------------------*/
void UT_os_removedir_test()
{
osal_id_t fileDesc;
osal_id_t fileDesc = OS_OBJECT_ID_UNDEFINED;

/*-----------------------------------------------------*/
/* #1 Null-pointer-arg */
Expand Down Expand Up @@ -600,6 +600,7 @@ void UT_os_read_n_sort_dirs(osal_id_t dirh)
const char *Name;

memset(g_dirItems, 0, sizeof(g_dirItems));
memset(&dirEntry, 0, sizeof(dirEntry));

NumMatched = 0;
NumEntries = 0;
Expand Down
Loading

0 comments on commit bb78efe

Please sign in to comment.