Fix nasa#526, scrub OSAL stubs

Ensure that:

1. All stub routines register their arguments in the context, so that
   the values will be available to hook functions.
2. Ensure that the argument names used in stubs match the name in the
   prototype/documentation so the value can be retrieved by name.

src/ut-stubs/osapi-utstub-binsem.c

@@ -55,6 +55,8 @@ UT_DEFAULT_STUB(OS_BinSemAPI_Init,(void))
 ******************************************************************************/
 int32 OS_BinSemTake(uint32 sem_id)
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_BinSemTake), sem_id);
+
  int32 status = OS_SUCCESS;
 
  status = UT_DEFAULT_IMPL(OS_BinSemTake);
@@ -83,6 +85,8 @@ int32 OS_BinSemTake(uint32 sem_id)
 ******************************************************************************/
 int32 OS_BinSemFlush(uint32 sem_id)
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_BinSemFlush), sem_id);
+
  int32 status;
 
  status = UT_DEFAULT_IMPL(OS_BinSemFlush);
@@ -116,6 +120,11 @@ int32 OS_BinSemFlush(uint32 sem_id)
 int32 OS_BinSemCreate(uint32 *sem_id, const char *sem_name,
  uint32 sem_initial_value, uint32 options)
 {
+ UT_Stub_RegisterContext(UT_KEY(OS_BinSemCreate), sem_id);
+ UT_Stub_RegisterContext(UT_KEY(OS_BinSemCreate), sem_name);
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_BinSemCreate), sem_initial_value);
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_BinSemCreate), options);
+
  int32 status;
 
  status = UT_DEFAULT_IMPL(OS_BinSemCreate);
@@ -150,6 +159,8 @@ int32 OS_BinSemCreate(uint32 *sem_id, const char *sem_name,
 ******************************************************************************/
 int32 OS_BinSemGive(uint32 sem_id)
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_BinSemGive), sem_id);
+
  int32 status;
 
  status = UT_DEFAULT_IMPL(OS_BinSemGive);
@@ -175,6 +186,9 @@ int32 OS_BinSemGive(uint32 sem_id)
 ******************************************************************************/
 int32 OS_BinSemGetInfo(uint32 sem_id, OS_bin_sem_prop_t *bin_prop)
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_BinSemGetInfo), sem_id);
+ UT_Stub_RegisterContext(UT_KEY(OS_BinSemGetInfo), bin_prop);
+
  int32 status;
 
  status = UT_DEFAULT_IMPL(OS_BinSemGetInfo);
@@ -214,6 +228,8 @@ int32 OS_BinSemGetInfo(uint32 sem_id, OS_bin_sem_prop_t *bin_prop)
 ******************************************************************************/
 int32 OS_BinSemDelete(uint32 sem_id)
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_BinSemDelete), sem_id);
+
  int32 status;
 
  status = UT_DEFAULT_IMPL(OS_BinSemDelete);
@@ -247,6 +263,9 @@ int32 OS_BinSemDelete(uint32 sem_id)
 ******************************************************************************/
 int32 OS_BinSemTimedWait(uint32 sem_id, uint32 msecs)
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_BinSemTimedWait), sem_id);
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_BinSemTimedWait), msecs);
+
  int32 status;
 
  status = UT_DEFAULT_IMPL(OS_BinSemTimedWait);
