From dc112f3f4162d875078ddcbdcacd98e82c66862b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 4 Aug 2008 19:46:13 +0000 Subject: [PATCH] 2008-08-04 Joel Sherrill PR 1265/cpukit * score/include/rtems/score/object.h, score/src/objectallocatebyindex.c: Rename index argument to avoid warning when rtems.h and string.h are included at the same time by user code. --- cpukit/ChangeLog | 8 ++++++++ cpukit/score/include/rtems/score/object.h | 4 ++-- cpukit/score/src/objectallocatebyindex.c | 8 ++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index c7e41721a0..1c95b4cee8 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,11 @@ +2008-08-04 Joel Sherrill + + PR 1265/cpukit + * score/include/rtems/score/object.h, + score/src/objectallocatebyindex.c: Rename index argument to avoid + warning when rtems.h and string.h are included at the same time by + user code. + 2008-08-03 Ralf Corsépius * libnetworking/lib/tftpDriver.c: Add prototypes. diff --git a/cpukit/score/include/rtems/score/object.h b/cpukit/score/include/rtems/score/object.h index da1f4406ee..b488dd6d45 100644 --- a/cpukit/score/include/rtems/score/object.h +++ b/cpukit/score/include/rtems/score/object.h @@ -535,12 +535,12 @@ Objects_Control *_Objects_Allocate( * free object control blocks. * * @param[in] information points to an object class information block. - * @param[in] index is the index of the object to allocate. + * @param[in] the_index is the index of the object to allocate. * @param[in] sizeof_control is the size of the object control block. */ Objects_Control *_Objects_Allocate_by_index( Objects_Information *information, - uint16_t index, + uint16_t the_index, uint16_t sizeof_control ); diff --git a/cpukit/score/src/objectallocatebyindex.c b/cpukit/score/src/objectallocatebyindex.c index 1a4ca6da85..474fec0d6f 100644 --- a/cpukit/score/src/objectallocatebyindex.c +++ b/cpukit/score/src/objectallocatebyindex.c @@ -41,14 +41,14 @@ Objects_Control *_Objects_Allocate_by_index( Objects_Information *information, - uint16_t index, + uint16_t the_index, uint16_t sizeof_control ) { Objects_Control *the_object; - if ( index && information->maximum >= index ) { - the_object = information->local_table[ index ]; + if ( the_index && information->maximum >= the_index ) { + the_object = information->local_table[ the_index ]; if ( the_object ) return NULL; @@ -61,7 +61,7 @@ Objects_Control *_Objects_Allocate_by_index( the_object = (Objects_Control *) _Addresses_Add_offset( information->object_blocks[ 0 ], - (sizeof_control * (index - 1)) + (sizeof_control * (the_index - 1)) ); _Chain_Extract( &the_object->Node );