diff --git a/README.md b/README.md index 813ac6fde..ceda17574 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,12 @@ The autogenerated OSAL user's guide can be viewed at , , and + ### Development Build: v6.0.0-rc4+dev108 - condition variable API for OSAL - See diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h index a9820d0d5..b5bb11254 100644 --- a/src/os/inc/osapi-version.h +++ b/src/os/inc/osapi-version.h @@ -34,7 +34,7 @@ /* * Development Build Macro Definitions */ -#define OS_BUILD_NUMBER 108 +#define OS_BUILD_NUMBER 116 #define OS_BUILD_BASELINE "v6.0.0-rc4" /* diff --git a/src/os/portable/os-impl-no-symtab.c b/src/os/portable/os-impl-no-symtab.c index 9f3bfde56..868d8e508 100644 --- a/src/os/portable/os-impl-no-symtab.c +++ b/src/os/portable/os-impl-no-symtab.c @@ -55,5 +55,5 @@ int32 OS_ModuleSymbolLookup_Impl(const OS_object_token_t *token, cpuaddr *Symbol *-----------------------------------------------------------------*/ int32 OS_SymbolTableDump_Impl(const char *filename, size_t SizeLimit) { - return (OS_ERR_NOT_IMPLEMENTED); + return OS_ERR_NOT_IMPLEMENTED; } diff --git a/src/os/portable/os-impl-posix-dl-loader.c b/src/os/portable/os-impl-posix-dl-loader.c index fee99c65d..b70c5d0bb 100644 --- a/src/os/portable/os-impl-posix-dl-loader.c +++ b/src/os/portable/os-impl-posix-dl-loader.c @@ -166,6 +166,6 @@ int32 OS_ModuleGetInfo_Impl(const OS_object_token_t *token, OS_module_prop_t *mo * This returns success - although there is no information to add here, * the parent/shared layer information is still valid. */ - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_ModuleGetInfo_Impl */ diff --git a/src/os/portable/os-impl-posix-dl-symtab.c b/src/os/portable/os-impl-posix-dl-symtab.c index 2b8604b6e..7e8513078 100644 --- a/src/os/portable/os-impl-posix-dl-symtab.c +++ b/src/os/portable/os-impl-posix-dl-symtab.c @@ -212,6 +212,6 @@ int32 OS_SymbolTableDump_Impl(const char *filename, size_t SizeLimit) * unimplemented here. */ - return (OS_ERR_NOT_IMPLEMENTED); + return OS_ERR_NOT_IMPLEMENTED; } /* end OS_SymbolTableDump_Impl */ diff --git a/src/os/portable/os-impl-posix-io.c b/src/os/portable/os-impl-posix-io.c index cf468ab5a..f887426ea 100644 --- a/src/os/portable/os-impl-posix-io.c +++ b/src/os/portable/os-impl-posix-io.c @@ -212,7 +212,7 @@ int32 OS_GenericRead_Impl(const OS_object_token_t *token, void *buffer, size_t n } } - return (return_code); + return return_code; } /* end OS_GenericRead_Impl */ /*---------------------------------------------------------------- @@ -269,5 +269,5 @@ int32 OS_GenericWrite_Impl(const OS_object_token_t *token, const void *buffer, s } } - return (return_code); + return return_code; } /* end OS_GenericWrite_Impl */ diff --git a/src/os/portable/os-impl-posix-network.c b/src/os/portable/os-impl-posix-network.c index fcb3c5a68..637f4c244 100644 --- a/src/os/portable/os-impl-posix-network.c +++ b/src/os/portable/os-impl-posix-network.c @@ -74,7 +74,7 @@ int32 OS_NetworkGetHostName_Impl(char *host_name, size_t name_len) return_code = OS_SUCCESS; } - return (return_code); + return return_code; } /* end OS_NetworkGetHostName_Impl */ /*---------------------------------------------------------------- diff --git a/src/os/posix/src/os-impl-binsem.c b/src/os/posix/src/os-impl-binsem.c index 3adc5dc97..cc11cf21f 100644 --- a/src/os/posix/src/os-impl-binsem.c +++ b/src/os/posix/src/os-impl-binsem.c @@ -312,7 +312,7 @@ int32 OS_BinSemGive_Impl(const OS_object_token_t *token) /* Lock the mutex ( not the table! ) */ if (OS_Posix_BinSemAcquireMutex(&sem->id) != OS_SUCCESS) { - return (OS_SEM_FAILURE); + return OS_SEM_FAILURE; } /* Binary semaphores are always set as "1" when given */ @@ -343,7 +343,7 @@ int32 OS_BinSemFlush_Impl(const OS_object_token_t *token) /* Lock the mutex ( not the table! ) */ if (OS_Posix_BinSemAcquireMutex(&sem->id) != OS_SUCCESS) { - return (OS_SEM_FAILURE); + return OS_SEM_FAILURE; } /* increment the flush counter. Any other threads that are @@ -383,7 +383,7 @@ static int32 OS_GenericBinSemTake_Impl(const OS_object_token_t *token, const str /* Lock the mutex ( not the table! ) */ if (OS_Posix_BinSemAcquireMutex(&sem->id) != OS_SUCCESS) { - return (OS_SEM_FAILURE); + return OS_SEM_FAILURE; } /* because pthread_cond_wait() is also a cancellation point, diff --git a/src/os/posix/src/os-impl-common.c b/src/os/posix/src/os-impl-common.c index 7f4d658dd..be87ddb61 100644 --- a/src/os/posix/src/os-impl-common.c +++ b/src/os/posix/src/os-impl-common.c @@ -98,7 +98,7 @@ int32 OS_API_Impl_Init(osal_objtype_t idtype) break; } - return (return_code); + return return_code; } /* end OS_API_Impl_Init */ /*---------------------------------------------------------------- diff --git a/src/os/posix/src/os-impl-filesys.c b/src/os/posix/src/os-impl-filesys.c index 847408ee7..07661a4ba 100644 --- a/src/os/posix/src/os-impl-filesys.c +++ b/src/os/posix/src/os-impl-filesys.c @@ -322,7 +322,7 @@ int32 OS_FileSysStatVolume_Impl(const OS_object_token_t *token, OS_statvfs_t *re result->blocks_free = OSAL_BLOCKCOUNT_C(stat_buf.f_bfree); result->total_blocks = OSAL_BLOCKCOUNT_C(stat_buf.f_blocks); - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_FileSysStatVolume_Impl */ /*---------------------------------------------------------------- diff --git a/src/os/posix/src/os-impl-heap.c b/src/os/posix/src/os-impl-heap.c index dc2996e74..64c5dc5bb 100644 --- a/src/os/posix/src/os-impl-heap.c +++ b/src/os/posix/src/os-impl-heap.c @@ -43,5 +43,5 @@ int32 OS_HeapGetInfo_Impl(OS_heap_prop_t *heap_prop) /* ** Not implemented yet */ - return (OS_ERR_NOT_IMPLEMENTED); + return OS_ERR_NOT_IMPLEMENTED; } /* end OS_HeapGetInfo_Impl */ diff --git a/src/os/posix/src/os-impl-idmap.c b/src/os/posix/src/os-impl-idmap.c index a7be85a64..b121b8179 100644 --- a/src/os/posix/src/os-impl-idmap.c +++ b/src/os/posix/src/os-impl-idmap.c @@ -248,5 +248,5 @@ int32 OS_Posix_TableMutex_Init(osal_objtype_t idtype) } } while (0); - return (return_code); + return return_code; } /* end OS_Posix_TableMutex_Init */ diff --git a/src/os/posix/src/os-impl-loader.c b/src/os/posix/src/os-impl-loader.c index a023fc255..747fa59c7 100644 --- a/src/os/posix/src/os-impl-loader.c +++ b/src/os/posix/src/os-impl-loader.c @@ -44,5 +44,5 @@ OS_impl_module_internal_record_t OS_impl_module_table[OS_MAX_MODULES]; int32 OS_Posix_ModuleAPI_Impl_Init(void) { memset(OS_impl_module_table, 0, sizeof(OS_impl_module_table)); - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_Posix_ModuleAPI_Impl_Init */ diff --git a/src/os/posix/src/os-impl-no-module.c b/src/os/posix/src/os-impl-no-module.c index 62bbb3da7..72056893f 100644 --- a/src/os/posix/src/os-impl-no-module.c +++ b/src/os/posix/src/os-impl-no-module.c @@ -43,5 +43,5 @@ int32 OS_Posix_ModuleAPI_Impl_Init(void) { /* nothing to init in this mode */ - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_Posix_ModuleAPI_Impl_Init */ diff --git a/src/os/posix/src/os-impl-tasks.c b/src/os/posix/src/os-impl-tasks.c index cfed0972c..6ac5b154b 100644 --- a/src/os/posix/src/os-impl-tasks.c +++ b/src/os/posix/src/os-impl-tasks.c @@ -450,7 +450,7 @@ int32 OS_Posix_InternalTaskCreate_Impl(pthread_t *pthr, osal_priority_t priority if (return_code != 0) { OS_DEBUG("pthread_attr_init error in OS_TaskCreate: %s\n", strerror(return_code)); - return (OS_ERROR); + return OS_ERROR; } /* @@ -479,7 +479,7 @@ int32 OS_Posix_InternalTaskCreate_Impl(pthread_t *pthr, osal_priority_t priority if (return_code != 0) { OS_DEBUG("pthread_attr_setstacksize error in OS_TaskCreate: %s\n", strerror(return_code)); - return (OS_ERROR); + return OS_ERROR; } /* @@ -489,7 +489,7 @@ int32 OS_Posix_InternalTaskCreate_Impl(pthread_t *pthr, osal_priority_t priority if (return_code != 0) { OS_DEBUG("pthread_attr_setdetachstate error in OS_TaskCreate: %s\n", strerror(return_code)); - return (OS_ERROR); + return OS_ERROR; } /* @@ -506,7 +506,7 @@ int32 OS_Posix_InternalTaskCreate_Impl(pthread_t *pthr, osal_priority_t priority if (return_code != 0) { OS_DEBUG("pthread_attr_setinheritsched error in OS_TaskCreate, errno = %s\n", strerror(return_code)); - return (OS_ERROR); + return OS_ERROR; } /* @@ -517,7 +517,7 @@ int32 OS_Posix_InternalTaskCreate_Impl(pthread_t *pthr, osal_priority_t priority if (return_code != 0) { OS_DEBUG("pthread_attr_setschedpolity error in OS_TaskCreate: %s\n", strerror(return_code)); - return (OS_ERROR); + return OS_ERROR; } /* @@ -527,7 +527,7 @@ int32 OS_Posix_InternalTaskCreate_Impl(pthread_t *pthr, osal_priority_t priority if (return_code != 0) { OS_DEBUG("pthread_attr_getschedparam error in OS_TaskCreate: %s\n", strerror(return_code)); - return (OS_ERROR); + return OS_ERROR; } priority_holder.sched_priority = OS_PriorityRemap(priority); @@ -535,7 +535,7 @@ int32 OS_Posix_InternalTaskCreate_Impl(pthread_t *pthr, osal_priority_t priority if (return_code != 0) { OS_DEBUG("pthread_attr_setschedparam error in OS_TaskCreate: %s\n", strerror(return_code)); - return (OS_ERROR); + return OS_ERROR; } } /* End if user is root */ @@ -547,7 +547,7 @@ int32 OS_Posix_InternalTaskCreate_Impl(pthread_t *pthr, osal_priority_t priority if (return_code != 0) { OS_DEBUG("pthread_create error in OS_TaskCreate: %s\n", strerror(return_code)); - return (OS_ERROR); + return OS_ERROR; } /* @@ -778,7 +778,7 @@ int32 OS_TaskSetPriority_Impl(const OS_object_token_t *token, osal_priority_t ne { OS_DEBUG("pthread_setschedprio: Task ID = %lu, prio = %d, err = %s\n", OS_ObjectIdToInteger(OS_ObjectIdFromToken(token)), os_priority, strerror(ret)); - return (OS_ERROR); + return OS_ERROR; } } @@ -840,7 +840,7 @@ osal_id_t OS_TaskGetId_Impl(void) self_record.opaque_arg = pthread_getspecific(POSIX_GlobalVars.ThreadKey); - return (self_record.id); + return self_record.id; } /* end OS_TaskGetId_Impl */ /*---------------------------------------------------------------- diff --git a/src/os/posix/src/os-impl-timebase.c b/src/os/posix/src/os-impl-timebase.c index 5f707bae4..16e59d349 100644 --- a/src/os/posix/src/os-impl-timebase.c +++ b/src/os/posix/src/os-impl-timebase.c @@ -304,7 +304,7 @@ int32 OS_Posix_TimeBaseAPI_Impl_Init(void) (1000000 + (OS_SharedGlobalVars.TicksPerSecond / 2)) / OS_SharedGlobalVars.TicksPerSecond; } while (0); - return (return_code); + return return_code; } /* end OS_Posix_TimeBaseAPI_Impl_Init */ /**************************************************************************************** @@ -568,7 +568,7 @@ int32 OS_TimeBaseDelete_Impl(const OS_object_token_t *token) if (status < 0) { OS_DEBUG("Error deleting timer: %s\n", strerror(errno)); - return (OS_TIMER_ERR_INTERNAL); + return OS_TIMER_ERR_INTERNAL; } local->assigned_signal = 0; diff --git a/src/os/rtems/src/os-impl-binsem.c b/src/os/rtems/src/os-impl-binsem.c index cd8885a77..645fb891f 100644 --- a/src/os/rtems/src/os-impl-binsem.c +++ b/src/os/rtems/src/os-impl-binsem.c @@ -74,7 +74,7 @@ OS_impl_binsem_internal_record_t OS_impl_bin_sem_table[OS_MAX_BIN_SEMAPHORES]; int32 OS_Rtems_BinSemAPI_Impl_Init(void) { memset(OS_impl_bin_sem_table, 0, sizeof(OS_impl_bin_sem_table)); - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_Rtems_BinSemAPI_Impl_Init */ /*---------------------------------------------------------------- diff --git a/src/os/rtems/src/os-impl-common.c b/src/os/rtems/src/os-impl-common.c index 6087bdb50..92854e807 100644 --- a/src/os/rtems/src/os-impl-common.c +++ b/src/os/rtems/src/os-impl-common.c @@ -97,7 +97,7 @@ int32 OS_API_Impl_Init(osal_objtype_t idtype) break; } - return (return_code); + return return_code; } /* end OS_API_Impl_Init */ /*---------------------------------------------------------------- diff --git a/src/os/rtems/src/os-impl-countsem.c b/src/os/rtems/src/os-impl-countsem.c index 95e4f7cf3..548558870 100644 --- a/src/os/rtems/src/os-impl-countsem.c +++ b/src/os/rtems/src/os-impl-countsem.c @@ -71,7 +71,7 @@ OS_impl_countsem_internal_record_t OS_impl_count_sem_table[OS_MAX_COUNT_SEMAPHOR int32 OS_Rtems_CountSemAPI_Impl_Init(void) { memset(OS_impl_count_sem_table, 0, sizeof(OS_impl_count_sem_table)); - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_Rtems_CountSemAPI_Impl_Init */ /*---------------------------------------------------------------- @@ -165,7 +165,7 @@ int32 OS_CountSemGive_Impl(const OS_object_token_t *token) return OS_SEM_FAILURE; } - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_CountSemGive_Impl */ diff --git a/src/os/rtems/src/os-impl-filesys.c b/src/os/rtems/src/os-impl-filesys.c index efa175fe9..5e5874877 100644 --- a/src/os/rtems/src/os-impl-filesys.c +++ b/src/os/rtems/src/os-impl-filesys.c @@ -419,7 +419,7 @@ int32 OS_FileSysStatVolume_Impl(const OS_object_token_t *token, OS_statvfs_t *re return_code = OS_SUCCESS; } - return (return_code); + return return_code; } /* end OS_FileSysStatVolume_Impl */ /*---------------------------------------------------------------- diff --git a/src/os/rtems/src/os-impl-heap.c b/src/os/rtems/src/os-impl-heap.c index ab91ce43a..e10ec4c88 100644 --- a/src/os/rtems/src/os-impl-heap.c +++ b/src/os/rtems/src/os-impl-heap.c @@ -51,12 +51,12 @@ int32 OS_HeapGetInfo_Impl(OS_heap_prop_t *heap_prop) if (status != 0) { - return (OS_ERROR); + return OS_ERROR; } heap_prop->free_bytes = (uint32)info.Free.total; heap_prop->free_blocks = (uint32)info.Free.number; heap_prop->largest_free_block = (uint32)info.Free.largest; - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_HeapGetInfo_Impl */ diff --git a/src/os/rtems/src/os-impl-loader.c b/src/os/rtems/src/os-impl-loader.c index c044d12b9..4793f3078 100644 --- a/src/os/rtems/src/os-impl-loader.c +++ b/src/os/rtems/src/os-impl-loader.c @@ -65,7 +65,7 @@ OS_impl_module_internal_record_t OS_impl_module_table[OS_MAX_MODULES]; int32 OS_Rtems_ModuleAPI_Impl_Init(void) { memset(OS_impl_module_table, 0, sizeof(OS_impl_module_table)); - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_Rtems_ModuleAPI_Impl_Init */ /**************************************************************************************** diff --git a/src/os/rtems/src/os-impl-mutex.c b/src/os/rtems/src/os-impl-mutex.c index ecdda2d8a..9c037be6f 100644 --- a/src/os/rtems/src/os-impl-mutex.c +++ b/src/os/rtems/src/os-impl-mutex.c @@ -72,7 +72,7 @@ OS_impl_mutex_internal_record_t OS_impl_mutex_table[OS_MAX_MUTEXES]; int32 OS_Rtems_MutexAPI_Impl_Init(void) { memset(OS_impl_mutex_table, 0, sizeof(OS_impl_mutex_table)); - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_Rtems_MutexAPI_Impl_Init */ /*---------------------------------------------------------------- diff --git a/src/os/rtems/src/os-impl-network.c b/src/os/rtems/src/os-impl-network.c index a15cf0e3f..4f3d296fe 100644 --- a/src/os/rtems/src/os-impl-network.c +++ b/src/os/rtems/src/os-impl-network.c @@ -73,5 +73,5 @@ int32 OS_NetworkGetHostName_Impl(char *host_name, size_t name_len) return_code = OS_SUCCESS; } - return (return_code); + return return_code; } /* end OS_NetworkGetHostName_Impl */ diff --git a/src/os/rtems/src/os-impl-no-module.c b/src/os/rtems/src/os-impl-no-module.c index 15ea38928..144863552 100644 --- a/src/os/rtems/src/os-impl-no-module.c +++ b/src/os/rtems/src/os-impl-no-module.c @@ -45,5 +45,5 @@ int32 OS_Rtems_ModuleAPI_Impl_Init(void) { /* nothing to init, but needs to return SUCCESS to allow the rest of OSAL to work */ - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_Rtems_ModuleAPI_Impl_Init */ diff --git a/src/os/rtems/src/os-impl-queues.c b/src/os/rtems/src/os-impl-queues.c index aed05a03b..af26e40d7 100644 --- a/src/os/rtems/src/os-impl-queues.c +++ b/src/os/rtems/src/os-impl-queues.c @@ -65,7 +65,7 @@ OS_impl_queue_internal_record_t OS_impl_queue_table[OS_MAX_QUEUES]; int32 OS_Rtems_QueueAPI_Impl_Init(void) { memset(OS_impl_queue_table, 0, sizeof(OS_impl_queue_table)); - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_Rtems_QueueAPI_Impl_Init */ /*---------------------------------------------------------------- diff --git a/src/os/rtems/src/os-impl-tasks.c b/src/os/rtems/src/os-impl-tasks.c index e4492f37a..a05ff81d5 100644 --- a/src/os/rtems/src/os-impl-tasks.c +++ b/src/os/rtems/src/os-impl-tasks.c @@ -79,7 +79,7 @@ static rtems_task OS_RtemsEntry(rtems_task_argument arg) int32 OS_Rtems_TaskAPI_Impl_Init(void) { memset(OS_impl_task_table, 0, sizeof(OS_impl_task_table)); - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_Rtems_TaskAPI_Impl_Init */ /*---------------------------------------------------------------- @@ -230,7 +230,7 @@ int32 OS_TaskDelay_Impl(uint32 milli_second) */ rtems_task_wake_after((rtems_interval)tick_count); - return (return_code); + return return_code; } /* end OS_TaskDelay_Impl */ @@ -281,7 +281,7 @@ int32 OS_TaskMatch_Impl(const OS_object_token_t *token) */ if (rtems_task_self() != impl->id) { - return (OS_ERROR); + return OS_ERROR; } return OS_SUCCESS; diff --git a/src/os/rtems/src/os-impl-timebase.c b/src/os/rtems/src/os-impl-timebase.c index a903e330d..0f6842937 100644 --- a/src/os/rtems/src/os-impl-timebase.c +++ b/src/os/rtems/src/os-impl-timebase.c @@ -243,7 +243,7 @@ int32 OS_Rtems_TimeBaseAPI_Impl_Init(void) */ OS_SharedGlobalVars.MicroSecPerTick = (RTEMS_GlobalVars.ClockAccuracyNsec + 500) / 1000; - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_Rtems_TimeBaseAPI_Impl_Init */ /**************************************************************************************** diff --git a/src/os/shared/src/osapi-common.c b/src/os/shared/src/osapi-common.c index c9f98a93e..c8d68a60e 100644 --- a/src/os/shared/src/osapi-common.c +++ b/src/os/shared/src/osapi-common.c @@ -245,7 +245,7 @@ int32 OS_API_Init(void) OS_SharedGlobalVars.GlobalState = OS_SHUTDOWN_MAGIC_NUMBER; } - return (return_code); + return return_code; } /* end OS_API_Init */ /*---------------------------------------------------------------- diff --git a/src/os/shared/src/osapi-file.c b/src/os/shared/src/osapi-file.c index 2d4f5b61f..fcd826349 100644 --- a/src/os/shared/src/osapi-file.c +++ b/src/os/shared/src/osapi-file.c @@ -501,7 +501,7 @@ int32 OS_mv(const char *src, const char *dest) } } - return (return_code); + return return_code; } /* end OS_mv */ @@ -620,7 +620,7 @@ int32 OS_CloseFileByName(const char *Filename) OS_ObjectIdIteratorDestroy(&iter); - return (return_code); + return return_code; } /* end OS_CloseFileByName */ @@ -654,6 +654,6 @@ int32 OS_CloseAllFiles(void) OS_ObjectIdIteratorDestroy(&iter); - return (return_code); + return return_code; } /* end OS_CloseAllFiles */ diff --git a/src/os/shared/src/osapi-filesys.c b/src/os/shared/src/osapi-filesys.c index 1dfc5d814..7d608abe6 100644 --- a/src/os/shared/src/osapi-filesys.c +++ b/src/os/shared/src/osapi-filesys.c @@ -697,7 +697,7 @@ int32 OS_GetFsInfo(os_fsinfo_t *filesys_info) } OS_ObjectIdIteratorDestroy(&iter); - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_GetFsInfo */ /*---------------------------------------------------------------- diff --git a/src/os/shared/src/osapi-module.c b/src/os/shared/src/osapi-module.c index 7faef3adc..e8e18ff5f 100644 --- a/src/os/shared/src/osapi-module.c +++ b/src/os/shared/src/osapi-module.c @@ -261,7 +261,7 @@ int32 OS_ModuleLoad(osal_id_t *module_id, const char *module_name, const char *f return_code = OS_ObjectIdFinalizeNew(return_code, &token, module_id); } - return (return_code); + return return_code; } /* end OS_ModuleLoad */ @@ -381,7 +381,7 @@ int32 OS_SymbolLookup(cpuaddr *SymbolAddress, const char *SymbolName) } } - return (return_code); + return return_code; } /* end OS_SymbolLookup */ @@ -430,7 +430,7 @@ int32 OS_ModuleSymbolLookup(osal_id_t module_id, cpuaddr *symbol_address, const OS_ObjectIdRelease(&token); } - return (return_code); + return return_code; } /* end OS_ModuleSymbolLookup */ @@ -457,7 +457,7 @@ int32 OS_SymbolTableDump(const char *filename, size_t SizeLimit) return_code = OS_TranslatePath(filename, translated_path); if (return_code != OS_SUCCESS) { - return (return_code); + return return_code; } /* @@ -472,13 +472,13 @@ int32 OS_SymbolTableDump(const char *filename, size_t SizeLimit) return_code = OS_ObjectIdTransactionInit(OS_LOCK_MODE_GLOBAL, LOCAL_OBJID_TYPE, &token); if (return_code != OS_SUCCESS) { - return (return_code); + return return_code; } return_code = OS_SymbolTableDump_Impl(translated_path, SizeLimit); OS_ObjectIdTransactionCancel(&token); - return (return_code); + return return_code; } /* end OS_SymbolTableDump */ diff --git a/src/os/shared/src/osapi-network.c b/src/os/shared/src/osapi-network.c index 4d25df24f..7f72b5ecc 100644 --- a/src/os/shared/src/osapi-network.c +++ b/src/os/shared/src/osapi-network.c @@ -77,7 +77,7 @@ int32 OS_NetworkGetHostName(char *host_name, size_t name_len) host_name[0] = 0; } - return (return_code); + return return_code; } /* end OS_NetworkGetHostName */ /*---------------------------------------------------------------- @@ -96,7 +96,7 @@ int32 OS_NetworkGetID(void) if (OS_NetworkGetID_Impl(&IdBuf) != OS_SUCCESS) { /* return a hardcoded value on failure */ - return (-1); + return -1; } return IdBuf; diff --git a/src/os/shared/src/osapi-task.c b/src/os/shared/src/osapi-task.c index 541db4cb7..52a60c42d 100644 --- a/src/os/shared/src/osapi-task.c +++ b/src/os/shared/src/osapi-task.c @@ -341,7 +341,7 @@ osal_id_t OS_TaskGetId(void) task_id = OS_TaskGetId_Impl(); - return (task_id); + return task_id; } /* end OS_TaskGetId */ /*---------------------------------------------------------------- diff --git a/src/os/vxworks/src/os-impl-binsem.c b/src/os/vxworks/src/os-impl-binsem.c index 406c4e74c..57b321717 100644 --- a/src/os/vxworks/src/os-impl-binsem.c +++ b/src/os/vxworks/src/os-impl-binsem.c @@ -58,7 +58,7 @@ OS_impl_binsem_internal_record_t OS_impl_bin_sem_table[OS_MAX_BIN_SEMAPHORES]; int32 OS_VxWorks_BinSemAPI_Impl_Init(void) { memset(OS_impl_bin_sem_table, 0, sizeof(OS_impl_bin_sem_table)); - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_VxWorks_BinSemAPI_Impl_Init */ /*---------------------------------------------------------------- diff --git a/src/os/vxworks/src/os-impl-common.c b/src/os/vxworks/src/os-impl-common.c index 120b1df8e..8e95f9228 100644 --- a/src/os/vxworks/src/os-impl-common.c +++ b/src/os/vxworks/src/os-impl-common.c @@ -102,7 +102,7 @@ int32 OS_API_Impl_Init(osal_objtype_t idtype) break; } - return (return_code); + return return_code; } /* end OS_API_Impl_Init */ /*---------------------------------------------------------------- diff --git a/src/os/vxworks/src/os-impl-countsem.c b/src/os/vxworks/src/os-impl-countsem.c index ed8393aab..0fcb84599 100644 --- a/src/os/vxworks/src/os-impl-countsem.c +++ b/src/os/vxworks/src/os-impl-countsem.c @@ -57,7 +57,7 @@ OS_impl_countsem_internal_record_t OS_impl_count_sem_table[OS_MAX_COUNT_SEMAPHOR int32 OS_VxWorks_CountSemAPI_Impl_Init(void) { memset(OS_impl_count_sem_table, 0, sizeof(OS_impl_count_sem_table)); - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_VxWorks_CountSemAPI_Impl_Init */ /*---------------------------------------------------------------- diff --git a/src/os/vxworks/src/os-impl-heap.c b/src/os/vxworks/src/os-impl-heap.c index f5ce0f9f1..58af94109 100644 --- a/src/os/vxworks/src/os-impl-heap.c +++ b/src/os/vxworks/src/os-impl-heap.c @@ -59,5 +59,5 @@ int32 OS_HeapGetInfo_Impl(OS_heap_prop_t *heap_prop) heap_prop->free_blocks = OSAL_BLOCKCOUNT_C(stats.numBlocksFree); heap_prop->largest_free_block = OSAL_SIZE_C(stats.maxBlockSizeFree); - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_HeapGetInfo_Impl */ diff --git a/src/os/vxworks/src/os-impl-loader.c b/src/os/vxworks/src/os-impl-loader.c index 1adc6851b..b5addaf4b 100644 --- a/src/os/vxworks/src/os-impl-loader.c +++ b/src/os/vxworks/src/os-impl-loader.c @@ -55,7 +55,7 @@ OS_impl_module_internal_record_t OS_impl_module_table[OS_MAX_MODULES]; int32 OS_VxWorks_ModuleAPI_Impl_Init(void) { memset(&OS_impl_module_table, 0, sizeof(OS_impl_module_table)); - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_VxWorks_ModuleAPI_Impl_Init */ /**************************************************************************************** @@ -116,7 +116,7 @@ int32 OS_ModuleLoad_Impl(const OS_object_token_t *token, const char *translated_ close(fd); } - return (return_code); + return return_code; } /* end OS_ModuleLoad_Impl */ @@ -142,10 +142,10 @@ int32 OS_ModuleUnload_Impl(const OS_object_token_t *token) if (vxStatus == ERROR) { OS_DEBUG("OSAL: Error, Cannot Close/Unload application file: %d\n", vxStatus); - return (OS_ERROR); + return OS_ERROR; } - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_ModuleUnload_Impl */ @@ -190,6 +190,6 @@ int32 OS_ModuleGetInfo_Impl(const OS_object_token_t *token, OS_module_prop_t *mo return_code = OS_SUCCESS; } - return (return_code); + return return_code; } /* end OS_ModuleGetInfo_Impl */ diff --git a/src/os/vxworks/src/os-impl-mutex.c b/src/os/vxworks/src/os-impl-mutex.c index 84786a622..0dd26fa9e 100644 --- a/src/os/vxworks/src/os-impl-mutex.c +++ b/src/os/vxworks/src/os-impl-mutex.c @@ -55,7 +55,7 @@ OS_impl_mutsem_internal_record_t OS_impl_mutex_table[OS_MAX_MUTEXES]; int32 OS_VxWorks_MutexAPI_Impl_Init(void) { memset(OS_impl_mutex_table, 0, sizeof(OS_impl_mutex_table)); - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_VxWorks_MutexAPI_Impl_Init */ /*---------------------------------------------------------------- diff --git a/src/os/vxworks/src/os-impl-network.c b/src/os/vxworks/src/os-impl-network.c index 6770db28e..4412e1370 100644 --- a/src/os/vxworks/src/os-impl-network.c +++ b/src/os/vxworks/src/os-impl-network.c @@ -55,7 +55,7 @@ int32 OS_NetworkGetHostName_Impl(char *host_name, size_t name_len) return_code = OS_SUCCESS; } - return (return_code); + return return_code; } /* end OS_NetworkGetHostName_Impl */ /*---------------------------------------------------------------- diff --git a/src/os/vxworks/src/os-impl-no-module.c b/src/os/vxworks/src/os-impl-no-module.c index 97a5bc6a5..2cc9e2633 100644 --- a/src/os/vxworks/src/os-impl-no-module.c +++ b/src/os/vxworks/src/os-impl-no-module.c @@ -43,5 +43,5 @@ int32 OS_VxWorks_ModuleAPI_Impl_Init(void) { /* nothing to init, but needs to return SUCCESS to allow the rest of OSAL to work */ - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_VxWorks_ModuleAPI_Impl_Init */ diff --git a/src/os/vxworks/src/os-impl-queues.c b/src/os/vxworks/src/os-impl-queues.c index 2961778b2..54345e30a 100644 --- a/src/os/vxworks/src/os-impl-queues.c +++ b/src/os/vxworks/src/os-impl-queues.c @@ -51,7 +51,7 @@ OS_impl_queue_internal_record_t OS_impl_queue_table[OS_MAX_QUEUES]; int32 OS_VxWorks_QueueAPI_Impl_Init(void) { memset(OS_impl_queue_table, 0, sizeof(OS_impl_queue_table)); - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_VxWorks_QueueAPI_Impl_Init */ /*---------------------------------------------------------------- diff --git a/src/os/vxworks/src/os-impl-symtab.c b/src/os/vxworks/src/os-impl-symtab.c index 5e1e733d8..0ebc777ed 100644 --- a/src/os/vxworks/src/os-impl-symtab.c +++ b/src/os/vxworks/src/os-impl-symtab.c @@ -78,7 +78,7 @@ int32 OS_GenericSymbolLookup_Impl(SYMTAB_ID SymTab, cpuaddr *SymbolAddress, cons */ if ((SymbolAddress == NULL) || (SymbolName == NULL)) { - return (OS_INVALID_POINTER); + return OS_INVALID_POINTER; } /* @@ -97,10 +97,10 @@ int32 OS_GenericSymbolLookup_Impl(SYMTAB_ID SymTab, cpuaddr *SymbolAddress, cons if (vxStatus == ERROR) { - return (OS_ERROR); + return OS_ERROR; } - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_GenericSymbolLookup_Impl */ @@ -174,7 +174,7 @@ BOOL OS_SymTableIterator_Impl(char *name, SYM_VALUE val, SYM_TYPE type, _Vx_usr_ { OS_DEBUG("%s(): symbol name too long\n", __func__); state->StatusCode = OS_ERR_NAME_TOO_LONG; - return (false); + return false; } /* @@ -189,7 +189,7 @@ BOOL OS_SymTableIterator_Impl(char *name, SYM_VALUE val, SYM_TYPE type, _Vx_usr_ */ OS_DEBUG("%s(): symbol table size exceeded\n", __func__); state->StatusCode = OS_ERR_OUTPUT_TOO_LARGE; - return (false); + return false; } /* @@ -212,7 +212,7 @@ BOOL OS_SymTableIterator_Impl(char *name, SYM_VALUE val, SYM_TYPE type, _Vx_usr_ if (status < (int)sizeof(symRecord)) { state->StatusCode = OS_ERROR; - return (false); + return false; } state->CurrSize = NextSize; @@ -220,7 +220,7 @@ BOOL OS_SymTableIterator_Impl(char *name, SYM_VALUE val, SYM_TYPE type, _Vx_usr_ /* ** It's OK to continue */ - return (true); + return true; } /* end OS_SymTableIterator_Impl */ /*---------------------------------------------------------------- @@ -273,6 +273,6 @@ int32 OS_SymbolTableDump_Impl(const char *filename, size_t size_limit) state->StatusCode = OS_ERROR; } - return (state->StatusCode); + return state->StatusCode; } /* end OS_SymbolTableDump_Impl */ diff --git a/src/os/vxworks/src/os-impl-tasks.c b/src/os/vxworks/src/os-impl-tasks.c index e4cb3cbbb..0035bdcd8 100644 --- a/src/os/vxworks/src/os-impl-tasks.c +++ b/src/os/vxworks/src/os-impl-tasks.c @@ -101,7 +101,7 @@ int OS_VxWorks_TaskEntry(int arg) int32 OS_VxWorks_TaskAPI_Impl_Init(void) { memset(OS_impl_task_table, 0, sizeof(OS_impl_task_table)); - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_VxWorks_TaskAPI_Impl_Init */ /*---------------------------------------------------------------- @@ -384,7 +384,7 @@ int32 OS_TaskMatch_Impl(const OS_object_token_t *token) */ if (taskIdSelf() != impl->vxid) { - return (OS_ERROR); + return OS_ERROR; } return OS_SUCCESS; diff --git a/src/os/vxworks/src/os-impl-timebase.c b/src/os/vxworks/src/os-impl-timebase.c index 0edafeca3..31b011f52 100644 --- a/src/os/vxworks/src/os-impl-timebase.c +++ b/src/os/vxworks/src/os-impl-timebase.c @@ -331,7 +331,7 @@ int32 OS_VxWorks_TimeBaseAPI_Impl_Init(void) */ OS_SharedGlobalVars.MicroSecPerTick = (OS_ClockAccuracyNsec + 500) / 1000; - return (OS_SUCCESS); + return OS_SUCCESS; } /* end OS_VxWorks_TimeBaseAPI_Impl_Init */ /**************************************************************************************** diff --git a/src/tests/osal-core-test/osal-core-test.c b/src/tests/osal-core-test/osal-core-test.c index 9d175652f..1559d9bf2 100644 --- a/src/tests/osal-core-test/osal-core-test.c +++ b/src/tests/osal-core-test/osal-core-test.c @@ -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 @@ -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 */ /* **************************************************************************** */ @@ -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 */ /* ***************************************************************************** */ @@ -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 */ /* ***************************************************************************** */ @@ -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 */ /* ***************************************************************************** */ diff --git a/src/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c b/src/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c index a36fd8a7b..9b22b7188 100644 --- a/src/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c @@ -160,7 +160,7 @@ void *OCS_malloc(size_t sz) Rec->Magic = MPOOL_BLOCK_SIGNATURE; Rec->Size = sz; - return ((void *)NextBlock); + return (void *)NextBlock; } void OCS_free(void *ptr) diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-dosFsLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-dosFsLib-stubs.c index 75fea3f8a..845f1aca2 100644 --- a/src/unit-test-coverage/ut-stubs/src/vxworks-dosFsLib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/vxworks-dosFsLib-stubs.c @@ -28,5 +28,5 @@ /* ----------------------------------------- */ OCS_STATUS OCS_dosFsVolFormat(char *path, int opt, OCS_FUNCPTR pPromptFunc) { - return (UT_DEFAULT_IMPL(OCS_dosFsVolFormat)); + return UT_DEFAULT_IMPL(OCS_dosFsVolFormat); } diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-hostLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-hostLib-stubs.c index f681f94a2..f717168de 100644 --- a/src/unit-test-coverage/ut-stubs/src/vxworks-hostLib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/vxworks-hostLib-stubs.c @@ -32,5 +32,5 @@ int OCS_hostGetByName(char *name) { - return (UT_DEFAULT_IMPL(OCS_hostGetByName)); + return UT_DEFAULT_IMPL(OCS_hostGetByName); } diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-intLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-intLib-stubs.c index 81cd98439..f8a44191c 100644 --- a/src/unit-test-coverage/ut-stubs/src/vxworks-intLib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/vxworks-intLib-stubs.c @@ -25,23 +25,23 @@ OCS_STATUS OCS_intConnect(OCS_VOIDFUNCPTR *vector, OCS_VOIDFUNCPTR routine, int parameter) { - return (UT_DEFAULT_IMPL(OCS_intConnect)); + return UT_DEFAULT_IMPL(OCS_intConnect); } int OCS_intDisable(int level) { - return (UT_DEFAULT_IMPL(OCS_intDisable)); + return UT_DEFAULT_IMPL(OCS_intDisable); } int OCS_intEnable(int level) { - return (UT_DEFAULT_IMPL(OCS_intEnable)); + return UT_DEFAULT_IMPL(OCS_intEnable); } int OCS_intLock(void) { - return (UT_DEFAULT_IMPL(OCS_intLock)); + return UT_DEFAULT_IMPL(OCS_intLock); } int OCS_intUnlock(int lockKey) { - return (UT_DEFAULT_IMPL(OCS_intUnlock)); + return UT_DEFAULT_IMPL(OCS_intUnlock); } static void OCS_intLib_dummyfunc(void) {} diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-loadLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-loadLib-stubs.c index 44cc1bd5d..59a6dacc4 100644 --- a/src/unit-test-coverage/ut-stubs/src/vxworks-loadLib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/vxworks-loadLib-stubs.c @@ -46,5 +46,5 @@ OCS_MODULE_ID OCS_loadModule(int fd, unsigned int symFlag) OCS_STATUS OCS_unldByModuleId(OCS_MODULE_ID moduleId, int options) { - return (UT_DEFAULT_IMPL(OCS_unldByModuleId)); + return UT_DEFAULT_IMPL(OCS_unldByModuleId); } diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-memPartLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-memPartLib-stubs.c index 3da610b80..8b9e8fbfc 100644 --- a/src/unit-test-coverage/ut-stubs/src/vxworks-memPartLib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/vxworks-memPartLib-stubs.c @@ -25,13 +25,13 @@ OCS_STATUS OCS_memPartShow(OCS_PART_ID partId, int type) { - return (UT_DEFAULT_IMPL(OCS_memPartShow)); + return UT_DEFAULT_IMPL(OCS_memPartShow); } OCS_STATUS OCS_memPartInfoGet(OCS_PART_ID partId, OCS_MEM_PART_STATS *ppartStats) { memset(ppartStats, 0, sizeof(*ppartStats)); - return (UT_DEFAULT_IMPL(OCS_memPartInfoGet)); + return UT_DEFAULT_IMPL(OCS_memPartInfoGet); } OCS_PART_ID OCS_memSysPartId; diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-msgQLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-msgQLib-stubs.c index 8b4aeec2e..737f8bcb8 100644 --- a/src/unit-test-coverage/ut-stubs/src/vxworks-msgQLib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/vxworks-msgQLib-stubs.c @@ -44,13 +44,13 @@ OCS_MSG_Q_ID OCS_msgQCreate(int maxMsgs, int maxMsgLength, int options) } OCS_STATUS OCS_msgQDelete(OCS_MSG_Q_ID msgQId) { - return (UT_DEFAULT_IMPL(OCS_msgQDelete)); + return UT_DEFAULT_IMPL(OCS_msgQDelete); } int OCS_msgQReceive(OCS_MSG_Q_ID msgQId, char *buffer, OCS_UINT maxNBytes, int timeout) { - return (UT_DEFAULT_IMPL(OCS_msgQReceive)); + return UT_DEFAULT_IMPL(OCS_msgQReceive); } OCS_STATUS OCS_msgQSend(OCS_MSG_Q_ID msgQId, char *buffer, OCS_UINT nBytes, int timeout, int priority) { - return (UT_DEFAULT_IMPL(OCS_msgQSend)); + return UT_DEFAULT_IMPL(OCS_msgQSend); } diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-semLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-semLib-stubs.c index 4be202d29..ecb6046a6 100644 --- a/src/unit-test-coverage/ut-stubs/src/vxworks-semLib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/vxworks-semLib-stubs.c @@ -106,17 +106,17 @@ OCS_SEM_ID OCS_semCCreate(int flags, int count) OCS_STATUS OCS_semDelete(OCS_SEM_ID semId) { - return (UT_DEFAULT_IMPL(OCS_semDelete)); + return UT_DEFAULT_IMPL(OCS_semDelete); } OCS_STATUS OCS_semFlush(OCS_SEM_ID semId) { - return (UT_DEFAULT_IMPL(OCS_semFlush)); + return UT_DEFAULT_IMPL(OCS_semFlush); } OCS_STATUS OCS_semTake(OCS_SEM_ID semId, int timeout) { - return (UT_DEFAULT_IMPL(OCS_semTake)); + return UT_DEFAULT_IMPL(OCS_semTake); } OCS_STATUS OCS_semGive(OCS_SEM_ID semId) { - return (UT_DEFAULT_IMPL(OCS_semGive)); + return UT_DEFAULT_IMPL(OCS_semGive); } diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-shellLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-shellLib-stubs.c index a4cd5e937..745b56159 100644 --- a/src/unit-test-coverage/ut-stubs/src/vxworks-shellLib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/vxworks-shellLib-stubs.c @@ -26,5 +26,5 @@ OCS_STATUS OCS_shellGenericInit(const char *config, int stackSize, const char *shellName, char **pShellName, OCS_BOOL interactive, OCS_BOOL loginAccess, int fdin, int fdout, int fderr) { - return (UT_DEFAULT_IMPL(OCS_shellGenericInit)); + return UT_DEFAULT_IMPL(OCS_shellGenericInit); } diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-symLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-symLib-stubs.c index d8543c4e3..0e37bfe7d 100644 --- a/src/unit-test-coverage/ut-stubs/src/vxworks-symLib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/vxworks-symLib-stubs.c @@ -47,7 +47,7 @@ OCS_SYMTAB_ID OCS_sysSymTbl = &LOCAL_SYMTAB; OCS_STATUS OCS_symFindByName(OCS_SYMTAB_ID symTblId, char *name, char **pValue, OCS_SYM_TYPE *pType) { - return (UT_DEFAULT_IMPL(OCS_symFindByName)); + return UT_DEFAULT_IMPL(OCS_symFindByName); } OCS_SYMBOL *OCS_symEach(OCS_SYMTAB_ID symTblId, OCS_symEach_Routine_t routine, int routineArg) diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-sysLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-sysLib-stubs.c index a4950bad6..a019d3653 100644 --- a/src/unit-test-coverage/ut-stubs/src/vxworks-sysLib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/vxworks-sysLib-stubs.c @@ -25,5 +25,5 @@ int OCS_sysClkRateGet(void) { - return (UT_DEFAULT_IMPL_RC(OCS_sysClkRateGet, 10000)); + return UT_DEFAULT_IMPL_RC(OCS_sysClkRateGet, 10000); } diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c index c5f74cb02..9421ca25d 100644 --- a/src/unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c @@ -37,7 +37,7 @@ OCS_TASK_ID OCS_taskIdSelf(void) Status = UT_DEFAULT_IMPL(OCS_taskIdSelf); if (Status != 0) { - return ((OCS_TASK_ID)OCS_ERROR); + return (OCS_TASK_ID)OCS_ERROR; } return &OCS_LOCAL_TASK; @@ -49,41 +49,41 @@ OCS_TASK_ID OCS_taskNameToId(const char *name) Status = UT_DEFAULT_IMPL(OCS_taskNameToId); if (Status != 0) { - return ((OCS_TASK_ID)OCS_ERROR); + return (OCS_TASK_ID)OCS_ERROR; } return &OCS_LOCAL_TASK; } OCS_STATUS OCS_taskDelay(int ticks) { - return (UT_DEFAULT_IMPL(OCS_taskDelay)); + return UT_DEFAULT_IMPL(OCS_taskDelay); } OCS_STATUS OCS_taskDelete(OCS_TASK_ID tid) { - return (UT_DEFAULT_IMPL(OCS_taskDelete)); + return UT_DEFAULT_IMPL(OCS_taskDelete); } OCS_STATUS OCS_taskDeleteForce(OCS_TASK_ID tid) { - return (UT_DEFAULT_IMPL(OCS_taskDeleteForce)); + return UT_DEFAULT_IMPL(OCS_taskDeleteForce); } OCS_STATUS OCS_taskSuspend(OCS_TASK_ID tid) { - return (UT_DEFAULT_IMPL(OCS_taskSuspend)); + return UT_DEFAULT_IMPL(OCS_taskSuspend); } OCS_STATUS OCS_taskResume(OCS_TASK_ID tid) { - return (UT_DEFAULT_IMPL(OCS_taskResume)); + return UT_DEFAULT_IMPL(OCS_taskResume); } OCS_STATUS OCS_taskPrioritySet(OCS_TASK_ID tid, int newPriority) { - return (UT_DEFAULT_IMPL(OCS_taskPrioritySet)); + return UT_DEFAULT_IMPL(OCS_taskPrioritySet); } OCS_STATUS OCS_taskInit(OCS_WIND_TCB *pTcb, char *name, int priority, int options, char *pStackBase, int stackSize, OCS_FUNCPTR entryPt, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10) { - return (UT_DEFAULT_IMPL(OCS_taskInit)); + return UT_DEFAULT_IMPL(OCS_taskInit); } OCS_TASK_ID OCS_taskSpawn(char *name, int priority, int options, int stackSize, OCS_FUNCPTR entryPt, int arg1, int arg2, @@ -95,7 +95,7 @@ OCS_TASK_ID OCS_taskSpawn(char *name, int priority, int options, int stackSize, Status = UT_DEFAULT_IMPL(OCS_taskSpawn); if (Status != 0) { - return ((OCS_TASK_ID)OCS_ERROR); + return (OCS_TASK_ID)OCS_ERROR; } return &OCS_LOCAL_TASK; @@ -118,7 +118,7 @@ OCS_WIND_TCB *OCS_taskTcb(OCS_TASK_ID tid) Status = UT_DEFAULT_IMPL(OCS_taskTcb); if (Status != 0) { - return (NULL); + return NULL; } if (UT_Stub_CopyToLocal(UT_KEY(OCS_taskTcb), &LocalTcb, sizeof(LocalTcb)) < sizeof(LocalTcb)) diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-taskVarLib-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-taskVarLib-stubs.c index 975d53c98..a7096a0c9 100644 --- a/src/unit-test-coverage/ut-stubs/src/vxworks-taskVarLib-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/vxworks-taskVarLib-stubs.c @@ -25,5 +25,5 @@ OCS_STATUS OCS_taskVarAdd(int tid, int *pVar) { - return (UT_DEFAULT_IMPL(OCS_taskVarAdd)); + return UT_DEFAULT_IMPL(OCS_taskVarAdd); } diff --git a/src/unit-test-coverage/ut-stubs/src/vxworks-xbdBlkDev-stubs.c b/src/unit-test-coverage/ut-stubs/src/vxworks-xbdBlkDev-stubs.c index 5fd510e8d..a3a5f9568 100644 --- a/src/unit-test-coverage/ut-stubs/src/vxworks-xbdBlkDev-stubs.c +++ b/src/unit-test-coverage/ut-stubs/src/vxworks-xbdBlkDev-stubs.c @@ -42,5 +42,5 @@ OCS_device_t OCS_xbdBlkDevCreateSync(OCS_BLK_DEV *bd, const char *name) OCS_STATUS OCS_xbdBlkDevDelete(OCS_device_t dev, OCS_BLK_DEV **ppbd) { - return (UT_DEFAULT_IMPL(OCS_xbdBlkDevDelete)); + return UT_DEFAULT_IMPL(OCS_xbdBlkDevDelete); } diff --git a/src/unit-tests/osfile-test/ut_osfile_test.c b/src/unit-tests/osfile-test/ut_osfile_test.c index 0c76b1fda..0cdcac10e 100644 --- a/src/unit-tests/osfile-test/ut_osfile_test.c +++ b/src/unit-tests/osfile-test/ut_osfile_test.c @@ -90,7 +90,7 @@ int32 UT_os_setup_fs() } UT_os_setup_fs_exit_tag: - return (res); + return res; } /*--------------------------------------------------------------------------------*/ diff --git a/src/unit-tests/osloader-test/ut_module.c b/src/unit-tests/osloader-test/ut_module.c index 89d5892ac..d6ae36ee9 100644 --- a/src/unit-tests/osloader-test/ut_module.c +++ b/src/unit-tests/osloader-test/ut_module.c @@ -22,5 +22,4 @@ void MODULE_NAME(void) i = 1; i = i + 1; /* squelch set-but-not-used compiler warning */ (void)i; - return; } diff --git a/ut_assert/src/utassert.c b/ut_assert/src/utassert.c index 6c5fe6717..be350d63c 100644 --- a/ut_assert/src/utassert.c +++ b/ut_assert/src/utassert.c @@ -91,12 +91,12 @@ void UtAssert_DoTestSegmentReport(const char *SegmentName, const UtAssert_TestCo uint32 UtAssert_GetPassCount(void) { - return (UT_TotalCounters.CaseCount[UTASSERT_CASETYPE_PASS]); + return UT_TotalCounters.CaseCount[UTASSERT_CASETYPE_PASS]; } uint32 UtAssert_GetFailCount(void) { - return (UT_TotalCounters.CaseCount[UTASSERT_CASETYPE_FAILURE]); + return UT_TotalCounters.CaseCount[UTASSERT_CASETYPE_FAILURE]; } const UtAssert_TestCounter_t *UtAssert_GetCounters(void) diff --git a/ut_assert/src/utlist.c b/ut_assert/src/utlist.c index 63010fb3e..f4971e8e0 100644 --- a/ut_assert/src/utlist.c +++ b/ut_assert/src/utlist.c @@ -63,7 +63,7 @@ UtListHead_t *UtList_Create(uint32 NumTags) TagHead->Prev = TagHead; } - return (&NewList->Head); + return &NewList->Head; } void UtList_Destroy(UtListHead_t *ListHead) diff --git a/ut_assert/src/utstubs.c b/ut_assert/src/utstubs.c index 4fbbdbfa2..2f0a5864d 100644 --- a/ut_assert/src/utstubs.c +++ b/ut_assert/src/utstubs.c @@ -182,7 +182,7 @@ static UT_StubTableEntry_t *UT_GetStubEntry(UT_EntryKey_t FuncKey, UT_EntryType_ UT_MaxStubSearchLen = SearchLen; } - return (StubPtr); + return StubPtr; } void UT_ResetState(UT_EntryKey_t FuncKey) @@ -307,7 +307,7 @@ bool UT_Stub_CheckDeferredRetcode(UT_EntryKey_t FuncKey, int32 *Retcode) } } - return (Result); + return Result; } void UT_SetDefaultReturnValue(UT_EntryKey_t FuncKey, int32 Value) @@ -403,7 +403,7 @@ bool UT_Stub_CheckDefaultReturnValue(UT_EntryKey_t FuncKey, int32 *Value) Result = true; } - return (Result); + return Result; } void UT_Stub_RegisterReturnType(UT_EntryKey_t FuncKey, size_t ReturnSize) diff --git a/ut_assert/src/uttools.c b/ut_assert/src/uttools.c index 845030e65..3fc92ed13 100644 --- a/ut_assert/src/uttools.c +++ b/ut_assert/src/uttools.c @@ -55,25 +55,26 @@ typedef struct bool UtMem2BinFile(const void *Memory, const char *Filename, uint32 Length) { FILE * fp; + int fd; struct stat dststat; if ((fp = fopen(Filename, "w"))) { - if (stat(Filename, &dststat) == 0) + fd = fileno(fp); + if (fstat(fd, &dststat) == 0) { - chmod(Filename, dststat.st_mode & ~(S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH)); - stat(Filename, &dststat); + fchmod(fd, dststat.st_mode & ~(S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH)); } fwrite(Memory, Length, 1, fp); fclose(fp); - return (true); + return true; } else { printf("UtMem2BinFile: Error Opening File: %s, %s\n", Filename, strerror(errno)); UtAssert_True(false, "UtMem2BinFile: Error Opening File"); - return (false); + return false; } } @@ -96,7 +97,7 @@ bool UtBinFile2Mem(void *Memory, const char *Filename, uint32 Length) UtAssert_Failed("UtBinFile2Mem: Error Opening %s: %s", Filename, strerror(errno)); } - return (Success); + return Success; } bool UtMem2HexFile(const void *Memory, const char *Filename, uint32 Length) @@ -104,14 +105,15 @@ bool UtMem2HexFile(const void *Memory, const char *Filename, uint32 Length) FILE * fp; uint32 i; uint32 j; + int fd; struct stat dststat; if ((fp = fopen(Filename, "w"))) { - if (stat(Filename, &dststat) == 0) + fd = fileno(fp); + if (fstat(fd, &dststat) == 0) { - chmod(Filename, dststat.st_mode & ~(S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH)); - stat(Filename, &dststat); + fchmod(fd, dststat.st_mode & ~(S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH)); } for (i = 0; i < Length; i += 16) @@ -133,13 +135,13 @@ bool UtMem2HexFile(const void *Memory, const char *Filename, uint32 Length) fprintf(fp, "\n"); } fclose(fp); - return (true); + return true; } else { printf("UtMem2HexFile: Error Opening File: %s, %s\n", Filename, strerror(errno)); UtAssert_True(false, "UtMem2HexFile: Error Opening File"); - return (false); + return false; } } @@ -180,7 +182,7 @@ char *UtSprintf(const char *Spec, ...) vsnprintf(Buf[TextIndex].Text, sizeof(Buf[TextIndex].Text), Spec, Args); va_end(Args); - return (Buf[TextIndex].Text); + return Buf[TextIndex].Text; } void UtPrintx(const void *Memory, uint32 Length) @@ -216,10 +218,10 @@ bool UtMemCmpValue(const void *Memory, uint8 Value, uint32 Length) { if (Byte_ptr[i] != Value) { - return (false); + return false; } } - return (true); + return true; } bool UtMemCmpCount(const void *Memory, uint32 Length) @@ -231,10 +233,10 @@ bool UtMemCmpCount(const void *Memory, uint32 Length) { if (Byte_ptr[i] != (i & 0xFF)) { - return (false); + return false; } } - return (true); + return true; } bool UtMem2BinFileCmp(const void *Memory, const char *Filename) @@ -268,5 +270,5 @@ bool UtMem2BinFileCmp(const void *Memory, const char *Filename) UtAssert_True(false, "UtMem2BinFileCmp: Error Opening File"); } - return (Success); + return Success; }