diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-10-25 12:05:53 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-10-29 10:33:33 +0100 |
| commit | 70382718450c6b5d83232188cc71b6c795048a27 (patch) | |
| tree | 454cdea0181e12e183532d24cc7483fa28c9a09e /cpukit/score/src/objectgetnameasstring.c | |
| parent | score: Remove bogus thread object name support (diff) | |
| download | rtems-70382718450c6b5d83232188cc71b6c795048a27.tar.bz2 | |
Remove RTEMS_SCORE_OBJECT_ENABLE_STRING_NAMES
Enable support for string objects names unconditionally. Add const
qualifier throughout. Split _Objects_Namespace_remove() into
_Objects_Namespace_remove_u32() and _Objects_Namespace_remove_string()
to avoid an unnecessary dependency on _Workspace_Free().
Update #2514.
Diffstat (limited to 'cpukit/score/src/objectgetnameasstring.c')
| -rw-r--r-- | cpukit/score/src/objectgetnameasstring.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/cpukit/score/src/objectgetnameasstring.c b/cpukit/score/src/objectgetnameasstring.c index f23b1599e1..ed6a73c0f8 100644 --- a/cpukit/score/src/objectgetnameasstring.c +++ b/cpukit/score/src/objectgetnameasstring.c @@ -45,12 +45,9 @@ size_t _Objects_Name_to_string( char *d; size_t i; -#if defined(RTEMS_SCORE_OBJECT_ENABLE_STRING_NAMES) if ( is_string ) { s = name.name_p; - } else -#endif - { + } else { lname[ 0 ] = (name.name_u32 >> 24) & 0xff; lname[ 1 ] = (name.name_u32 >> 16) & 0xff; lname[ 2 ] = (name.name_u32 >> 8) & 0xff; @@ -93,10 +90,10 @@ char *_Objects_Get_name_as_string( char *name ) { - Objects_Information *information; - Objects_Control *the_object; - ISR_lock_Context lock_context; - Objects_Id tmpId; + const Objects_Information *information; + const Objects_Control *the_object; + ISR_lock_Context lock_context; + Objects_Id tmpId; if ( length == 0 ) return NULL; @@ -117,11 +114,7 @@ char *_Objects_Get_name_as_string( _Objects_Name_to_string( the_object->name, -#if defined(RTEMS_SCORE_OBJECT_ENABLE_STRING_NAMES) information->is_string, -#else - false, -#endif name, length ); |