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, 21 insertions, 23 deletions

diff --git a/cpukit/rtems/src/regiongetsegmentsize.c b/cpukit/rtems/src/regiongetsegmentsize.c
index c89efd0d36..7d70b6188b 100644
--- a/cpukit/rtems/src/regiongetsegmentsize.c
+++ b/cpukit/rtems/src/regiongetsegmentsize.c
@@ -23,7 +23,6 @@
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/region.h>
 #include <rtems/score/states.h>
-#include <rtems/score/thread.h>
 #include <rtems/score/apimutex.h>
 
 /*PAGE
@@ -49,9 +48,9 @@ rtems_status_code rtems_region_get_segment_size(
   size_t            *size
 )
 {
-  register Region_Control *the_region;
   Objects_Locations        location;
-  Thread_Control          *executing;
+  rtems_status_code        return_status = RTEMS_INTERNAL_ERROR;
+  register Region_Control *the_region;
 
   if ( !segment )
     return RTEMS_INVALID_ADDRESS;
@@ -60,28 +59,27 @@ rtems_status_code rtems_region_get_segment_size(
     return RTEMS_INVALID_ADDRESS;
 
   _RTEMS_Lock_allocator();
-  executing  = _Thread_Executing;
-  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
 
-    case OBJECTS_ERROR:
-      _RTEMS_Unlock_allocator();
-      return RTEMS_INVALID_ID;
+    the_region = _Region_Get( id, &location );
+    switch ( location ) {
 
-    case OBJECTS_LOCAL:
+      case OBJECTS_LOCAL:
+        if ( !_Heap_Size_of_user_area( &the_region->Memory, segment, size ) )
+          return_status = RTEMS_INVALID_ADDRESS;
+        else
+          return_status = RTEMS_SUCCESSFUL;
+        break;
+
+#if defined(RTEMS_MULTIPROCESSING)
+      case OBJECTS_REMOTE:        /* this error cannot be returned */
+        break;
+#endif
 
-      if ( _Heap_Size_of_user_area( &the_region->Memory, segment, size ) ) {
-        _RTEMS_Unlock_allocator();
-        return RTEMS_SUCCESSFUL;
-      }
-      _RTEMS_Unlock_allocator();
-      return 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;
 }