summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-05-14 20:31:28 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:22:04 -0500
commitfad7dd8a60e6637598b17fa89ec92d98db51fffe (patch)
tree23e6622f52c1b25502b6a622d81782dbdd89c0e4 /source3/printing
parent1f073a0319b040b25a16046b9e1b37520109ecb8 (diff)
downloadsamba-fad7dd8a60e6637598b17fa89ec92d98db51fffe.tar.gz
samba-fad7dd8a60e6637598b17fa89ec92d98db51fffe.tar.bz2
samba-fad7dd8a60e6637598b17fa89ec92d98db51fffe.zip
r22868: Replace some message_send_pid calls with messaging_send_pid calls. More
tomorrow. (This used to be commit 74fa57ca5d7fa8eace72bbe948a08a0bca3cc4ca)
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/notify.c18
-rw-r--r--source3/printing/printing.c3
2 files changed, 14 insertions, 7 deletions
diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index 744f7ae990..1285ca23a8 100644
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -116,7 +116,9 @@ again:
Send the batched messages - on a per-printer basis.
*******************************************************************/
-static void print_notify_send_messages_to_printer(const char *printer, unsigned int timeout)
+static void print_notify_send_messages_to_printer(struct messaging_context *msg_ctx,
+ const char *printer,
+ unsigned int timeout)
{
char *buf;
struct notify_queue *pq, *pq_next;
@@ -182,9 +184,11 @@ static void print_notify_send_messages_to_printer(const char *printer, unsigned
printer, q_len ));
continue;
}
- message_send_pid_with_timeout(pid_to_procid(pid_list[i]),
- MSG_PRINTER_NOTIFY2,
- buf, offset, True, timeout);
+ messaging_send_buf_with_timeout(msg_ctx,
+ pid_to_procid(pid_list[i]),
+ MSG_PRINTER_NOTIFY2,
+ (uint8 *)buf, offset,
+ timeout);
}
}
@@ -192,7 +196,8 @@ static void print_notify_send_messages_to_printer(const char *printer, unsigned
Actually send the batched messages.
*******************************************************************/
-void print_notify_send_messages(unsigned int timeout)
+void print_notify_send_messages(struct messaging_context *msg_ctx,
+ unsigned int timeout)
{
if (!print_notify_messages_pending())
return;
@@ -201,7 +206,8 @@ void print_notify_send_messages(unsigned int timeout)
return;
while (print_notify_messages_pending())
- print_notify_send_messages_to_printer(notify_queue_head->msg->printer, timeout);
+ print_notify_send_messages_to_printer(
+ msg_ctx, notify_queue_head->msg->printer, timeout);
talloc_free_children(send_ctx);
num_messages = 0;
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 2e259a8f51..fd1649737b 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -1428,7 +1428,8 @@ void start_background_queue(void)
/* process any pending print change notify messages */
- print_notify_send_messages(0);
+ print_notify_send_messages(smbd_messaging_context(),
+ 0);
}
}
}