From ce19f1fa3bd9f9760f680ef7839ca136a1c2478a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 23 Jan 2008 22:57:43 +0000 Subject: 2008-01-23 Joel Sherrill * 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. --- cpukit/rtems/src/barrierident.c | 4 ++-- cpukit/rtems/src/dpmemident.c | 4 ++-- cpukit/rtems/src/msgqident.c | 4 ++-- cpukit/rtems/src/partident.c | 7 +------ cpukit/rtems/src/ratemonident.c | 4 ++-- cpukit/rtems/src/regionident.c | 4 ++-- cpukit/rtems/src/semident.c | 7 +------ cpukit/rtems/src/taskident.c | 7 +------ cpukit/rtems/src/timerident.c | 4 ++-- 9 files changed, 15 insertions(+), 30 deletions(-) (limited to 'cpukit/rtems/src') diff --git a/cpukit/rtems/src/barrierident.c b/cpukit/rtems/src/barrierident.c index a860e08115..6b90dacf70 100644 --- a/cpukit/rtems/src/barrierident.c +++ b/cpukit/rtems/src/barrierident.c @@ -45,9 +45,9 @@ rtems_status_code rtems_barrier_ident( { Objects_Name_or_id_lookup_errors status; - status = _Objects_Name_to_id( + status = _Objects_Name_to_id_u32( &_Barrier_Information, - (Objects_Name) name, + name, OBJECTS_SEARCH_LOCAL_NODE, id ); diff --git a/cpukit/rtems/src/dpmemident.c b/cpukit/rtems/src/dpmemident.c index 7d24b3a70c..e9b4d4e288 100644 --- a/cpukit/rtems/src/dpmemident.c +++ b/cpukit/rtems/src/dpmemident.c @@ -48,9 +48,9 @@ rtems_status_code rtems_port_ident( { Objects_Name_or_id_lookup_errors status; - status = _Objects_Name_to_id( + status = _Objects_Name_to_id_u32( &_Dual_ported_memory_Information, - (Objects_Name) name, + name, OBJECTS_SEARCH_ALL_NODES, id ); diff --git a/cpukit/rtems/src/msgqident.c b/cpukit/rtems/src/msgqident.c index 41289a2996..435da557e5 100644 --- a/cpukit/rtems/src/msgqident.c +++ b/cpukit/rtems/src/msgqident.c @@ -60,9 +60,9 @@ rtems_status_code rtems_message_queue_ident( { Objects_Name_or_id_lookup_errors status; - status = _Objects_Name_to_id( + status = _Objects_Name_to_id_u32( &_Message_queue_Information, - (Objects_Name) name, + name, node, id ); diff --git a/cpukit/rtems/src/partident.c b/cpukit/rtems/src/partident.c index 157a634912..71159a5330 100644 --- a/cpukit/rtems/src/partident.c +++ b/cpukit/rtems/src/partident.c @@ -51,12 +51,7 @@ rtems_status_code rtems_partition_ident( { Objects_Name_or_id_lookup_errors status; - status = _Objects_Name_to_id( - &_Partition_Information, - (Objects_Name) name, - node, - id - ); + status = _Objects_Name_to_id_u32( &_Partition_Information, name, node, id ); return _Status_Object_name_errors_to_status[ status ]; } diff --git a/cpukit/rtems/src/ratemonident.c b/cpukit/rtems/src/ratemonident.c index bfe7ad4148..bd9bb3a83d 100644 --- a/cpukit/rtems/src/ratemonident.c +++ b/cpukit/rtems/src/ratemonident.c @@ -47,9 +47,9 @@ rtems_status_code rtems_rate_monotonic_ident( { Objects_Name_or_id_lookup_errors status; - status = _Objects_Name_to_id( + status = _Objects_Name_to_id_u32( &_Rate_monotonic_Information, - (Objects_Name) name, + name, OBJECTS_SEARCH_LOCAL_NODE, id ); diff --git a/cpukit/rtems/src/regionident.c b/cpukit/rtems/src/regionident.c index f60903c150..adeba9ffe7 100644 --- a/cpukit/rtems/src/regionident.c +++ b/cpukit/rtems/src/regionident.c @@ -50,9 +50,9 @@ rtems_status_code rtems_region_ident( { Objects_Name_or_id_lookup_errors status; - status = _Objects_Name_to_id( + status = _Objects_Name_to_id_u32( &_Region_Information, - (Objects_Name) name, + name, OBJECTS_SEARCH_LOCAL_NODE, id ); diff --git a/cpukit/rtems/src/semident.c b/cpukit/rtems/src/semident.c index 1e92823172..56f8856da7 100644 --- a/cpukit/rtems/src/semident.c +++ b/cpukit/rtems/src/semident.c @@ -75,12 +75,7 @@ rtems_status_code rtems_semaphore_ident( { Objects_Name_or_id_lookup_errors status; - status = _Objects_Name_to_id( - &_Semaphore_Information, - (Objects_Name) name, - node, - id - ); + status = _Objects_Name_to_id_u32( &_Semaphore_Information, name, node, id ); return _Status_Object_name_errors_to_status[ status ]; } diff --git a/cpukit/rtems/src/taskident.c b/cpukit/rtems/src/taskident.c index 2c9d7169a6..7e74edb9bf 100644 --- a/cpukit/rtems/src/taskident.c +++ b/cpukit/rtems/src/taskident.c @@ -66,12 +66,7 @@ rtems_status_code rtems_task_ident( return RTEMS_SUCCESSFUL; } - status = _Objects_Name_to_id( - &_RTEMS_tasks_Information, - (Objects_Name) name, - node, - id - ); + status = _Objects_Name_to_id_u32( &_RTEMS_tasks_Information, name, node, id ); return _Status_Object_name_errors_to_status[ status ]; } diff --git a/cpukit/rtems/src/timerident.c b/cpukit/rtems/src/timerident.c index 2996e05ada..af32943bc7 100644 --- a/cpukit/rtems/src/timerident.c +++ b/cpukit/rtems/src/timerident.c @@ -49,9 +49,9 @@ rtems_status_code rtems_timer_ident( { Objects_Name_or_id_lookup_errors status; - status = _Objects_Name_to_id( + status = _Objects_Name_to_id_u32( &_Timer_Information, - (Objects_Name) name, + name, OBJECTS_SEARCH_LOCAL_NODE, id ); -- cgit v1.2.3