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/score/src/objectextendinformation.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'cpukit/score/src/objectextendinformation.c') diff --git a/cpukit/score/src/objectextendinformation.c b/cpukit/score/src/objectextendinformation.c index 538ab139bb..8db0bf5b9b 100644 --- a/cpukit/score/src/objectextendinformation.c +++ b/cpukit/score/src/objectextendinformation.c @@ -84,7 +84,7 @@ void _Objects_Extend_information( if (index_base >= information->maximum ) { ISR_Level level; void **object_blocks; - Objects_Name *name_table; + void **name_table; uint32_t *inactive_per_block; Objects_Control **local_table; uint32_t maximum; @@ -147,7 +147,7 @@ void _Objects_Extend_information( inactive_per_block = (uint32_t *) _Addresses_Add_offset( object_blocks, block_count * sizeof(void*) ); - name_table = (Objects_Name *) _Addresses_Add_offset( + name_table = (void *) _Addresses_Add_offset( inactive_per_block, block_count * sizeof(uint32_t ) ); local_table = (Objects_Control **) _Addresses_Add_offset( name_table, block_count * sizeof(Objects_Name *) ); @@ -195,7 +195,7 @@ void _Objects_Extend_information( object_blocks[block_count] = NULL; inactive_per_block[block_count] = 0; - name_table[block_count] = NULL; + // name_table[block_count] = NULL; for ( index=index_base ; index < ( information->allocation_size + index_base ); @@ -209,7 +209,7 @@ void _Objects_Extend_information( information->object_blocks = object_blocks; information->inactive_per_block = inactive_per_block; - information->name_table = name_table; + information->name_table = (void *)name_table; information->local_table = local_table; information->maximum = maximum; information->maximum_id = _Objects_Build_id( @@ -253,7 +253,7 @@ void _Objects_Extend_information( information->object_blocks[ block ], (information->allocation_size * information->size) ); - information->name_table[ block ] = name_area; + // information->name_table[ block ] = name_area; /* * Initialize objects .. add to a local chain first. @@ -281,9 +281,7 @@ void _Objects_Extend_information( index ); - the_object->name = (void *) name_area; - - name_area = _Addresses_Add_offset( name_area, information->name_length ); + name_area = (void *)_Addresses_Add_offset( name_area, information->name_length ); _Chain_Append( &information->Inactive, &the_object->Node ); -- cgit v1.2.3