@@ -261,6 +280,9 @@ int32 OS_BinSemTimedWait(uint32 sem_id, uint32 msecs)
  *****************************************************************************/
 int32 OS_BinSemGetIdByName (uint32 *sem_id, const char *sem_name)
 {
+ UT_Stub_RegisterContext(UT_KEY(OS_BinSemGetIdByName), sem_id);
+ UT_Stub_RegisterContext(UT_KEY(OS_BinSemGetIdByName), sem_name);
+
  int32 status;
 
  status = UT_DEFAULT_IMPL(OS_BinSemGetIdByName);

src/ut-stubs/osapi-utstub-clock.c

@@ -42,10 +42,11 @@
  *****************************************************************************/
 int32 OS_GetLocalTime(OS_time_t *time_struct)
 {
+ UT_Stub_RegisterContext(UT_KEY(OS_GetLocalTime), time_struct);
+
  int32 status;
  uint32 count;
 
- UT_Stub_RegisterContext(UT_KEY(OS_GetLocalTime), time_struct);
  status = UT_DEFAULT_IMPL(OS_GetLocalTime);
 
  if (status == OS_SUCCESS &&
@@ -67,9 +68,10 @@ int32 OS_GetLocalTime(OS_time_t *time_struct)
  *****************************************************************************/
 int32 OS_SetLocalTime(OS_time_t *time_struct)
 {
+ UT_Stub_RegisterContext(UT_KEY(OS_SetLocalTime), time_struct);
+
  int32 status;
 
- UT_Stub_RegisterContext(UT_KEY(OS_SetLocalTime), time_struct);
  status = UT_DEFAULT_IMPL(OS_SetLocalTime);
 
  return status;

src/ut-stubs/osapi-utstub-common.c

@@ -57,6 +57,8 @@ int32 OS_API_Init(void)
  *****************************************************************************/
 void OS_ApplicationExit(int32 Status)
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_ApplicationExit), Status);
+
  /* just call the default so a hook can be attached */
  UT_DEFAULT_IMPL(OS_ApplicationExit);
 }
@@ -100,7 +102,8 @@ void OS_IdleLoop(void)
  *****************************************************************************/
 void OS_ApplicationShutdown(uint8 flag)
 {
- UT_Stub_RegisterContext(UT_KEY(OS_ApplicationShutdown), &flag);
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_ApplicationShutdown), flag);
+
  UT_DEFAULT_IMPL(OS_ApplicationShutdown);
 }
 

src/ut-stubs/osapi-utstub-countsem.c

@@ -45,6 +45,11 @@ UT_DEFAULT_STUB(OS_CountSemAPI_Init,(void))
 int32 OS_CountSemCreate(uint32 *sem_id, const char *sem_name,
  uint32 sem_initial_value, uint32 options)
 {
+ UT_Stub_RegisterContext(UT_KEY(OS_CountSemCreate), sem_id);
+ UT_Stub_RegisterContext(UT_KEY(OS_CountSemCreate), sem_name);
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_CountSemCreate), sem_initial_value);
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_CountSemCreate), options);
+
  int32 status;
 
  status = UT_DEFAULT_IMPL(OS_CountSemCreate);
@@ -83,6 +88,8 @@ int32 OS_CountSemCreate(uint32 *sem_id, const char *sem_name,
 ******************************************************************************/
 int32 OS_CountSemDelete(uint32 sem_id)
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_CountSemDelete), sem_id);
+
  int32 status;
 
  status = UT_DEFAULT_IMPL(OS_CountSemDelete);
@@ -103,6 +110,8 @@ int32 OS_CountSemDelete(uint32 sem_id)
  *****************************************************************************/
 int32 OS_CountSemGive ( uint32 sem_id )
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_CountSemGive), sem_id);
+
  int32 status;
 
  status = UT_DEFAULT_IMPL(OS_CountSemGive);
@@ -117,6 +126,8 @@ int32 OS_CountSemGive ( uint32 sem_id )
  *****************************************************************************/
 int32 OS_CountSemTake ( uint32 sem_id )
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_CountSemTake), sem_id);
+
  int32 status;
 
  status = UT_DEFAULT_IMPL(OS_CountSemTake);
@@ -131,6 +142,9 @@ int32 OS_CountSemTake ( uint32 sem_id )
  *****************************************************************************/
 int32 OS_CountSemTimedWait ( uint32 sem_id, uint32 msecs )
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_CountSemTimedWait), sem_id);
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_CountSemTimedWait), msecs);
+
  int32 status;
 
  status = UT_DEFAULT_IMPL(OS_CountSemTimedWait);
@@ -145,6 +159,9 @@ int32 OS_CountSemTimedWait ( uint32 sem_id, uint32 msecs )
  *****************************************************************************/
 int32 OS_CountSemGetIdByName (uint32 *sem_id, const char *sem_name)
 {
+ UT_Stub_RegisterContext(UT_KEY(OS_CountSemGetIdByName), sem_id);
+ UT_Stub_RegisterContext(UT_KEY(OS_CountSemGetIdByName), sem_name);
+
  int32 status;
 
  status = UT_DEFAULT_IMPL(OS_CountSemGetIdByName);
@@ -177,6 +194,9 @@ int32 OS_CountSemGetIdByName (uint32 *sem_id, const char *sem_name)
 ******************************************************************************/
 int32 OS_CountSemGetInfo(uint32 sem_id, OS_count_sem_prop_t *count_prop)
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_CountSemGetInfo), sem_id);
+ UT_Stub_RegisterContext(UT_KEY(OS_CountSemGetInfo), count_prop);
+
  int32 status;
 
  status = UT_DEFAULT_IMPL(OS_CountSemGetInfo);

