Changeset dc112f3 in rtems


Ignore:
Timestamp:
Aug 4, 2008, 7:46:13 PM (11 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.9, master
Children:
e9dba243
Parents:
bd547e3
Message:

2008-08-04 Joel Sherrill <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.
Location:
cpukit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    rbd547e3 rdc112f3  
     12008-08-04      Joel Sherrill <joel.sherrill@OARcorp.com>
     2
     3        PR 1265/cpukit
     4        * score/include/rtems/score/object.h,
     5        score/src/objectallocatebyindex.c: Rename index argument to avoid
     6        warning when rtems.h and string.h are included at the same time by
     7        user code.
     8
    192008-08-03      Ralf Corsépius <ralf.corsepius@rtems.org>
    210
  • cpukit/score/include/rtems/score/object.h

    rbd547e3 rdc112f3  
    536536 *
    537537 *  @param[in] information points to an object class information block.
    538  *  @param[in] index is the index of the object to allocate.
     538 *  @param[in] the_index is the index of the object to allocate.
    539539 *  @param[in] sizeof_control is the size of the object control block.
    540540 */
    541541Objects_Control *_Objects_Allocate_by_index(
    542542  Objects_Information *information,
    543   uint16_t             index,
     543  uint16_t             the_index,
    544544  uint16_t             sizeof_control
    545545);
  • cpukit/score/src/objectallocatebyindex.c

    rbd547e3 rdc112f3  
    4242Objects_Control *_Objects_Allocate_by_index(
    4343  Objects_Information *information,
    44   uint16_t             index,
     44  uint16_t             the_index,
    4545  uint16_t             sizeof_control
    4646)
     
    4848  Objects_Control *the_object;
    4949
    50   if ( index && information->maximum >= index ) {
    51     the_object = information->local_table[ index ];
     50  if ( the_index && information->maximum >= the_index ) {
     51    the_object = information->local_table[ the_index ];
    5252    if ( the_object )
    5353      return NULL;
     
    6262    the_object = (Objects_Control *) _Addresses_Add_offset(
    6363      information->object_blocks[ 0 ],
    64       (sizeof_control * (index - 1))
     64      (sizeof_control * (the_index - 1))
    6565    );
    6666    _Chain_Extract( &the_object->Node );
Note: See TracChangeset for help on using the changeset viewer.