RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

make inline and macro implementations match

Browse Source
This commit is contained in:
Joel Sherrill
1995-08-22 14:52:08 +00:00
parent 6136168881
commit b2c491a080
6 changed files with 51 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/exec/rtems/inline/message.inl
View File

@@ -133,10 +133,9 @@ STATIC INLINE void _Message_queue_Free (
Message_queue_Control *the_message_queue Message_queue_Control *the_message_queue
) )
{ {
if (the_message_queue->message_buffers) if (the_message_queue->message_buffers) {
{ _Workspace_Free((void *) the_message_queue->message_buffers);
_Workspace_Free((void *) the_message_queue->message_buffers); the_message_queue->message_buffers = 0;
the_message_queue->message_buffers = 0;
} }
_Objects_Free( &_Message_queue_Information, &the_message_queue->Object ); _Objects_Free( &_Message_queue_Information, &the_message_queue->Object );

7
c/src/exec/rtems/inline/rtems/rtems/message.inl
View File

@@ -133,10 +133,9 @@ STATIC INLINE void _Message_queue_Free (
Message_queue_Control *the_message_queue Message_queue_Control *the_message_queue
) )
{ {
if (the_message_queue->message_buffers) if (the_message_queue->message_buffers) {
{ _Workspace_Free((void *) the_message_queue->message_buffers);
_Workspace_Free((void *) the_message_queue->message_buffers); the_message_queue->message_buffers = 0;
the_message_queue->message_buffers = 0;
} }
_Objects_Free( &_Message_queue_Information, &the_message_queue->Object ); _Objects_Free( &_Message_queue_Information, &the_message_queue->Object );

28
c/src/exec/rtems/macros/message.inl
View File

@@ -23,8 +23,7 @@
*/ */
#define _Message_queue_Copy_buffer( _source, _destination ) \ #define _Message_queue_Copy_buffer( _source, _destination ) \
*(Message_queue_Buffer *)(_destination) = \ memcpy( _destination, _source, _size)
*(Message_queue_Buffer *)(_source)
/*PAGE /*PAGE
* *
@@ -84,16 +83,6 @@
#define _Message_queue_Is_null( _the_message_queue ) \ #define _Message_queue_Is_null( _the_message_queue ) \
( (_the_message_queue) == NULL ) ( (_the_message_queue) == NULL )
/*PAGE
*
* _Message_queue_Allocate
*
*/
#define _Message_queue_Allocate() \
(Message_queue_Control *) \
_Objects_Allocate( &_Message_queue_Information )
/*PAGE /*PAGE
* *
* _Message_queue_Free * _Message_queue_Free
@@ -101,8 +90,19 @@
*/ */
#define _Message_queue_Free( _the_message_queue ) \ #define _Message_queue_Free( _the_message_queue ) \
_Objects_Free( &_Message_queue_Information, \ do { \
&(_the_message_queue)->Object ) \
if ( (_the_messsage_queue)->message_buffers ) { \
_Workspace_Free((void *) (_the_message_queue)->message_buffers); \
(_the_message_queue)->message_buffers = 0; \
}
\
_Objects_Free( \
&_Message_queue_Information, \
&(_the_message_queue)->Object \
); \
} while ( 0 )
/*PAGE /*PAGE
* *

28
c/src/exec/rtems/macros/rtems/rtems/message.inl
View File

@@ -23,8 +23,7 @@
*/ */
#define _Message_queue_Copy_buffer( _source, _destination ) \ #define _Message_queue_Copy_buffer( _source, _destination ) \
*(Message_queue_Buffer *)(_destination) = \ memcpy( _destination, _source, _size)
*(Message_queue_Buffer *)(_source)
/*PAGE /*PAGE
* *
@@ -84,16 +83,6 @@
#define _Message_queue_Is_null( _the_message_queue ) \ #define _Message_queue_Is_null( _the_message_queue ) \
( (_the_message_queue) == NULL ) ( (_the_message_queue) == NULL )
/*PAGE
*
* _Message_queue_Allocate
*
*/
#define _Message_queue_Allocate() \
(Message_queue_Control *) \
_Objects_Allocate( &_Message_queue_Information )
/*PAGE /*PAGE
* *
* _Message_queue_Free * _Message_queue_Free
@@ -101,8 +90,19 @@
*/ */
#define _Message_queue_Free( _the_message_queue ) \ #define _Message_queue_Free( _the_message_queue ) \
_Objects_Free( &_Message_queue_Information, \ do { \
&(_the_message_queue)->Object ) \
if ( (_the_messsage_queue)->message_buffers ) { \
_Workspace_Free((void *) (_the_message_queue)->message_buffers); \
(_the_message_queue)->message_buffers = 0; \
}
\
_Objects_Free( \
&_Message_queue_Information, \
&(_the_message_queue)->Object \
); \
} while ( 0 )
/*PAGE /*PAGE
* *

7
cpukit/rtems/inline/rtems/rtems/message.inl
View File

@@ -133,10 +133,9 @@ STATIC INLINE void _Message_queue_Free (
Message_queue_Control *the_message_queue Message_queue_Control *the_message_queue
) )
{ {
if (the_message_queue->message_buffers) if (the_message_queue->message_buffers) {
{ _Workspace_Free((void *) the_message_queue->message_buffers);
_Workspace_Free((void *) the_message_queue->message_buffers); the_message_queue->message_buffers = 0;
the_message_queue->message_buffers = 0;
} }
_Objects_Free( &_Message_queue_Information, &the_message_queue->Object ); _Objects_Free( &_Message_queue_Information, &the_message_queue->Object );

28
cpukit/rtems/macros/rtems/rtems/message.inl
View File

@@ -23,8 +23,7 @@
*/ */
#define _Message_queue_Copy_buffer( _source, _destination ) \ #define _Message_queue_Copy_buffer( _source, _destination ) \
*(Message_queue_Buffer *)(_destination) = \ memcpy( _destination, _source, _size)
*(Message_queue_Buffer *)(_source)
/*PAGE /*PAGE
* *
@@ -84,16 +83,6 @@
#define _Message_queue_Is_null( _the_message_queue ) \ #define _Message_queue_Is_null( _the_message_queue ) \
( (_the_message_queue) == NULL ) ( (_the_message_queue) == NULL )
/*PAGE
*
* _Message_queue_Allocate
*
*/
#define _Message_queue_Allocate() \
(Message_queue_Control *) \
_Objects_Allocate( &_Message_queue_Information )
/*PAGE /*PAGE
* *
* _Message_queue_Free * _Message_queue_Free
@@ -101,8 +90,19 @@
*/ */
#define _Message_queue_Free( _the_message_queue ) \ #define _Message_queue_Free( _the_message_queue ) \
_Objects_Free( &_Message_queue_Information, \ do { \
&(_the_message_queue)->Object ) \
if ( (_the_messsage_queue)->message_buffers ) { \
_Workspace_Free((void *) (_the_message_queue)->message_buffers); \
(_the_message_queue)->message_buffers = 0; \
}
\
_Objects_Free( \
&_Message_queue_Information, \
&(_the_message_queue)->Object \
); \
} while ( 0 )
/*PAGE /*PAGE
* *