2008-01-23 Joel Sherrill <joel.sherrill@oarcorp.com>

	* itron/include/rtems/itron/object.h, itron/src/cre_tsk.c,
	libblock/src/show_bdbuf.c, libmisc/capture/capture-cli.c,
	libmisc/capture/capture.c, libmisc/monitor/mon-manager.c,
	libmisc/stackchk/check.c, posix/src/condinit.c,
	posix/src/keycreate.c, posix/src/mqueuecreatesupp.c,
	posix/src/mqueuedeletesupp.c, posix/src/mqueuenametoid.c,
	posix/src/mqueueopen.c, posix/src/mqueueunlink.c,
	posix/src/mutexinit.c, posix/src/pbarrierinit.c,
	posix/src/prwlockinit.c, posix/src/pspininit.c,
	posix/src/pthreadcreate.c, posix/src/pthreadexit.c,
	posix/src/semaphorecreatesupp.c, posix/src/semaphorenametoid.c,
	posix/src/timercreate.c, rtems/src/barrierident.c,
	rtems/src/dpmemident.c, rtems/src/msgqident.c, rtems/src/partident.c,
	rtems/src/ratemonident.c, rtems/src/regionident.c,
	rtems/src/semident.c, rtems/src/taskident.c, rtems/src/timerident.c,
	sapi/src/extensionident.c, score/Makefile.am,
	score/include/rtems/score/object.h,
	score/inline/rtems/score/object.inl, score/src/apimutexallocate.c,
	score/src/objectextendinformation.c,
	score/src/objectgetnameasstring.c, score/src/objectmp.c,
	score/src/objectnametoid.c: Convert the Objects_Name type from a
	simple type to a union of an unsigned 32 bit integer and a pointer.
	This should help eliminate weird casts between u32 and pointers in
	various places. The APIs now have to explicitly call _u32 or _string
	versions of helper routines. This should also simplify things and
	eliminate the need for ugly casts in some cases.
	* score/src/objectclearname.c, score/src/objectcomparenameraw.c,
	score/src/objectcomparenamestring.c, score/src/objectcopynameraw.c,
	score/src/objectcopynamestring.c: Removed.

1 files changed, 8 insertions, 10 deletions

diff --git a/cpukit/score/src/objectnametoid.c b/cpukit/score/src/objectnametoid.c
index 03e9d1da28..cc523e17b9 100644
--- a/cpukit/score/src/objectnametoid.c
+++ b/cpukit/score/src/objectnametoid.c
@@ -2,7 +2,7 @@
  *  Object Handler
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2008.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -30,7 +30,7 @@
 
 /*PAGE
  *
- *  _Objects_Name_to_id
+ *  _Objects_Name_to_id_u32
  *
  *  These kernel routines search the object table(s) for the given
  *  object name and returns the associated object id.
@@ -47,9 +47,9 @@
  *    error code                           - if unsuccessful
  */
 
-Objects_Name_or_id_lookup_errors _Objects_Name_to_id(
+Objects_Name_or_id_lookup_errors _Objects_Name_to_id_u32(
   Objects_Information *information,
-  Objects_Name         name,
+  uint32_t             name,
   uint32_t             node,
   Objects_Id          *id
 )
@@ -58,7 +58,8 @@ Objects_Name_or_id_lookup_errors _Objects_Name_to_id(
   Objects_Control           *the_object;
   uint32_t                   index;
   uint32_t                   name_length;
-  Objects_Name_comparators   compare_them;
+
+  /* ASSERT: information->is_string == FALSE */
 
   if ( !id )
     return OBJECTS_INVALID_ADDRESS;
@@ -78,15 +79,12 @@ Objects_Name_or_id_lookup_errors _Objects_Name_to_id(
   if ( search_local_node ) {
     name_length = information->name_length;
 
-    if ( information->is_string ) compare_them = _Objects_Compare_name_string;
-    else                          compare_them = _Objects_Compare_name_raw;
-
     for ( index = 1; index <= information->maximum; index++ ) {
       the_object = information->local_table[ index ];
-      if ( !the_object || !the_object->name )
+      if ( !the_object )
         continue;
 
-      if ( (*compare_them)( name, the_object->name, name_length ) ) {
+      if ( name == the_object->name.name_u32 ) {
         *id = the_object->id;
         return OBJECTS_NAME_OR_ID_LOOKUP_SUCCESSFUL;
       }