Converted more to canonical format... save as I go.,

Jeremy.
(This used to be commit 1d4ff7a81bccce0e5701102314af4f9c64c55cd6)

1 files changed, 8 insertions, 16 deletions

diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c
index 4bd70ca755..d8eaab2714 100755
--- a/source3/rpc_server/srv_spoolss.c
+++ b/source3/rpc_server/srv_spoolss.c
@@ -340,12 +340,12 @@ static BOOL api_spoolss_getprinter(pipes_struct *p)
 	return True;
 }
 
-
 /********************************************************************
  * api_spoolss_getprinter
  * called from the spoolss dispatcher
  *
  ********************************************************************/
+
 static BOOL api_spoolss_getprinterdriver2(pipes_struct *p)
 {
 	SPOOL_Q_GETPRINTERDRIVER2 q_u;
@@ -361,13 +361,7 @@ static BOOL api_spoolss_getprinterdriver2(pipes_struct *p)
 		return False;
 	}
 
-	/* that's an [in out] buffer */
-	new_spoolss_move_buffer(q_u.buffer, &r_u.buffer);
-
-	r_u.status = _spoolss_getprinterdriver2(&q_u.handle, &q_u.architecture, q_u.level, 
-						q_u.clientmajorversion, q_u.clientminorversion,
-						r_u.buffer, q_u.offered,
-						&r_u.needed, &r_u.servermajorversion, &r_u.serverminorversion);
+	r_u.status = _spoolss_getprinterdriver2(p, &q_u, &r_u);
 	
 	if(!spoolss_io_r_getprinterdriver2("",&r_u,rdata,0)) {
 		DEBUG(0,("spoolss_io_r_getprinterdriver2: unable to marshall SPOOL_R_GETPRINTERDRIVER2.\n"));
@@ -382,6 +376,7 @@ static BOOL api_spoolss_getprinterdriver2(pipes_struct *p)
  * called from the spoolss dispatcher
  *
  ********************************************************************/
+
 static BOOL api_spoolss_startpageprinter(pipes_struct *p)
 {
 	SPOOL_Q_STARTPAGEPRINTER q_u;
@@ -397,7 +392,7 @@ static BOOL api_spoolss_startpageprinter(pipes_struct *p)
 		return False;
 	}
 
-	r_u.status = _spoolss_startpageprinter(&q_u.handle);
+	r_u.status = _spoolss_startpageprinter(p, &q_u, &r_u);
 
 	if(!spoolss_io_r_startpageprinter("",&r_u,rdata,0)) {
 		DEBUG(0,("spoolss_io_r_startpageprinter: unable to marshall SPOOL_R_STARTPAGEPRINTER.\n"));
@@ -407,12 +402,12 @@ static BOOL api_spoolss_startpageprinter(pipes_struct *p)
 	return True;
 }
 
-
 /********************************************************************
  * api_spoolss_getprinter
  * called from the spoolss dispatcher
  *
  ********************************************************************/
+
 static BOOL api_spoolss_endpageprinter(pipes_struct *p)
 {
 	SPOOL_Q_ENDPAGEPRINTER q_u;
@@ -428,7 +423,7 @@ static BOOL api_spoolss_endpageprinter(pipes_struct *p)
 		return False;
 	}
 
-	r_u.status = _spoolss_endpageprinter(&q_u.handle);
+	r_u.status = _spoolss_endpageprinter(p, &q_u, &r_u);
 
 	if(!spoolss_io_r_endpageprinter("",&r_u,rdata,0)) {
 		DEBUG(0,("spoolss_io_r_endpageprinter: unable to marshall SPOOL_R_ENDPAGEPRINTER.\n"));
@@ -440,6 +435,7 @@ static BOOL api_spoolss_endpageprinter(pipes_struct *p)
 
 /********************************************************************
 ********************************************************************/
+
 static BOOL api_spoolss_startdocprinter(pipes_struct *p)
 {
 	SPOOL_Q_STARTDOCPRINTER q_u;
@@ -455,10 +451,7 @@ static BOOL api_spoolss_startdocprinter(pipes_struct *p)
 		return False;
 	}
 
-	r_u.status = _spoolss_startdocprinter(&q_u.handle,
-  			          q_u.doc_info_container.level, p,
-	                          &q_u.doc_info_container.docinfo,
-	                          &r_u.jobid);
+	r_u.status = _spoolss_startdocprinter(p, &q_u, &r_u);
 
 	if(!spoolss_io_r_startdocprinter("",&r_u,rdata,0)) {
 		DEBUG(0,("spoolss_io_r_startdocprinter: unable to marshall SPOOL_R_STARTDOCPRINTER.\n"));
@@ -468,7 +461,6 @@ static BOOL api_spoolss_startdocprinter(pipes_struct *p)
 	return True;
 }
 
-
 /********************************************************************
 ********************************************************************/
 static BOOL api_spoolss_enddocprinter(pipes_struct *p)