[rtems commit] score: Set name before object is made public
Sebastian Huber
sebh at rtems.org
Mon Mar 24 07:25:02 UTC 2014
Module: rtems
Branch: master
Commit: 3b5e7dcf1450e1154829a99513925f60ed38b26b
Changeset: http://git.rtems.org/rtems/commit/?id=3b5e7dcf1450e1154829a99513925f60ed38b26b
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Wed Mar 19 10:40:47 2014 +0100
score: Set name before object is made public
---
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 8541ce5..3764c66 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
}
/**
More information about the vc
mailing list