2007-11-27 Glenn Humphrey <glenn.humphrey@OARcorp.com>

	* rtems/src/regioncreate.c, rtems/src/regiondelete.c,
	rtems/src/regionextend.c, rtems/src/regiongetfreeinfo.c,
	rtems/src/regiongetinfo.c, rtems/src/regiongetsegment.c,
	rtems/src/regiongetsegmentsize.c, rtems/src/regionresizesegment.c,
	rtems/src/regionreturnsegment.c: Restructed to move the OBJECTS_LOCAL
	case to the top of the switch statement, have a single exit with one
	call to _RTEMS_Unlock_allocator and eliminate the fall-through return
	of RTEMS_INTERNAL_ERROR.  These changes produced simplier assembly
	code and allowed for complete test coverage.

1 files changed, 37 insertions, 34 deletions

diff --git a/cpukit/rtems/src/regionresizesegment.c b/cpukit/rtems/src/regionresizesegment.c
index ab74eb35a0..43cb302afd 100644
--- a/cpukit/rtems/src/regionresizesegment.c
+++ b/cpukit/rtems/src/regionresizesegment.c
@@ -50,54 +50,57 @@ rtems_status_code rtems_region_resize_segment(
   size_t     *old_size
 )
 {
-  register Region_Control *the_region;
-  Objects_Locations        location;
-  Heap_Resize_status       status;
   uint32_t                 avail_size;
+  Objects_Locations        location;
   uint32_t                 osize;
+  rtems_status_code        return_status = RTEMS_INTERNAL_ERROR;
+  Heap_Resize_status       status;
+  register Region_Control *the_region;
 
   if ( !old_size )
     return RTEMS_INVALID_ADDRESS;
 
   _RTEMS_Lock_allocator();
-  the_region = _Region_Get( id, &location );
-  switch ( location ) {
 
-#if defined(RTEMS_MULTIPROCESSING)
-    case OBJECTS_REMOTE:        /* this error cannot be returned */
-      _RTEMS_Unlock_allocator();
-      return RTEMS_INTERNAL_ERROR;
-#endif
+    the_region = _Region_Get( id, &location );
+    switch ( location ) {
+
+      case OBJECTS_LOCAL:
 
-    case OBJECTS_ERROR:
-      _RTEMS_Unlock_allocator();
-      return RTEMS_INVALID_ID;
+        _Region_Debug_Walk( the_region, 7 );
 
-    case OBJECTS_LOCAL:
+        status = _Heap_Resize_block(
+          &the_region->Memory,
+          segment,
+          (uint32_t) size,
+          &osize,
+          &avail_size
+        );
+        *old_size = (uint32_t) osize;
 
-      _Region_Debug_Walk( the_region, 7 );
+        _Region_Debug_Walk( the_region, 8 );
 
-      status = _Heap_Resize_block(
-        &the_region->Memory,
-        segment,
-        (uint32_t) size,
-        &osize,
-        &avail_size
-      );
-      *old_size = (uint32_t) osize;
+        if ( status == HEAP_RESIZE_SUCCESSFUL && avail_size > 0 )
+          _Region_Process_queue( the_region );    /* unlocks allocator */
+        else
+          _RTEMS_Unlock_allocator();
 
-      _Region_Debug_Walk( the_region, 8 );
+        return
+          (status == HEAP_RESIZE_SUCCESSFUL) ?  RTEMS_SUCCESSFUL :
+          (status == HEAP_RESIZE_UNSATISFIED) ? RTEMS_UNSATISFIED :
+          RTEMS_INVALID_ADDRESS;
+        break;
 
-      if( status == HEAP_RESIZE_SUCCESSFUL && avail_size > 0 )
-        _Region_Process_queue( the_region ); /* unlocks allocator internally */
-      else
-        _RTEMS_Unlock_allocator();
+#if defined(RTEMS_MULTIPROCESSING)
+      case OBJECTS_REMOTE:        /* this error cannot be returned */
+        break;
+#endif
 
-      return
-        (status == HEAP_RESIZE_SUCCESSFUL) ?  RTEMS_SUCCESSFUL :
-        (status == HEAP_RESIZE_UNSATISFIED) ? RTEMS_UNSATISFIED :
-        RTEMS_INVALID_ADDRESS;
-  }
+      case OBJECTS_ERROR:
+        return_status = RTEMS_INVALID_ID;
+        break;
+    }
 
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
+  _RTEMS_Unlock_allocator();
+  return return_status;
 }