diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-04-19 14:12:06 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-04-21 07:29:40 +0200 |
commit | 36cd27c1e3ebb3796fa486cddd36b43b7be4cb6b (patch) | |
tree | ef589792781b889c8bf8bee1e46c13815770a575 /cpukit | |
parent | score: Simplify _Objects_Initialize_information() (diff) | |
download | rtems-36cd27c1e3ebb3796fa486cddd36b43b7be4cb6b.tar.bz2 |
score: Simplify _Objects_Get_next()
Remove unused location parameter.
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/libcsupport/src/resource_snapshot.c | 4 | ||||
-rw-r--r-- | cpukit/libmisc/monitor/mon-manager.c | 3 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/objectimpl.h | 12 | ||||
-rw-r--r-- | cpukit/score/src/objectgetnext.c | 15 |
4 files changed, 12 insertions, 22 deletions
diff --git a/cpukit/libcsupport/src/resource_snapshot.c b/cpukit/libcsupport/src/resource_snapshot.c index 198015593f..469df72b05 100644 --- a/cpukit/libcsupport/src/resource_snapshot.c +++ b/cpukit/libcsupport/src/resource_snapshot.c @@ -107,10 +107,8 @@ static void get_heap_info(Heap_Control *heap, Heap_Information_block *info) static POSIX_Keys_Control *get_next_key(Objects_Id *id) { - Objects_Locations location; - return (POSIX_Keys_Control *) - _Objects_Get_next(&_POSIX_Keys_Information, *id, &location, id); + _Objects_Get_next(*id, &_POSIX_Keys_Information, id); } static uint32_t get_active_posix_key_value_pairs(void) diff --git a/cpukit/libmisc/monitor/mon-manager.c b/cpukit/libmisc/monitor/mon-manager.c index 99c28acc09..d165c4fccd 100644 --- a/cpukit/libmisc/monitor/mon-manager.c +++ b/cpukit/libmisc/monitor/mon-manager.c @@ -26,7 +26,6 @@ rtems_monitor_manager_next( Objects_Information *table = table_void; rtems_monitor_generic_t *copy; Objects_Control *object = 0; - Objects_Locations location; /* * When we are called, it must be local @@ -37,7 +36,7 @@ rtems_monitor_manager_next( goto done; #endif - object = _Objects_Get_next(table, *next_id, &location, next_id); + object = _Objects_Get_next(*next_id, table, next_id); if (object) { diff --git a/cpukit/score/include/rtems/score/objectimpl.h b/cpukit/score/include/rtems/score/objectimpl.h index 47d17dd37a..6877b8e9fe 100644 --- a/cpukit/score/include/rtems/score/objectimpl.h +++ b/cpukit/score/include/rtems/score/objectimpl.h @@ -680,19 +680,19 @@ Objects_Control *_Objects_Get_no_protection( * * Locks the object allocator mutex in case a next object exists. * - * @param[in] information points to an object class information block. * @param[in] id is the Id of the object whose name we are locating. - * @param[in] location_p will contain an indication of success or failure. + * This is the first parameter since usual callers get the object identifier + * as the first parameter themself. + * @param[in] information points to an object class information block. * @param[in] next_id_p is the Id of the next object we will look at. * * @retval This method returns the pointer to the object located or * NULL on error. */ Objects_Control *_Objects_Get_next( - Objects_Information *information, - Objects_Id id, - Objects_Locations *location_p, - Objects_Id *next_id_p + Objects_Id id, + const Objects_Information *information, + Objects_Id *next_id_p ); /** diff --git a/cpukit/score/src/objectgetnext.c b/cpukit/score/src/objectgetnext.c index c0ebbbed98..2d4f252b97 100644 --- a/cpukit/score/src/objectgetnext.c +++ b/cpukit/score/src/objectgetnext.c @@ -20,12 +20,10 @@ #include <rtems/score/objectimpl.h> -Objects_Control * -_Objects_Get_next( - Objects_Information *information, - Objects_Id id, - Objects_Locations *location_p, - Objects_Id *next_id_p +Objects_Control *_Objects_Get_next( + Objects_Id id, + const Objects_Information *information, + Objects_Id *next_id_p ) { Objects_Control *the_object; @@ -34,9 +32,6 @@ _Objects_Get_next( if ( !information ) return NULL; - if ( !location_p ) - return NULL; - if ( !next_id_p ) return NULL; @@ -52,7 +47,6 @@ _Objects_Get_next( if (_Objects_Get_index(next_id) > information->maximum) { _Objects_Allocator_unlock(); - *location_p = OBJECTS_ERROR; *next_id_p = OBJECTS_ID_FINAL; return NULL; } @@ -64,7 +58,6 @@ _Objects_Get_next( } while ( the_object == NULL ); - *location_p = OBJECTS_LOCAL; *next_id_p = next_id; return the_object; } |