From 25d975e5500243dff4918fe04416695cd3e79a72 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 27 Mar 2001 18:19:01 +0000 Subject: merge from 2.2. (This used to be commit 817258f1174d27d74e8b21ffb5f1384db2238007) --- source3/libsmb/cli_spoolss.c | 6 +-- source3/rpc_parse/parse_spoolss.c | 80 ++++++++++++++++++------------------- source3/rpc_server/srv_spoolss.c | 20 +++++----- source3/rpc_server/srv_spoolss_nt.c | 32 +++++++-------- 4 files changed, 69 insertions(+), 69 deletions(-) diff --git a/source3/libsmb/cli_spoolss.c b/source3/libsmb/cli_spoolss.c index 12abcc1a15..139bd31526 100644 --- a/source3/libsmb/cli_spoolss.c +++ b/source3/libsmb/cli_spoolss.c @@ -424,7 +424,7 @@ uint32 cli_spoolss_enum_printers(struct cli_state *cli, uint32 flags, } /* Unmarshall response */ - if (new_spoolss_io_r_enumprinters("", &r, &rbuf, 0)) { + if (spoolss_io_r_enumprinters("", &r, &rbuf, 0)) { needed = r.needed; } @@ -496,7 +496,7 @@ uint32 cli_spoolss_enum_ports(struct cli_state *cli, uint32 level, } /* Unmarshall response */ - if (new_spoolss_io_r_enumports("", &r, &rbuf, 0)) { + if (spoolss_io_r_enumports("", &r, &rbuf, 0)) { needed = r.needed; } @@ -725,7 +725,7 @@ uint32 cli_spoolss_enumprinterdrivers ( } /* Unmarshall response */ - if (new_spoolss_io_r_enumprinterdrivers ("", &r, &rbuf, 0)) + if (spoolss_io_r_enumprinterdrivers ("", &r, &rbuf, 0)) { needed = r.needed; } diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c index d6987b46aa..53fd586f85 100644 --- a/source3/rpc_parse/parse_spoolss.c +++ b/source3/rpc_parse/parse_spoolss.c @@ -2500,11 +2500,11 @@ BOOL new_smb_io_form_1(char *desc, NEW_BUFFER *buffer, FORM_1 *info, int depth) Read/write a BUFFER struct. ********************************************************************/ -static BOOL new_spoolss_io_buffer(char *desc, prs_struct *ps, int depth, NEW_BUFFER **pp_buffer) +static BOOL spoolss_io_buffer(char *desc, prs_struct *ps, int depth, NEW_BUFFER **pp_buffer) { NEW_BUFFER *buffer = *pp_buffer; - prs_debug(ps, depth, desc, "new_spoolss_io_buffer"); + prs_debug(ps, depth, desc, "spoolss_io_buffer"); depth++; if (UNMARSHALLING(ps)) @@ -2588,7 +2588,7 @@ static BOOL new_spoolss_io_buffer(char *desc, prs_struct *ps, int depth, NEW_BUF this is ok. This is an OPTIMIZATION and is not strictly neccessary. ********************************************************************/ -void new_spoolss_move_buffer(NEW_BUFFER *src, NEW_BUFFER **dest) +void spoolss_move_buffer(NEW_BUFFER *src, NEW_BUFFER **dest) { prs_switch_type(&src->prs, MARSHALL); if(!prs_set_offset(&src->prs, 0)) @@ -3205,7 +3205,7 @@ BOOL spoolss_io_q_getprinterdriver2(char *desc, SPOOL_Q_GETPRINTERDRIVER2 *q_u, if(!prs_uint32("level", ps, depth, &q_u->level)) return False; - if(!new_spoolss_io_buffer("", ps, depth, &q_u->buffer)) + if(!spoolss_io_buffer("", ps, depth, &q_u->buffer)) return False; if(!prs_align(ps)) @@ -3235,7 +3235,7 @@ BOOL spoolss_io_r_getprinterdriver2(char *desc, SPOOL_R_GETPRINTERDRIVER2 *r_u, if (!prs_align(ps)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &r_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &r_u->buffer)) return False; if (!prs_align(ps)) @@ -3316,7 +3316,7 @@ BOOL spoolss_io_q_enumprinters(char *desc, SPOOL_Q_ENUMPRINTERS *q_u, prs_struct if (!prs_uint32("level", ps, depth, &q_u->level)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &q_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &q_u->buffer)) return False; if (!prs_align(ps)) @@ -3331,15 +3331,15 @@ BOOL spoolss_io_q_enumprinters(char *desc, SPOOL_Q_ENUMPRINTERS *q_u, prs_struct Parse a SPOOL_R_ENUMPRINTERS structure. ********************************************************************/ -BOOL new_spoolss_io_r_enumprinters(char *desc, SPOOL_R_ENUMPRINTERS *r_u, prs_struct *ps, int depth) +BOOL spoolss_io_r_enumprinters(char *desc, SPOOL_R_ENUMPRINTERS *r_u, prs_struct *ps, int depth) { - prs_debug(ps, depth, desc, "new_spoolss_io_r_enumprinters"); + prs_debug(ps, depth, desc, "spoolss_io_r_enumprinters"); depth++; if (!prs_align(ps)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &r_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &r_u->buffer)) return False; if (!prs_align(ps)) @@ -3371,7 +3371,7 @@ BOOL spoolss_io_r_getprinter(char *desc, SPOOL_R_GETPRINTER *r_u, prs_struct *ps if (!prs_align(ps)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &r_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &r_u->buffer)) return False; if (!prs_align(ps)) @@ -3404,7 +3404,7 @@ BOOL spoolss_io_q_getprinter(char *desc, SPOOL_Q_GETPRINTER *q_u, prs_struct *ps if (!prs_uint32("level", ps, depth, &q_u->level)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &q_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &q_u->buffer)) return False; if (!prs_align(ps)) @@ -3559,7 +3559,7 @@ BOOL spoolss_io_r_addjob(char *desc, SPOOL_R_ADDJOB *r_u, prs_struct *ps, int de if(!prs_align(ps)) return False; - if(!new_spoolss_io_buffer("", ps, depth, &r_u->buffer)) + if(!spoolss_io_buffer("", ps, depth, &r_u->buffer)) return False; if(!prs_align(ps)) @@ -3590,7 +3590,7 @@ BOOL spoolss_io_q_addjob(char *desc, SPOOL_Q_ADDJOB *q_u, prs_struct *ps, int de if(!prs_uint32("level", ps, depth, &q_u->level)) return False; - if(!new_spoolss_io_buffer("", ps, depth, &q_u->buffer)) + if(!spoolss_io_buffer("", ps, depth, &q_u->buffer)) return False; if(!prs_align(ps)) @@ -3613,7 +3613,7 @@ BOOL spoolss_io_r_enumjobs(char *desc, SPOOL_R_ENUMJOBS *r_u, prs_struct *ps, in if (!prs_align(ps)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &r_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &r_u->buffer)) return False; if (!prs_align(ps)) @@ -3675,7 +3675,7 @@ BOOL spoolss_io_q_enumjobs(char *desc, SPOOL_Q_ENUMJOBS *q_u, prs_struct *ps, in if (!prs_uint32("level", ps, depth, &q_u->level)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &q_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &q_u->buffer)) return False; if (!prs_uint32("offered", ps, depth, &q_u->offered)) @@ -3768,7 +3768,7 @@ BOOL spoolss_io_q_setjob(char *desc, SPOOL_Q_SETJOB *q_u, prs_struct *ps, int de Parse a SPOOL_R_ENUMPRINTERDRIVERS structure. ********************************************************************/ -BOOL new_spoolss_io_r_enumprinterdrivers(char *desc, SPOOL_R_ENUMPRINTERDRIVERS *r_u, prs_struct *ps, int depth) +BOOL spoolss_io_r_enumprinterdrivers(char *desc, SPOOL_R_ENUMPRINTERDRIVERS *r_u, prs_struct *ps, int depth) { prs_debug(ps, depth, desc, "spoolss_io_r_enumprinterdrivers"); depth++; @@ -3776,7 +3776,7 @@ BOOL new_spoolss_io_r_enumprinterdrivers(char *desc, SPOOL_R_ENUMPRINTERDRIVERS if (!prs_align(ps)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &r_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &r_u->buffer)) return False; if (!prs_align(ps)) @@ -3844,7 +3844,7 @@ BOOL spoolss_io_q_enumprinterdrivers(char *desc, SPOOL_Q_ENUMPRINTERDRIVERS *q_u if (!prs_uint32("level", ps, depth, &q_u->level)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &q_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &q_u->buffer)) return False; if (!prs_align(ps)) @@ -3872,7 +3872,7 @@ BOOL spoolss_io_q_enumforms(char *desc, SPOOL_Q_ENUMFORMS *q_u, prs_struct *ps, if (!prs_uint32("level", ps, depth, &q_u->level)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &q_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &q_u->buffer)) return False; if (!prs_align(ps)) @@ -3886,15 +3886,15 @@ BOOL spoolss_io_q_enumforms(char *desc, SPOOL_Q_ENUMFORMS *q_u, prs_struct *ps, /******************************************************************* ********************************************************************/ -BOOL new_spoolss_io_r_enumforms(char *desc, SPOOL_R_ENUMFORMS *r_u, prs_struct *ps, int depth) +BOOL spoolss_io_r_enumforms(char *desc, SPOOL_R_ENUMFORMS *r_u, prs_struct *ps, int depth) { - prs_debug(ps, depth, desc, "new_spoolss_io_r_enumforms"); + prs_debug(ps, depth, desc, "spoolss_io_r_enumforms"); depth++; if (!prs_align(ps)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &r_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &r_u->buffer)) return False; if (!prs_align(ps)) @@ -3934,7 +3934,7 @@ BOOL spoolss_io_q_getform(char *desc, SPOOL_Q_GETFORM *q_u, prs_struct *ps, int if (!prs_uint32("level", ps, depth, &q_u->level)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &q_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &q_u->buffer)) return False; if (!prs_align(ps)) @@ -3948,15 +3948,15 @@ BOOL spoolss_io_q_getform(char *desc, SPOOL_Q_GETFORM *q_u, prs_struct *ps, int /******************************************************************* ********************************************************************/ -BOOL new_spoolss_io_r_getform(char *desc, SPOOL_R_GETFORM *r_u, prs_struct *ps, int depth) +BOOL spoolss_io_r_getform(char *desc, SPOOL_R_GETFORM *r_u, prs_struct *ps, int depth) { - prs_debug(ps, depth, desc, "new_spoolss_io_r_getform"); + prs_debug(ps, depth, desc, "spoolss_io_r_getform"); depth++; if (!prs_align(ps)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &r_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &r_u->buffer)) return False; if (!prs_align(ps)) @@ -3975,15 +3975,15 @@ BOOL new_spoolss_io_r_getform(char *desc, SPOOL_R_GETFORM *r_u, prs_struct *ps, Parse a SPOOL_R_ENUMPORTS structure. ********************************************************************/ -BOOL new_spoolss_io_r_enumports(char *desc, SPOOL_R_ENUMPORTS *r_u, prs_struct *ps, int depth) +BOOL spoolss_io_r_enumports(char *desc, SPOOL_R_ENUMPORTS *r_u, prs_struct *ps, int depth) { - prs_debug(ps, depth, desc, "new_spoolss_io_r_enumports"); + prs_debug(ps, depth, desc, "spoolss_io_r_enumports"); depth++; if (!prs_align(ps)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &r_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &r_u->buffer)) return False; if (!prs_align(ps)) @@ -4022,7 +4022,7 @@ BOOL spoolss_io_q_enumports(char *desc, SPOOL_Q_ENUMPORTS *q_u, prs_struct *ps, if (!prs_uint32("level", ps, depth, &q_u->level)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &q_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &q_u->buffer)) return False; if (!prs_align(ps)) @@ -4976,7 +4976,7 @@ BOOL spoolss_io_q_getprinterdriverdir(char *desc, SPOOL_Q_GETPRINTERDRIVERDIR *q if(!prs_uint32("level", ps, depth, &q_u->level)) return False; - if(!new_spoolss_io_buffer("", ps, depth, &q_u->buffer)) + if(!spoolss_io_buffer("", ps, depth, &q_u->buffer)) return False; if(!prs_align(ps)) @@ -5000,7 +5000,7 @@ BOOL spoolss_io_r_getprinterdriverdir(char *desc, SPOOL_R_GETPRINTERDRIVERDIR *r if (!prs_align(ps)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &r_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &r_u->buffer)) return False; if (!prs_align(ps)) @@ -5026,7 +5026,7 @@ BOOL spoolss_io_r_enumprintprocessors(char *desc, SPOOL_R_ENUMPRINTPROCESSORS *r if (!prs_align(ps)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &r_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &r_u->buffer)) return False; if (!prs_align(ps)) @@ -5074,7 +5074,7 @@ BOOL spoolss_io_q_enumprintprocessors(char *desc, SPOOL_Q_ENUMPRINTPROCESSORS *q if (!prs_uint32("level", ps, depth, &q_u->level)) return False; - if(!new_spoolss_io_buffer("", ps, depth, &q_u->buffer)) + if(!spoolss_io_buffer("", ps, depth, &q_u->buffer)) return False; if (!prs_align(ps)) @@ -5097,7 +5097,7 @@ BOOL spoolss_io_r_enumprintprocdatatypes(char *desc, SPOOL_R_ENUMPRINTPROCDATATY if (!prs_align(ps)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &r_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &r_u->buffer)) return False; if (!prs_align(ps)) @@ -5145,7 +5145,7 @@ BOOL spoolss_io_q_enumprintprocdatatypes(char *desc, SPOOL_Q_ENUMPRINTPROCDATATY if (!prs_uint32("level", ps, depth, &q_u->level)) return False; - if(!new_spoolss_io_buffer("buffer", ps, depth, &q_u->buffer)) + if(!spoolss_io_buffer("buffer", ps, depth, &q_u->buffer)) return False; if (!prs_align(ps)) @@ -5180,7 +5180,7 @@ BOOL spoolss_io_q_enumprintmonitors(char *desc, SPOOL_Q_ENUMPRINTMONITORS *q_u, if (!prs_uint32("level", ps, depth, &q_u->level)) return False; - if(!new_spoolss_io_buffer("", ps, depth, &q_u->buffer)) + if(!spoolss_io_buffer("", ps, depth, &q_u->buffer)) return False; if (!prs_align(ps)) @@ -5203,7 +5203,7 @@ BOOL spoolss_io_r_enumprintmonitors(char *desc, SPOOL_R_ENUMPRINTMONITORS *r_u, if (!prs_align(ps)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &r_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &r_u->buffer)) return False; if (!prs_align(ps)) @@ -5582,7 +5582,7 @@ BOOL spoolss_io_r_getjob(char *desc, SPOOL_R_GETJOB *r_u, prs_struct *ps, int de if (!prs_align(ps)) return False; - if (!new_spoolss_io_buffer("", ps, depth, &r_u->buffer)) + if (!spoolss_io_buffer("", ps, depth, &r_u->buffer)) return False; if (!prs_align(ps)) @@ -5616,7 +5616,7 @@ BOOL spoolss_io_q_getjob(char *desc, SPOOL_Q_GETJOB *q_u, prs_struct *ps, int de if(!prs_uint32("level", ps, depth, &q_u->level)) return False; - if(!new_spoolss_io_buffer("", ps, depth, &q_u->buffer)) + if(!spoolss_io_buffer("", ps, depth, &q_u->buffer)) return False; if(!prs_align(ps)) diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c index e8f855f7f1..ddd8255139 100755 --- a/source3/rpc_server/srv_spoolss.c +++ b/source3/rpc_server/srv_spoolss.c @@ -307,8 +307,8 @@ static BOOL api_spoolss_enumprinters(pipes_struct *p) r_u.status = _spoolss_enumprinters( p, &q_u, &r_u); - if (!new_spoolss_io_r_enumprinters("", &r_u, rdata, 0)) { - DEBUG(0,("new_spoolss_io_r_enumprinters: unable to marshall SPOOL_R_ENUMPRINTERS.\n")); + if (!spoolss_io_r_enumprinters("", &r_u, rdata, 0)) { + DEBUG(0,("spoolss_io_r_enumprinters: unable to marshall SPOOL_R_ENUMPRINTERS.\n")); return False; } @@ -712,7 +712,7 @@ static BOOL api_spoolss_enumprinterdrivers(pipes_struct *p) r_u.status = _spoolss_enumprinterdrivers(p, &q_u, &r_u); - if (!new_spoolss_io_r_enumprinterdrivers("",&r_u,rdata,0)) { + if (!spoolss_io_r_enumprinterdrivers("",&r_u,rdata,0)) { DEBUG(0,("spoolss_io_r_enumprinterdrivers: unable to marshall SPOOL_R_ENUMPRINTERDRIVERS.\n")); return False; } @@ -740,8 +740,8 @@ static BOOL api_spoolss_getform(pipes_struct *p) r_u.status = _spoolss_getform(p, &q_u, &r_u); - if (!new_spoolss_io_r_getform("",&r_u,rdata,0)) { - DEBUG(0,("new_spoolss_io_r_getform: unable to marshall SPOOL_R_GETFORM.\n")); + if (!spoolss_io_r_getform("",&r_u,rdata,0)) { + DEBUG(0,("spoolss_io_r_getform: unable to marshall SPOOL_R_GETFORM.\n")); return False; } @@ -766,10 +766,10 @@ static BOOL api_spoolss_enumforms(pipes_struct *p) return False; } - r_u.status = _new_spoolss_enumforms(p, &q_u, &r_u); + r_u.status = _spoolss_enumforms(p, &q_u, &r_u); - if (!new_spoolss_io_r_enumforms("",&r_u,rdata,0)) { - DEBUG(0,("new_spoolss_io_r_enumforms: unable to marshall SPOOL_R_ENUMFORMS.\n")); + if (!spoolss_io_r_enumforms("",&r_u,rdata,0)) { + DEBUG(0,("spoolss_io_r_enumforms: unable to marshall SPOOL_R_ENUMFORMS.\n")); return False; } @@ -796,8 +796,8 @@ static BOOL api_spoolss_enumports(pipes_struct *p) r_u.status = _spoolss_enumports(p, &q_u, &r_u); - if (!new_spoolss_io_r_enumports("",&r_u,rdata,0)) { - DEBUG(0,("new_spoolss_io_r_enumports: unable to marshall SPOOL_R_ENUMPORTS.\n")); + if (!spoolss_io_r_enumports("",&r_u,rdata,0)) { + DEBUG(0,("spoolss_io_r_enumports: unable to marshall SPOOL_R_ENUMPORTS.\n")); return False; } diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 804fe8a523..5234fa3366 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -3103,7 +3103,7 @@ uint32 _spoolss_enumprinters( pipes_struct *p, SPOOL_Q_ENUMPRINTERS *q_u, SPOOL_ fstring name; /* that's an [in out] buffer */ - new_spoolss_move_buffer(q_u->buffer, &r_u->buffer); + spoolss_move_buffer(q_u->buffer, &r_u->buffer); buffer = r_u->buffer; DEBUG(4,("_spoolss_enumprinters\n")); @@ -3284,7 +3284,7 @@ uint32 _spoolss_getprinter(pipes_struct *p, SPOOL_Q_GETPRINTER *q_u, SPOOL_R_GET int snum; /* that's an [in out] buffer */ - new_spoolss_move_buffer(q_u->buffer, &r_u->buffer); + spoolss_move_buffer(q_u->buffer, &r_u->buffer); buffer = r_u->buffer; *needed=0; @@ -3796,7 +3796,7 @@ uint32 _spoolss_getprinterdriver2(pipes_struct *p, SPOOL_Q_GETPRINTERDRIVER2 *q_ int snum; /* that's an [in out] buffer */ - new_spoolss_move_buffer(q_u->buffer, &r_u->buffer); + spoolss_move_buffer(q_u->buffer, &r_u->buffer); buffer = r_u->buffer; DEBUG(4,("_spoolss_getprinterdriver2\n")); @@ -4631,7 +4631,7 @@ uint32 _spoolss_fcpn(pipes_struct *p, SPOOL_Q_FCPN *q_u, SPOOL_R_FCPN *r_u) uint32 _spoolss_addjob(pipes_struct *p, SPOOL_Q_ADDJOB *q_u, SPOOL_R_ADDJOB *r_u) { /* that's an [in out] buffer (despite appearences to the contrary) */ - new_spoolss_move_buffer(q_u->buffer, &r_u->buffer); + spoolss_move_buffer(q_u->buffer, &r_u->buffer); r_u->needed = 0; return ERROR_INVALID_PARAMETER; /* this is what a NT server @@ -4838,7 +4838,7 @@ uint32 _spoolss_enumjobs( pipes_struct *p, SPOOL_Q_ENUMJOBS *q_u, SPOOL_R_ENUMJO print_status_struct prt_status; /* that's an [in out] buffer */ - new_spoolss_move_buffer(q_u->buffer, &r_u->buffer); + spoolss_move_buffer(q_u->buffer, &r_u->buffer); buffer = r_u->buffer; DEBUG(4,("_spoolss_enumjobs\n")); @@ -5180,7 +5180,7 @@ uint32 _spoolss_enumprinterdrivers( pipes_struct *p, SPOOL_Q_ENUMPRINTERDRIVERS fstring architecture; /* that's an [in out] buffer */ - new_spoolss_move_buffer(q_u->buffer, &r_u->buffer); + spoolss_move_buffer(q_u->buffer, &r_u->buffer); buffer = r_u->buffer; DEBUG(4,("_spoolss_enumprinterdrivers\n")); @@ -5222,7 +5222,7 @@ static void fill_form_1(FORM_1 *form, nt_forms_struct *list) /**************************************************************************** ****************************************************************************/ -uint32 _new_spoolss_enumforms(pipes_struct *p, SPOOL_Q_ENUMFORMS *q_u, SPOOL_R_ENUMFORMS *r_u) +uint32 _spoolss_enumforms(pipes_struct *p, SPOOL_Q_ENUMFORMS *q_u, SPOOL_R_ENUMFORMS *r_u) { /* POLICY_HND *handle = &q_u->handle; - notused. */ uint32 level = q_u->level; @@ -5237,10 +5237,10 @@ uint32 _new_spoolss_enumforms(pipes_struct *p, SPOOL_Q_ENUMFORMS *q_u, SPOOL_R_E int i; /* that's an [in out] buffer */ - new_spoolss_move_buffer(q_u->buffer, &r_u->buffer); + spoolss_move_buffer(q_u->buffer, &r_u->buffer); buffer = r_u->buffer; - DEBUG(4,("_new_spoolss_enumforms\n")); + DEBUG(4,("_spoolss_enumforms\n")); DEBUGADD(5,("Offered buffer size [%d]\n", offered)); DEBUGADD(5,("Info level [%d]\n", level)); @@ -5318,7 +5318,7 @@ uint32 _spoolss_getform(pipes_struct *p, SPOOL_Q_GETFORM *q_u, SPOOL_R_GETFORM * int numofforms, i; /* that's an [in out] buffer */ - new_spoolss_move_buffer(q_u->buffer, &r_u->buffer); + spoolss_move_buffer(q_u->buffer, &r_u->buffer); buffer = r_u->buffer; unistr2_to_ascii(form_name, uni_formname, sizeof(form_name)-1); @@ -5603,7 +5603,7 @@ uint32 _spoolss_enumports( pipes_struct *p, SPOOL_Q_ENUMPORTS *q_u, SPOOL_R_ENUM uint32 *returned = &r_u->returned; /* that's an [in out] buffer */ - new_spoolss_move_buffer(q_u->buffer, &r_u->buffer); + spoolss_move_buffer(q_u->buffer, &r_u->buffer); buffer = r_u->buffer; DEBUG(4,("_spoolss_enumports\n")); @@ -5822,7 +5822,7 @@ uint32 _spoolss_getprinterdriverdirectory(pipes_struct *p, SPOOL_Q_GETPRINTERDRI uint32 *needed = &r_u->needed; /* that's an [in out] buffer */ - new_spoolss_move_buffer(q_u->buffer, &r_u->buffer); + spoolss_move_buffer(q_u->buffer, &r_u->buffer); buffer = r_u->buffer; DEBUG(4,("_spoolss_getprinterdriverdirectory\n")); @@ -6260,7 +6260,7 @@ uint32 _spoolss_enumprintprocessors(pipes_struct *p, SPOOL_Q_ENUMPRINTPROCESSORS uint32 *returned = &r_u->returned; /* that's an [in out] buffer */ - new_spoolss_move_buffer(q_u->buffer, &r_u->buffer); + spoolss_move_buffer(q_u->buffer, &r_u->buffer); buffer = r_u->buffer; DEBUG(5,("spoolss_enumprintprocessors\n")); @@ -6328,7 +6328,7 @@ uint32 _spoolss_enumprintprocdatatypes(pipes_struct *p, SPOOL_Q_ENUMPRINTPROCDAT uint32 *returned = &r_u->returned; /* that's an [in out] buffer */ - new_spoolss_move_buffer(q_u->buffer, &r_u->buffer); + spoolss_move_buffer(q_u->buffer, &r_u->buffer); buffer = r_u->buffer; DEBUG(5,("_spoolss_enumprintprocdatatypes\n")); @@ -6422,7 +6422,7 @@ uint32 _spoolss_enumprintmonitors(pipes_struct *p, SPOOL_Q_ENUMPRINTMONITORS *q_ uint32 *returned = &r_u->returned; /* that's an [in out] buffer */ - new_spoolss_move_buffer(q_u->buffer, &r_u->buffer); + spoolss_move_buffer(q_u->buffer, &r_u->buffer); buffer = r_u->buffer; DEBUG(5,("spoolss_enumprintmonitors\n")); @@ -6572,7 +6572,7 @@ uint32 _spoolss_getjob( pipes_struct *p, SPOOL_Q_GETJOB *q_u, SPOOL_R_GETJOB *r_ print_status_struct prt_status; /* that's an [in out] buffer */ - new_spoolss_move_buffer(q_u->buffer, &r_u->buffer); + spoolss_move_buffer(q_u->buffer, &r_u->buffer); buffer = r_u->buffer; DEBUG(5,("spoolss_getjob\n")); -- cgit