diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-03-19 10:40:47 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-03-24 08:31:01 +0100 |
| commit | 3b5e7dcf1450e1154829a99513925f60ed38b26b (patch) | |
| tree | 273008d51b580623d487adc0a97c61a284544bba | |
| parent | greth: Make local functions static, remove overflow and correct printf call. (diff) | |
| download | rtems-3b5e7dcf1450e1154829a99513925f60ed38b26b.tar.bz2 | |
score: Set name before object is made public
| -rw-r--r-- | cpukit/score/include/rtems/score/objectimpl.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpukit/score/include/rtems/score/objectimpl.h b/cpukit/score/include/rtems/score/objectimpl.h index 8541ce58b9..3764c664fd 100644 --- a/cpukit/score/include/rtems/score/objectimpl.h +++ b/cpukit/score/include/rtems/score/objectimpl.h @@ -791,13 +791,13 @@ RTEMS_INLINE_ROUTINE void _Objects_Open( Objects_Name name ) { + the_object->name = name; + _Objects_Set_local_object( information, _Objects_Get_index( the_object->id ), the_object ); - - the_object->name = name; } /** @@ -814,14 +814,14 @@ RTEMS_INLINE_ROUTINE void _Objects_Open_u32( uint32_t name ) { + /* ASSERT: information->is_string == false */ + the_object->name.name_u32 = name; + _Objects_Set_local_object( information, _Objects_Get_index( the_object->id ), the_object ); - - /* ASSERT: information->is_string == false */ - the_object->name.name_u32 = name; } /** @@ -838,16 +838,16 @@ RTEMS_INLINE_ROUTINE void _Objects_Open_string( const char *name ) { + #if defined(RTEMS_SCORE_OBJECT_ENABLE_STRING_NAMES) + /* ASSERT: information->is_string */ + the_object->name.name_p = name; + #endif + _Objects_Set_local_object( information, _Objects_Get_index( the_object->id ), the_object ); - - #if defined(RTEMS_SCORE_OBJECT_ENABLE_STRING_NAMES) - /* ASSERT: information->is_string */ - the_object->name.name_p = name; - #endif } /** |