summaryrefslogtreecommitdiffstats
path: root/cpukit/score/macros/rtems/score/object.inl
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-07-05 18:15:41 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-07-05 18:15:41 +0000
commite90ff51fd8c2fb35228fe29fa381616ec7f26284 (patch)
tree13595b9b390dbc4a8b4196c7cb638207ba2dc49f /cpukit/score/macros/rtems/score/object.inl
parent485c9741ab214a64777d45d482f0a86fe2c5ebdd (diff)
downloadrtems-e90ff51fd8c2fb35228fe29fa381616ec7f26284.tar.bz2
2002-07-05 Joel Sherrill <joel@OARcorp.com>
* macros/rtems/score/object.inl: Corrected implementation of _Objects_Open, _Objects_Close, and _Objects_Namespace_remove to be consistent with the inline implementation.
Diffstat (limited to '')
-rw-r--r--cpukit/score/macros/rtems/score/object.inl20
1 files changed, 12 insertions, 8 deletions
diff --git a/cpukit/score/macros/rtems/score/object.inl b/cpukit/score/macros/rtems/score/object.inl
index eaac6768f4..6bd7765319 100644
--- a/cpukit/score/macros/rtems/score/object.inl
+++ b/cpukit/score/macros/rtems/score/object.inl
@@ -144,18 +144,20 @@
*/
#define _Objects_Open( _information, _the_object, _name ) \
- { \
+ do { \
unsigned32 _index; \
\
_index = _Objects_Get_index( (_the_object)->id ); \
(_information)->local_table[ _index ] = (_the_object); \
\
if ( (_information)->is_string ) \
- _Objects_Copy_name_string( (_name), (_the_object)->name ); \
+ /* _Objects_Copy_name_string( (_name), (_the_object)->name ); */\
+ (_the_object)->name = name; \
else \
- _Objects_Copy_name_raw( \
- (_name), (_the_object)->name, (_information)->name_length ); \
- }
+ /* _Objects_Copy_name_raw( \
+ (_name), (_the_object)->name, (_information)->name_length ); */ \
+ (_the_object)->name = name; \
+ } while (0)
/*PAGE
*
@@ -164,13 +166,14 @@
*/
#define _Objects_Close( _information, _the_object ) \
- { \
+ do { \
unsigned32 _index; \
\
_index = _Objects_Get_index( (_the_object)->id ); \
(_information)->local_table[ _index ] = (Objects_Control *) NULL; \
- _Objects_Clear_name( (_the_object)->name, (_information)->name_length ); \
- }
+ /* _Objects_Clear_name( (_the_object)->name, (_information)->name_length ); */ \
+ (_the_object)->name = 0; \
+ } while (0)
/*PAGE
*
@@ -178,6 +181,7 @@
*/
#define _Objects_Namespace_remove( _information, _the_object ) \
+ (_the_object)->name = 0 \
_Objects_Clear_name( (_the_object)->name, (_information)->name_length )
#endif