summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sherrill <joel@rtems.org>2020-02-12 18:15:56 -0600
committerSebastian Huber <sebastian.huber@embedded-brains.de>2020-02-14 07:30:38 +0100
commit3f732f0c4db358a9897c533f93cb9ff94ef5c0f3 (patch)
treeb6c8933dbc8a1536c0854bc4bdf64e4dc33c67f3
parentd252e20ab5717afea2ac89543ab4e0d379434bb0 (diff)
objectdata.h, objectimpl.h: Change structure member from free to deallocate
Without this change, rtems-libbsd does not compile. A macro turns free into bsd_free. Also the use of a standard library element as a program identifier is a violation of a MISRA rule. Turns out that was a good rule. :)
-rw-r--r--cpukit/include/rtems/score/objectdata.h2
-rw-r--r--cpukit/include/rtems/score/objectimpl.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/cpukit/include/rtems/score/objectdata.h b/cpukit/include/rtems/score/objectdata.h
index 3d1a79c38b..56a1b8eb13 100644
--- a/cpukit/include/rtems/score/objectdata.h
+++ b/cpukit/include/rtems/score/objectdata.h
@@ -210,7 +210,7 @@ struct Objects_Information {
*
* @see _Objects_Free_static(), and _Objects_Free_unlimited().
*/
- void ( *free )( Objects_Information *, Objects_Control * );
+ void ( *deallocate )( Objects_Information *, Objects_Control * );
/**
* @brief This is the number of object control blocks on the inactive chain.
diff --git a/cpukit/include/rtems/score/objectimpl.h b/cpukit/include/rtems/score/objectimpl.h
index 5ade0edc5a..c540f90166 100644
--- a/cpukit/include/rtems/score/objectimpl.h
+++ b/cpukit/include/rtems/score/objectimpl.h
@@ -933,8 +933,8 @@ RTEMS_INLINE_ROUTINE void _Objects_Free(
)
{
_Assert( _Objects_Allocator_is_owner() );
- _Assert( information->free != NULL );
- ( *information->free )( information, the_object );
+ _Assert( information->deallocate != NULL );
+ ( *information->deallocate )( information, the_object );
}
/**