summaryrefslogtreecommitdiff
path: root/source3/printing
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/printing
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/printing')
-rw-r--r--source3/printing/notify.c8
-rw-r--r--source3/printing/print_cups.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index 9fd73e8707..f9a2ca3b18 100644
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -305,7 +305,7 @@ static void send_spoolss_notify2_msg(struct tevent_context *ev,
/* Store the message on the pending queue. */
- pnqueue = TALLOC_P(send_ctx, struct notify_queue);
+ pnqueue = talloc(send_ctx, struct notify_queue);
if (!pnqueue) {
DEBUG(0,("send_spoolss_notify2_msg: Out of memory.\n"));
return;
@@ -313,7 +313,7 @@ static void send_spoolss_notify2_msg(struct tevent_context *ev,
/* allocate a new msg structure and copy the fields */
- if ( !(pnqueue->msg = TALLOC_P(send_ctx, SPOOLSS_NOTIFY_MSG)) ) {
+ if ( !(pnqueue->msg = talloc(send_ctx, SPOOLSS_NOTIFY_MSG)) ) {
DEBUG(0,("send_spoolss_notify2_msg: talloc() of size [%lu] failed!\n",
(unsigned long)sizeof(SPOOLSS_NOTIFY_MSG)));
return;
@@ -357,7 +357,7 @@ static void send_notify_field_values(struct tevent_context *ev,
if (!create_send_ctx())
return;
- msg = TALLOC_P(send_ctx, struct spoolss_notify_msg);
+ msg = talloc(send_ctx, struct spoolss_notify_msg);
if (!msg)
return;
@@ -388,7 +388,7 @@ static void send_notify_field_buffer(struct tevent_context *ev,
if (!create_send_ctx())
return;
- msg = TALLOC_P(send_ctx, struct spoolss_notify_msg);
+ msg = talloc(send_ctx, struct spoolss_notify_msg);
if (!msg)
return;
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index ff19de200d..b8bbddfebd 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -524,7 +524,7 @@ bool cups_cache_reload(struct tevent_context *ev,
struct cups_async_cb_args *cb_args;
int *p_pipe_fd;
- cb_args = TALLOC_P(NULL, struct cups_async_cb_args);
+ cb_args = talloc(NULL, struct cups_async_cb_args);
if (cb_args == NULL) {
return false;
}