diff --git a/rmw/include/rmw/raw_message.h b/rmw/include/rmw/raw_message.h index 6e2fbb68..c4da144e 100644 --- a/rmw/include/rmw/raw_message.h +++ b/rmw/include/rmw/raw_message.h @@ -22,6 +22,7 @@ extern "C" #include "rcutils/allocator.h" +#include "rmw/macros.h" #include "rmw/types.h" #include "rmw/visibility_control.h" @@ -30,6 +31,7 @@ extern "C" * \return rmw_message_raw_t a zero initialized raw message struct */ RMW_PUBLIC +RMW_WARN_UNUSED rmw_message_raw_t rmw_get_zero_initialized_raw_message(void); @@ -45,6 +47,7 @@ rmw_get_zero_initialized_raw_message(void); * \param allocator the allocator to use for the memory allocation. */ RMW_PUBLIC +RMW_WARN_UNUSED rmw_ret_t rmw_raw_message_init( rmw_message_raw_t * msg, @@ -60,6 +63,7 @@ rmw_raw_message_init( * \param msg pointer to the raw message to be cleaned up */ RMW_PUBLIC +RMW_WARN_UNUSED rmw_ret_t rmw_raw_message_fini(rmw_message_raw_t * msg); @@ -75,6 +79,7 @@ rmw_raw_message_fini(rmw_message_raw_t * msg); * \param new_size the new size of the internal buffer */ RMW_PUBLIC +RMW_WARN_UNUSED rmw_ret_t rmw_raw_message_resize(rmw_message_raw_t * msg, unsigned int new_size); diff --git a/rmw/src/raw_message.c b/rmw/src/raw_message.c index e07211a2..2213aed8 100644 --- a/rmw/src/raw_message.c +++ b/rmw/src/raw_message.c @@ -17,7 +17,6 @@ #include "rmw/error_handling.h" #include "rmw/raw_message.h" -RMW_PUBLIC rmw_message_raw_t rmw_get_zero_initialized_raw_message(void) { @@ -30,7 +29,6 @@ rmw_get_zero_initialized_raw_message(void) return raw_message; } -RMW_PUBLIC rmw_ret_t rmw_raw_message_init( rmw_message_raw_t * msg, @@ -62,7 +60,6 @@ rmw_raw_message_init( return RMW_RET_OK; } -RMW_PUBLIC rmw_ret_t rmw_raw_message_fini(rmw_message_raw_t * msg) { @@ -84,7 +81,6 @@ rmw_raw_message_fini(rmw_message_raw_t * msg) return RMW_RET_OK; } -RMW_PUBLIC rmw_ret_t rmw_raw_message_resize(rmw_message_raw_t * msg, unsigned int new_size) { @@ -103,7 +99,7 @@ rmw_raw_message_resize(rmw_message_raw_t * msg, unsigned int new_size) return RMW_RET_OK; } - msg->buffer = allocator->reallocate(msg->buffer, new_size * sizeof(char), allocator->state); + msg->buffer = rcutils_reallocf(msg->buffer, new_size * sizeof(char), allocator); RCUTILS_CHECK_FOR_NULL_WITH_MSG( msg->buffer, "failed to reallocate memory for raw message",