s3-printing: isolate print notification prototypes better.

Guenther

7 files changed, 92 insertions, 63 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 30774c7f18..cd2740f840 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3960,69 +3960,6 @@ bool parse_lpq_entry(enum printing_types printing_type,char *line,
 		     print_status_struct *status,bool first);
 uint32_t print_parse_jobid(const char *fname);
 
-/* The following definitions come from printing/notify.c  */
-
-int print_queue_snum(const char *qname);
-void print_notify_send_messages(struct messaging_context *msg_ctx,
-				unsigned int timeout);
-void notify_printer_status_byname(struct tevent_context *ev,
-				  struct messaging_context *msg_ctx,
-				  const char *sharename, uint32 status);
-void notify_printer_status(struct tevent_context *ev,
-			   struct messaging_context *msg_ctx,
-			   int snum, uint32 status);
-void notify_job_status_byname(struct tevent_context *ev,
-			      struct messaging_context *msg_ctx,
-			      const char *sharename, uint32 jobid,
-			      uint32 status,
-			      uint32 flags);
-void notify_job_status(struct tevent_context *ev,
-		       struct messaging_context *msg_ctx,
-		       const char *sharename, uint32 jobid, uint32 status);
-void notify_job_total_bytes(struct tevent_context *ev,
-			    struct messaging_context *msg_ctx,
-			    const char *sharename, uint32 jobid,
-			    uint32 size);
-void notify_job_total_pages(struct tevent_context *ev,
-			    struct messaging_context *msg_ctx,
-			    const char *sharename, uint32 jobid,
-			    uint32 pages);
-void notify_job_username(struct tevent_context *ev,
-			 struct messaging_context *msg_ctx,
-			 const char *sharename, uint32 jobid, char *name);
-void notify_job_name(struct tevent_context *ev,
-		     struct messaging_context *msg_ctx,
-		     const char *sharename, uint32 jobid, char *name);
-void notify_job_submitted(struct tevent_context *ev,
-			  struct messaging_context *msg_ctx,
-			  const char *sharename, uint32 jobid,
-			  time_t submitted);
-void notify_printer_driver(struct tevent_context *ev,
-			   struct messaging_context *msg_ctx,
-			   int snum, const char *driver_name);
-void notify_printer_comment(struct tevent_context *ev,
-			    struct messaging_context *msg_ctx,
-			    int snum, const char *comment);
-void notify_printer_sharename(struct tevent_context *ev,
-			      struct messaging_context *msg_ctx,
-			      int snum, const char *share_name);
-void notify_printer_printername(struct tevent_context *ev,
-				struct messaging_context *msg_ctx,
-				int snum, const char *printername);
-void notify_printer_port(struct tevent_context *ev,
-			 struct messaging_context *msg_ctx,
-			 int snum, const char *port_name);
-void notify_printer_location(struct tevent_context *ev,
-			     struct messaging_context *msg_ctx,
-			     int snum, const char *location);
-void notify_printer_byname(struct tevent_context *ev,
-			   struct messaging_context *msg_ctx,
-			   const char *printername, uint32 change,
-			   const char *value);
-void notify_printer_sepfile(struct tevent_context *ev,
-			    struct messaging_context *msg_ctx,
-			    int snum, const char *sepfile);
-
 /* The following definitions come from printing/pcap.c  */
 
 void pcap_cache_reload(struct tevent_context *ev,
diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index 84a979e1b2..f1a7e4f928 100644
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -24,6 +24,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "../librpc/gen_ndr/spoolss.h"
 #include "nt_printing.h"
+#include "printing/notify.h"
 
 static TALLOC_CTX *send_ctx;
 
diff --git a/source3/printing/notify.h b/source3/printing/notify.h
new file mode 100644
index 0000000000..f3b9fe4b33
--- /dev/null
+++ b/source3/printing/notify.h
@@ -0,0 +1,87 @@
+#ifndef _PRINTING_NOTIFY_H_
+#define _PRINTING_NOTIFY_H_
+
+/*
+   Unix SMB/Netbios implementation.
+   Version 3.0
+   printing backend routines
+   Copyright (C) Tim Potter, 2002
+   Copyright (C) Gerald Carter,         2002
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* The following definitions come from printing/notify.c  */
+
+int print_queue_snum(const char *qname);
+void print_notify_send_messages(struct messaging_context *msg_ctx,
+				unsigned int timeout);
+void notify_printer_status_byname(struct tevent_context *ev,
+				  struct messaging_context *msg_ctx,
+				  const char *sharename, uint32 status);
+void notify_printer_status(struct tevent_context *ev,
+			   struct messaging_context *msg_ctx,
+			   int snum, uint32 status);
+void notify_job_status_byname(struct tevent_context *ev,
+			      struct messaging_context *msg_ctx,
+			      const char *sharename, uint32 jobid,
+			      uint32 status,
+			      uint32 flags);
+void notify_job_status(struct tevent_context *ev,
+		       struct messaging_context *msg_ctx,
+		       const char *sharename, uint32 jobid, uint32 status);
+void notify_job_total_bytes(struct tevent_context *ev,
+			    struct messaging_context *msg_ctx,
+			    const char *sharename, uint32 jobid,
+			    uint32 size);
+void notify_job_total_pages(struct tevent_context *ev,
+			    struct messaging_context *msg_ctx,
+			    const char *sharename, uint32 jobid,
+			    uint32 pages);
+void notify_job_username(struct tevent_context *ev,
+			 struct messaging_context *msg_ctx,
+			 const char *sharename, uint32 jobid, char *name);
+void notify_job_name(struct tevent_context *ev,
+		     struct messaging_context *msg_ctx,
+		     const char *sharename, uint32 jobid, char *name);
+void notify_job_submitted(struct tevent_context *ev,
+			  struct messaging_context *msg_ctx,
+			  const char *sharename, uint32 jobid,
+			  time_t submitted);
+void notify_printer_driver(struct tevent_context *ev,
+			   struct messaging_context *msg_ctx,
+			   int snum, const char *driver_name);
+void notify_printer_comment(struct tevent_context *ev,
+			    struct messaging_context *msg_ctx,
+			    int snum, const char *comment);
+void notify_printer_sharename(struct tevent_context *ev,
+			      struct messaging_context *msg_ctx,
+			      int snum, const char *share_name);
+void notify_printer_printername(struct tevent_context *ev,
+				struct messaging_context *msg_ctx,
+				int snum, const char *printername);
+void notify_printer_port(struct tevent_context *ev,
+			 struct messaging_context *msg_ctx,
+			 int snum, const char *port_name);
+void notify_printer_location(struct tevent_context *ev,
+			     struct messaging_context *msg_ctx,
+			     int snum, const char *location);
+void notify_printer_byname(struct tevent_context *ev,
+			   struct messaging_context *msg_ctx,
+			   const char *printername, uint32 change,
+			   const char *value);
+void notify_printer_sepfile(struct tevent_context *ev,
+			    struct messaging_context *msg_ctx,
+			    int snum, const char *sepfile);
+#endif
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index ee0a1004e0..0e2655a3f1 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -25,6 +25,7 @@
 #include "../librpc/gen_ndr/ndr_spoolss.h"
 #include "nt_printing.h"
 #include "../librpc/gen_ndr/netlogon.h"
+#include "printing/notify.h"
 
 extern struct current_user current_user;
 extern userdom_struct current_user_info;
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index a303a7a321..8d8dd61176 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -42,6 +42,7 @@
 #include "secrets.h"
 #include "../librpc/gen_ndr/netlogon.h"
 #include "rpc_misc.h"
+#include "printing/notify.h"
 
 /* macros stolen from s4 spoolss server */
 #define SPOOLSS_BUFFER_UNION(fn,info,level) \
diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c
index ca906fad4d..43626ae862 100644
--- a/source3/smbd/server_exit.c
+++ b/source3/smbd/server_exit.c
@@ -40,6 +40,7 @@
 #include "../librpc/gen_ndr/srv_svcctl.h"
 #include "../librpc/gen_ndr/srv_winreg.h"
 #include "../librpc/gen_ndr/srv_wkssvc.h"
+#include "printing/notify.h"
 
 static struct files_struct *log_writeable_file_fn(
 	struct files_struct *fsp, void *private_data)
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index f4daf83088..378534d87a 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "librpc/gen_ndr/spoolss.h"
 #include "nt_printing.h"
+#include "printing/notify.h"
 
 #if HAVE_LIBUNWIND_H
 #include <libunwind.h>