From b2c85ee90e201bc95e09c90f712f69d7413bc4b4 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 8 Jan 2014 16:15:27 +0100 Subject: [PATCH] messaging: Use talloc_pooled_object ... not as a speed improvement, it saves the second NULL check Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- source3/lib/messages.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/source3/lib/messages.c b/source3/lib/messages.c index fa3855cae58..e6681b54d8c 100644 --- a/source3/lib/messages.c +++ b/source3/lib/messages.c @@ -381,7 +381,8 @@ NTSTATUS messaging_send(struct messaging_context *msg_ctx, return NT_STATUS_NO_MEMORY; } - state = talloc(im, struct messaging_selfsend_state); + state = talloc_pooled_object( + im, struct messaging_selfsend_state, 1, data->length); if (state == NULL) { TALLOC_FREE(im); return NT_STATUS_NO_MEMORY; @@ -392,13 +393,9 @@ NTSTATUS messaging_send(struct messaging_context *msg_ctx, state->rec.dest = server; state->rec.src = msg_ctx->id; + /* Can't fail, it's a pooled_object */ state->rec.buf = data_blob_talloc( state, data->data, data->length); - if ((state->rec.buf.length != 0) && - (state->rec.buf.data == NULL)) { - TALLOC_FREE(im); - return NT_STATUS_NO_MEMORY; - } tevent_schedule_immediate(im, msg_ctx->event_ctx, messaging_trigger_self, state); -- 2.11.4.GIT