src/ut-stubs/osapi-utstub-dir.c

@@ -44,6 +44,9 @@ UT_DEFAULT_STUB(OS_DirAPI_Init,(void))
  *****************************************************************************/
 int32 OS_mkdir (const char *path, uint32 access)
 {
+ UT_Stub_RegisterContext(UT_KEY(OS_mkdir), path);
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_mkdir), access);
+
  int32 Status;
 
  Status = UT_DEFAULT_IMPL(OS_mkdir);
@@ -58,6 +61,8 @@ int32 OS_mkdir (const char *path, uint32 access)
  *****************************************************************************/
 int32 OS_rmdir (const char *path)
 {
+ UT_Stub_RegisterContext(UT_KEY(OS_rmdir), path);
+
  int32 Status;
 
  Status = UT_DEFAULT_IMPL(OS_rmdir);
@@ -74,6 +79,9 @@ int32 OS_rmdir (const char *path)
  *****************************************************************************/
 int32 OS_DirectoryOpen(uint32 *dir_id, const char *path)
 {
+ UT_Stub_RegisterContext(UT_KEY(OS_DirectoryOpen), dir_id);
+ UT_Stub_RegisterContext(UT_KEY(OS_DirectoryOpen), path);
+
  int32 Status;
 
  Status = UT_DEFAULT_IMPL(OS_DirectoryOpen);
@@ -98,6 +106,8 @@ int32 OS_DirectoryOpen(uint32 *dir_id, const char *path)
  *****************************************************************************/
 int32 OS_DirectoryClose(uint32 dir_id)
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_DirectoryClose), dir_id);
+
  int32 Status;
 
  Status = UT_DEFAULT_IMPL(OS_DirectoryClose);
@@ -117,6 +127,8 @@ int32 OS_DirectoryClose(uint32 dir_id)
  *****************************************************************************/
 int32 OS_DirectoryRewind(uint32 dir_id)
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_DirectoryRewind), dir_id);
+
  int32 Status;
 
  Status = UT_DEFAULT_IMPL(OS_DirectoryRewind);
@@ -131,6 +143,9 @@ int32 OS_DirectoryRewind(uint32 dir_id)
  *****************************************************************************/
 int32 OS_DirectoryRead(uint32 dir_id, os_dirent_t *dirent)
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_DirectoryRead), dir_id);
+ UT_Stub_RegisterContext(UT_KEY(OS_DirectoryRead), dirent);
+
  int32 Status;
  uint32 CopySize;
 
@@ -159,6 +174,8 @@ int32 OS_DirectoryRead(uint32 dir_id, os_dirent_t *dirent)
  *****************************************************************************/
 os_dirp_t OS_opendir (const char *path)
 {
+ UT_Stub_RegisterContext(UT_KEY(OS_opendir), path);
+
  int32 Status;
  os_dirp_t Dirp;
 
@@ -191,6 +208,8 @@ os_dirp_t OS_opendir (const char *path)
  *****************************************************************************/
 int32 OS_closedir (os_dirp_t directory)
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_closedir), directory);
+
  int32 Status;
 
  Status = UT_DEFAULT_IMPL(OS_closedir);
@@ -206,6 +225,8 @@ int32 OS_closedir (os_dirp_t directory)
  *****************************************************************************/
 os_dirent_t * OS_readdir (os_dirp_t directory)
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_readdir), directory);
+
  static os_dirent_t DefaultEntry;
  os_dirent_t *DirentPtr;
  int32 Status;
@@ -241,6 +262,8 @@ os_dirent_t * OS_readdir (os_dirp_t directory)
  *****************************************************************************/
 void OS_rewinddir(os_dirp_t directory)
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_rewinddir), directory);
+
  /* Call the default impl so hooks will work */
  UT_DEFAULT_IMPL(OS_rewinddir);
 }

src/ut-stubs/osapi-utstub-errors.c

@@ -36,6 +36,9 @@
 
 int32 OS_GetErrorName(int32 error_num, os_err_name_t* err_name)
 {
+ UT_Stub_RegisterContextGenericArg(UT_KEY(OS_GetErrorName), error_num);
+ UT_Stub_RegisterContext(UT_KEY(OS_GetErrorName), err_name);
+
  int32 status;
 
  status = UT_DEFAULT_IMPL(OS_GetErrorName);