s3-talloc Change TALLOC_ZERO_P() to talloc_zero()

[samba.git] / source3 / lib / messages_local.c

diff --git a/source3/lib/messages_local.c b/source3/lib/messages_local.c
index 8cc060b9e2bf26506ce19129d7789ad0c021d165..09b8706262127235edc1d5f1d4c548f06cf57827 100644 (file)
--- a/source3/lib/messages_local.c
+++ b/source3/lib/messages_local.c
@@ -43,8 +43,9 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/messaging.h"
-#include "librpc/gen_ndr/ndr_messaging.h"
+#include "system/filesys.h"
+#include "messages.h"
+#include "lib/util/tdb_wrap.h"
 
 struct messaging_tdb_context {
        struct messaging_context *msg_ctx;
@@ -86,12 +87,12 @@ NTSTATUS messaging_tdb_init(struct messaging_context *msg_ctx,
        struct messaging_backend *result;
        struct messaging_tdb_context *ctx;
 
-       if (!(result = TALLOC_P(mem_ctx, struct messaging_backend))) {
+       if (!(result = talloc(mem_ctx, struct messaging_backend))) {
                DEBUG(0, ("talloc failed\n"));
                return NT_STATUS_NO_MEMORY;
        }
 
-       ctx = TALLOC_ZERO_P(result, struct messaging_tdb_context);
+       ctx = talloc_zero(result, struct messaging_tdb_context);
        if (!ctx) {
                DEBUG(0, ("talloc failed\n"));
                TALLOC_FREE(result);
@@ -186,7 +187,7 @@ static NTSTATUS messaging_tdb_fetch(TDB_CONTEXT *msg_tdb,
        DATA_BLOB blob;
        enum ndr_err_code ndr_err;
 
-       if (!(result = TALLOC_ZERO_P(mem_ctx, struct messaging_array))) {
+       if (!(result = talloc_zero(mem_ctx, struct messaging_array))) {
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -370,7 +371,7 @@ static NTSTATUS messaging_tdb_send(struct messaging_context *msg_ctx,
                goto done;
        }
 
-       if (!(rec = TALLOC_REALLOC_ARRAY(talloc_tos(), msg_array->messages,
+       if (!(rec = talloc_realloc(talloc_tos(), msg_array->messages,
                                         struct messaging_rec,
                                         msg_array->num_messages+1))) {
                status = NT_STATUS_NO_MEMORY;