2008-01-31 Joel Sherrill <joel.sherrill@OARcorp.com>

	* posix/src/cond.c, posix/src/key.c, posix/src/mqueuenametoid.c,
	posix/src/mutex.c, posix/src/pbarrier.c, posix/src/prwlock.c,
	posix/src/pspin.c, posix/src/pthread.c, posix/src/ptimer.c,
	posix/src/semaphorenametoid.c: Add option for all POSIX objects
	whether named or unnamed to have a string name.  If the API does
	not directly support having a name, then the user must explicitly
	assign it using rtems_object_set_name().
	* rtems/src/rtemsobjectgetapiclassname.c: Improved testability.
	* score/include/rtems/score/object.h,
	score/src/objectgetnameasstring.c, score/src/objectnametoidstring.c,
	score/src/objectsetname.c: Modifications required to pass testing of
	recently modified object name operations.  Also eliminated
	multiprocessing related code that was not reachable.

1 files changed, 10 insertions, 16 deletions

diff --git a/cpukit/rtems/src/rtemsobjectgetapiclassname.c b/cpukit/rtems/src/rtemsobjectgetapiclassname.c
index ebf36339d7..0b99e83e49 100644
--- a/cpukit/rtems/src/rtemsobjectgetapiclassname.c
+++ b/cpukit/rtems/src/rtemsobjectgetapiclassname.c
@@ -77,26 +77,20 @@ const char *rtems_object_get_api_class_name(
   const rtems_assoc_t *api_assoc;
   const rtems_assoc_t *class_assoc;
   
-  switch (the_api) {
-    case OBJECTS_INTERNAL_API:
-      api_assoc = rtems_object_api_internal_assoc;
-      break;
-    case OBJECTS_CLASSIC_API:
-      api_assoc = rtems_object_api_classic_assoc;
-      break;
+  if ( the_api == OBJECTS_INTERNAL_API )
+    api_assoc = rtems_object_api_internal_assoc;
+  else if ( the_api == OBJECTS_CLASSIC_API )
+    api_assoc = rtems_object_api_classic_assoc;
 #ifdef RTEMS_POSIX_API
-    case OBJECTS_POSIX_API:
-      api_assoc = rtems_object_api_posix_assoc;
-      break;
+  else if ( the_api == OBJECTS_POSIX_API )
+    api_assoc = rtems_object_api_posix_assoc;
 #endif
 #ifdef RTEMS_ITRON_API
-    case OBJECTS_ITRON_API:
-      api_assoc = rtems_object_api_itron_assoc;
-      break;
+  else if ( the_api == OBJECTS_ITRON_API )
+    api_assoc = rtems_object_api_itron_assoc;
 #endif
-    default:
-      return "BAD API";
-  }
+  else
+    return "BAD API";
   class_assoc = rtems_assoc_ptr_by_local( api_assoc, the_class );
   if ( class_assoc )
     return class_assoc->name;