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, 46 insertions, 39 deletions

diff --git a/cpukit/rtems/src/regioncreate.c b/cpukit/rtems/src/regioncreate.c
index 1f4b8ae94b..ec305b71a3 100644
--- a/cpukit/rtems/src/regioncreate.c
+++ b/cpukit/rtems/src/regioncreate.c
@@ -56,7 +56,8 @@ rtems_status_code rtems_region_create(
   Objects_Id         *id
 )
 {
-  Region_Control *the_region;
+  rtems_status_code  return_status;
+  Region_Control    *the_region;
 
   if ( !rtems_is_name_valid( name ) )
     return RTEMS_INVALID_NAME;
@@ -72,43 +73,49 @@ rtems_status_code rtems_region_create(
 
   _RTEMS_Lock_allocator();                      /* to prevent deletion */
 
-  the_region = _Region_Allocate();
-
-  if ( !the_region ) {
-    _RTEMS_Unlock_allocator();
-    return RTEMS_TOO_MANY;
-  }
-
-  the_region->maximum_segment_size =
-    _Heap_Initialize(&the_region->Memory, starting_address, length, page_size);
-
-  if ( !the_region->maximum_segment_size ) {
-    _Region_Free( the_region );
-    _RTEMS_Unlock_allocator();
-    return RTEMS_INVALID_SIZE;
-  }
-
-  the_region->starting_address      = starting_address;
-  the_region->length                = length;
-  the_region->page_size             = page_size;
-  the_region->attribute_set         = attribute_set;
-  the_region->number_of_used_blocks = 0;
-
-  _Thread_queue_Initialize(
-    &the_region->Wait_queue,
-    _Attributes_Is_priority( attribute_set ) ?
-       THREAD_QUEUE_DISCIPLINE_PRIORITY : THREAD_QUEUE_DISCIPLINE_FIFO,
-    STATES_WAITING_FOR_SEGMENT,
-    RTEMS_TIMEOUT
-  );
-
-  _Objects_Open(
-    &_Region_Information,
-    &the_region->Object,
-    (Objects_Name) name
-  );
-
-  *id = the_region->Object.id;
+    the_region = _Region_Allocate();
+
+    if ( !the_region )
+      return_status = RTEMS_TOO_MANY;
+
+    else {
+
+      the_region->maximum_segment_size = _Heap_Initialize(
+        &the_region->Memory, starting_address, length, page_size
+      );
+
+      if ( !the_region->maximum_segment_size ) {
+        _Region_Free( the_region );
+        return_status = RTEMS_INVALID_SIZE;
+      }
+
+      else {
+
+        the_region->starting_address      = starting_address;
+        the_region->length                = length;
+        the_region->page_size             = page_size;
+        the_region->attribute_set         = attribute_set;
+        the_region->number_of_used_blocks = 0;
+
+        _Thread_queue_Initialize(
+          &the_region->Wait_queue,
+          _Attributes_Is_priority( attribute_set ) ?
+             THREAD_QUEUE_DISCIPLINE_PRIORITY : THREAD_QUEUE_DISCIPLINE_FIFO,
+          STATES_WAITING_FOR_SEGMENT,
+          RTEMS_TIMEOUT
+        );
+
+        _Objects_Open(
+          &_Region_Information,
+          &the_region->Object,
+          (Objects_Name) name
+        );
+
+        *id = the_region->Object.id;
+        return_status = RTEMS_SUCCESSFUL;
+      }
+    }
+
   _RTEMS_Unlock_allocator();
-  return RTEMS_SUCCESSFUL;
+  return return_status;
 }