From 2d2dcab250a2fd7a0bca29b2d34dca2f51c7d2f9 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 19 Jan 2010 19:33:08 +0000 Subject: 2010-01-19 Joel Sherrill Coverity Id 5 * score/src/objectinitializeinformation.c: Do not modify maximum parameter. Clean up and simplify code. This should help the Coverity path analysis to avoid reporting issues. --- cpukit/score/src/objectinitializeinformation.c | 93 ++++++++++---------------- 1 file changed, 36 insertions(+), 57 deletions(-) (limited to 'cpukit/score/src') diff --git a/cpukit/score/src/objectinitializeinformation.c b/cpukit/score/src/objectinitializeinformation.c index 060a6b126e..da357708f1 100644 --- a/cpukit/score/src/objectinitializeinformation.c +++ b/cpukit/score/src/objectinitializeinformation.c @@ -1,8 +1,7 @@ /* - * Object Handler + * Object Handler Initialization per Object Class * - * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2010. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -65,68 +64,60 @@ void _Objects_Initialize_information( static Objects_Control *null_local_table = NULL; uint32_t minimum_index; uint32_t name_length; -#if defined(RTEMS_MULTIPROCESSING) - uint32_t index; -#endif + uint32_t maximum_per_allocation; + #if defined(RTEMS_MULTIPROCESSING) + uint32_t index; + #endif information->the_api = the_api; information->the_class = the_class; -#if defined(RTEMS_SCORE_OBJECT_ENABLE_STRING_NAMES) - information->is_string = is_string; -#endif - + information->size = size; information->local_table = 0; information->inactive_per_block = 0; information->object_blocks = 0; - information->inactive = 0; + #if defined(RTEMS_SCORE_OBJECT_ENABLE_STRING_NAMES) + information->is_string = is_string; + #endif /* - * Set the entry in the object information table. + * Set the maximum value to 0. It will be updated when objects are + * added to the inactive set from _Objects_Extend_information() */ - - _Objects_Information_table[ the_api ][ the_class ] = information; + information->maximum = 0; /* - * Set the size of the object + * Register this Object Class in the Object Information Table. */ - - information->size = size; + _Objects_Information_table[ the_api ][ the_class ] = information; /* - * Are we operating in unlimited, or auto-extend mode + * Are we operating in limited or unlimited (e.g. auto-extend) mode. */ - information->auto_extend = (maximum & OBJECTS_UNLIMITED_OBJECTS) ? true : false; - maximum &= ~OBJECTS_UNLIMITED_OBJECTS; + maximum_per_allocation = maximum & ~OBJECTS_UNLIMITED_OBJECTS; /* * The allocation unit is the maximum value */ - - information->allocation_size = maximum; + information->allocation_size = maximum_per_allocation; /* * Provide a null local table entry for the case of any empty table. */ - information->local_table = &null_local_table; /* * Calculate minimum and maximum Id's */ - - if ( maximum == 0 ) minimum_index = 0; - else minimum_index = 1; - + minimum_index = (maximum_per_allocation == 0) ? 0 : 1; information->minimum_id = _Objects_Build_id( the_api, the_class, _Objects_Local_node, minimum_index ); /* * Calculate the maximum name length */ - name_length = maximum_name_length; if ( name_length & (OBJECTS_NAME_ALIGNMENT-1) ) @@ -140,44 +131,32 @@ void _Objects_Initialize_information( /* * Initialize objects .. if there are any */ - - if ( maximum ) { - - /* - * Reset the maximum value. It will be updated when the information is - * extended. - */ - - information->maximum = 0; - + if ( maximum_per_allocation ) { /* * Always have the maximum size available so the current performance * figures are create are met. If the user moves past the maximum * number then a performance hit is taken. */ - _Objects_Extend_information( information ); - } /* * Take care of multiprocessing */ - -#if defined(RTEMS_MULTIPROCESSING) - information->extract = extract; - - if ( (supports_global == true) && _System_state_Is_multiprocessing ) { - - information->global_table = - (Chain_Control *) _Workspace_Allocate_or_fatal_error( - (_Objects_Maximum_nodes + 1) * sizeof(Chain_Control) - ); - - for ( index=1; index <= _Objects_Maximum_nodes ; index++ ) - _Chain_Initialize_empty( &information->global_table[ index ] ); - } - else - information->global_table = NULL; -#endif + #if defined(RTEMS_MULTIPROCESSING) + information->extract = extract; + + if ( (supports_global == true) && _System_state_Is_multiprocessing ) { + + information->global_table = + (Chain_Control *) _Workspace_Allocate_or_fatal_error( + (_Objects_Maximum_nodes + 1) * sizeof(Chain_Control) + ); + + for ( index=1; index <= _Objects_Maximum_nodes ; index++ ) + _Chain_Initialize_empty( &information->global_table[ index ] ); + } + else + information->global_table = NULL; + #endif } -- cgit v1.2.3