diff options
Diffstat (limited to 'qpid/extras/dispatch/src/message.c')
| -rw-r--r-- | qpid/extras/dispatch/src/message.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/qpid/extras/dispatch/src/message.c b/qpid/extras/dispatch/src/message.c index 4d4f37a546..86ffcefcee 100644 --- a/qpid/extras/dispatch/src/message.c +++ b/qpid/extras/dispatch/src/message.c @@ -376,7 +376,7 @@ static dx_field_location_t *dx_message_field_location(dx_message_t *msg, dx_mess } -dx_message_t *dx_allocate_message() +dx_message_t *dx_message() { dx_message_pvt_t *msg = (dx_message_pvt_t*) new_dx_message_t(); if (!msg) @@ -400,7 +400,7 @@ dx_message_t *dx_allocate_message() } -void dx_free_message(dx_message_t *in_msg) +void dx_message_free(dx_message_t *in_msg) { uint32_t rc; dx_message_pvt_t *msg = (dx_message_pvt_t*) in_msg; @@ -417,14 +417,14 @@ void dx_free_message(dx_message_t *in_msg) dx_buffer_t *buf = DEQ_HEAD(content->buffers); while (buf) { DEQ_REMOVE_HEAD(content->buffers); - dx_free_buffer(buf); + dx_buffer_free(buf); buf = DEQ_HEAD(content->buffers); } buf = DEQ_HEAD(content->new_delivery_annotations); while (buf) { DEQ_REMOVE_HEAD(content->new_delivery_annotations); - dx_free_buffer(buf); + dx_buffer_free(buf); buf = DEQ_HEAD(content->new_delivery_annotations); } @@ -508,7 +508,7 @@ dx_message_t *dx_message_receive(dx_delivery_t *delivery) // link it and the delivery together. // if (!msg) { - msg = (dx_message_pvt_t*) dx_allocate_message(); + msg = (dx_message_pvt_t*) dx_message(); dx_delivery_set_context(delivery, (void*) msg); } @@ -519,7 +519,7 @@ dx_message_t *dx_message_receive(dx_delivery_t *delivery) // buf = DEQ_TAIL(msg->content->buffers); if (!buf) { - buf = dx_allocate_buffer(); + buf = dx_buffer(); DEQ_INSERT_TAIL(msg->content->buffers, buf); } @@ -540,7 +540,7 @@ dx_message_t *dx_message_receive(dx_delivery_t *delivery) // if (dx_buffer_size(buf) == 0) { DEQ_REMOVE_TAIL(msg->content->buffers); - dx_free_buffer(buf); + dx_buffer_free(buf); } dx_delivery_set_context(delivery, 0); return (dx_message_t*) msg; @@ -558,7 +558,7 @@ dx_message_t *dx_message_receive(dx_delivery_t *delivery) // tail of the message's list. // if (dx_buffer_capacity(buf) == 0) { - buf = dx_allocate_buffer(); + buf = dx_buffer(); DEQ_INSERT_TAIL(msg->content->buffers, buf); } } else |