From 58a8a4717dfe766ab92237cfe9c5e1dc9352bba8 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sat, 10 Oct 2009 15:15:12 +0000 Subject: 2009-10-10 Joel Sherrill * rtems/src/regiondelete.c, rtems/src/regionextend.c, rtems/src/regiongetfreeinfo.c, rtems/src/regiongetinfo.c, rtems/src/regiongetsegment.c, rtems/src/regionresizesegment.c, rtems/src/regionreturnsegment.c: Avoid initializing status code. This generates dead code on some targets. Add default case to eliminate unitialized variable warning. --- cpukit/rtems/src/regiondelete.c | 8 +++++--- cpukit/rtems/src/regionextend.c | 3 +-- cpukit/rtems/src/regiongetfreeinfo.c | 3 ++- cpukit/rtems/src/regiongetinfo.c | 4 +++- cpukit/rtems/src/regiongetsegment.c | 20 +++++++++----------- cpukit/rtems/src/regionresizesegment.c | 13 ++++++++----- cpukit/rtems/src/regionreturnsegment.c | 4 ++-- 7 files changed, 30 insertions(+), 25 deletions(-) (limited to 'cpukit/rtems') diff --git a/cpukit/rtems/src/regiondelete.c b/cpukit/rtems/src/regiondelete.c index 692e831c58..8380242ee1 100644 --- a/cpukit/rtems/src/regiondelete.c +++ b/cpukit/rtems/src/regiondelete.c @@ -46,9 +46,9 @@ rtems_status_code rtems_region_delete( Objects_Id id ) { - Objects_Locations location; - rtems_status_code return_status = RTEMS_SUCCESSFUL; - register Region_Control *the_region; + Objects_Locations location; + rtems_status_code return_status; + Region_Control *the_region; _RTEMS_Lock_allocator(); @@ -62,6 +62,7 @@ rtems_status_code rtems_region_delete( else { _Objects_Close( &_Region_Information, &the_region->Object ); _Region_Free( the_region ); + return_status = RTEMS_SUCCESSFUL; } break; @@ -71,6 +72,7 @@ rtems_status_code rtems_region_delete( #endif case OBJECTS_ERROR: + default: return_status = RTEMS_INVALID_ID; break; } diff --git a/cpukit/rtems/src/regionextend.c b/cpukit/rtems/src/regionextend.c index a198aabebc..15134237ac 100644 --- a/cpukit/rtems/src/regionextend.c +++ b/cpukit/rtems/src/regionextend.c @@ -57,8 +57,6 @@ rtems_status_code rtems_region_extend( if ( !starting_address ) return RTEMS_INVALID_ADDRESS; - return_status = RTEMS_SUCCESSFUL; - _RTEMS_Lock_allocator(); /* to prevent deletion */ the_region = _Region_Get( id, &location ); @@ -76,6 +74,7 @@ rtems_status_code rtems_region_extend( if ( heap_status == HEAP_EXTEND_SUCCESSFUL ) { the_region->length += amount_extended; the_region->maximum_segment_size += amount_extended; + return_status = RTEMS_SUCCESSFUL; } else if ( heap_status == HEAP_EXTEND_ERROR ) { return_status = RTEMS_INVALID_ADDRESS; } else if ( heap_status == HEAP_EXTEND_NOT_IMPLEMENTED ) { diff --git a/cpukit/rtems/src/regiongetfreeinfo.c b/cpukit/rtems/src/regiongetfreeinfo.c index 6fac5c47f1..e7e8fe666d 100644 --- a/cpukit/rtems/src/regiongetfreeinfo.c +++ b/cpukit/rtems/src/regiongetfreeinfo.c @@ -50,7 +50,7 @@ rtems_status_code rtems_region_get_free_information( ) { Objects_Locations location; - rtems_status_code return_status = RTEMS_SUCCESSFUL; + rtems_status_code return_status; register Region_Control *the_region; if ( !the_info ) @@ -78,6 +78,7 @@ rtems_status_code rtems_region_get_free_information( #endif case OBJECTS_ERROR: + default: return_status = RTEMS_INVALID_ID; break; } diff --git a/cpukit/rtems/src/regiongetinfo.c b/cpukit/rtems/src/regiongetinfo.c index 6fe7f6aa77..3723749642 100644 --- a/cpukit/rtems/src/regiongetinfo.c +++ b/cpukit/rtems/src/regiongetinfo.c @@ -48,7 +48,7 @@ rtems_status_code rtems_region_get_information( ) { Objects_Locations location; - rtems_status_code return_status = RTEMS_SUCCESSFUL; + rtems_status_code return_status; register Region_Control *the_region; if ( !the_info ) @@ -61,6 +61,7 @@ rtems_status_code rtems_region_get_information( case OBJECTS_LOCAL: _Heap_Get_information( &the_region->Memory, the_info ); + return_status = RTEMS_SUCCESSFUL; break; #if defined(RTEMS_MULTIPROCESSING) @@ -69,6 +70,7 @@ rtems_status_code rtems_region_get_information( #endif case OBJECTS_ERROR: + default: return_status = RTEMS_INVALID_ID; break; } diff --git a/cpukit/rtems/src/regiongetsegment.c b/cpukit/rtems/src/regiongetsegment.c index 680ced6369..0e46b07e71 100644 --- a/cpukit/rtems/src/regiongetsegment.c +++ b/cpukit/rtems/src/regiongetsegment.c @@ -53,11 +53,11 @@ rtems_status_code rtems_region_get_segment( void **segment ) { - Thread_Control *executing; - Objects_Locations location; - rtems_status_code return_status = RTEMS_SUCCESSFUL; - register Region_Control *the_region; - void *the_segment; + Thread_Control *executing; + Objects_Locations location; + rtems_status_code return_status; + Region_Control *the_region; + void *the_segment; if ( !segment ) return RTEMS_INVALID_ADDRESS; @@ -87,13 +87,10 @@ rtems_status_code rtems_region_get_segment( if ( the_segment ) { the_region->number_of_used_blocks += 1; *segment = the_segment; - } - - else if ( _Options_Is_no_wait( option_set ) ) { + return_status = RTEMS_SUCCESSFUL; + } else if ( _Options_Is_no_wait( option_set ) ) { return_status = RTEMS_UNSATISFIED; - } - - else { + } else { /* * Switch from using the memory allocation mutex to using a * dispatching disabled critical section. We have to do this @@ -124,6 +121,7 @@ rtems_status_code rtems_region_get_segment( #endif case OBJECTS_ERROR: + default: return_status = RTEMS_INVALID_ID; break; } diff --git a/cpukit/rtems/src/regionresizesegment.c b/cpukit/rtems/src/regionresizesegment.c index 865c898b8f..1fac2c18d3 100644 --- a/cpukit/rtems/src/regionresizesegment.c +++ b/cpukit/rtems/src/regionresizesegment.c @@ -53,7 +53,7 @@ rtems_status_code rtems_region_resize_segment( uintptr_t avail_size; Objects_Locations location; uintptr_t osize; - rtems_status_code return_status = RTEMS_SUCCESSFUL; + rtems_status_code return_status; Heap_Resize_status status; register Region_Control *the_region; @@ -85,10 +85,12 @@ rtems_status_code rtems_region_resize_segment( else _RTEMS_Unlock_allocator(); - return - (status == HEAP_RESIZE_SUCCESSFUL) ? RTEMS_SUCCESSFUL : - (status == HEAP_RESIZE_UNSATISFIED) ? RTEMS_UNSATISFIED : - RTEMS_INVALID_ADDRESS; + + if (status == HEAP_RESIZE_SUCCESSFUL) + return RTEMS_SUCCESSFUL; + if (status == HEAP_RESIZE_UNSATISFIED) + return RTEMS_UNSATISFIED; + return RTEMS_INVALID_ADDRESS; break; #if defined(RTEMS_MULTIPROCESSING) @@ -97,6 +99,7 @@ rtems_status_code rtems_region_resize_segment( #endif case OBJECTS_ERROR: + default: return_status = RTEMS_INVALID_ID; break; } diff --git a/cpukit/rtems/src/regionreturnsegment.c b/cpukit/rtems/src/regionreturnsegment.c index 05482d4329..346d8d29a2 100644 --- a/cpukit/rtems/src/regionreturnsegment.c +++ b/cpukit/rtems/src/regionreturnsegment.c @@ -55,7 +55,7 @@ rtems_status_code rtems_region_return_segment( ) { Objects_Locations location; - rtems_status_code return_status = RTEMS_SUCCESSFUL; + rtems_status_code return_status; #ifdef RTEMS_REGION_FREE_SHRED_PATTERN uint32_t size; #endif @@ -83,7 +83,6 @@ rtems_status_code rtems_region_return_segment( if ( !status ) return_status = RTEMS_INVALID_ADDRESS; - else { the_region->number_of_used_blocks -= 1; @@ -102,6 +101,7 @@ rtems_status_code rtems_region_return_segment( #endif case OBJECTS_ERROR: + default: return_status = RTEMS_INVALID_ID; break; } -- cgit v1.2.3