summaryrefslogtreecommitdiff
path: root/source3/lib/ctdbd_conn.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-07 11:38:41 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-09 12:40:08 +0200
commitd5e6a47f064a3923b1e257ab84fa7ccd7c4f89f4 (patch)
treec8351772fdc171b65c12f34b711999a4d24a37af /source3/lib/ctdbd_conn.c
parent3d15137653a7d1b593a9af2eef12f6e5b9a04c4f (diff)
downloadsamba-d5e6a47f064a3923b1e257ab84fa7ccd7c4f89f4.tar.gz
samba-d5e6a47f064a3923b1e257ab84fa7ccd7c4f89f4.tar.bz2
samba-d5e6a47f064a3923b1e257ab84fa7ccd7c4f89f4.zip
s3-talloc Change TALLOC_P() to talloc()
Using the standard macro makes it easier to move code into common, as TALLOC_P isn't standard talloc.
Diffstat (limited to 'source3/lib/ctdbd_conn.c')
-rw-r--r--source3/lib/ctdbd_conn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index f42290695a..ecc331aa6a 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -304,7 +304,7 @@ static struct messaging_rec *ctdb_pull_messaging_rec(TALLOC_CTX *mem_ctx,
cluster_fatal("got invalid msg length");
}
- if (!(result = TALLOC_P(mem_ctx, struct messaging_rec))) {
+ if (!(result = talloc(mem_ctx, struct messaging_rec))) {
DEBUG(0, ("talloc failed\n"));
return NULL;
}
@@ -433,7 +433,7 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection *conn, uint32 reqid,
goto next_pkt;
}
- msg_state = TALLOC_P(NULL, struct deferred_msg_state);
+ msg_state = talloc(NULL, struct deferred_msg_state);
if (msg_state == NULL) {
DEBUG(0, ("talloc failed\n"));
TALLOC_FREE(hdr);