sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-10 12:58:35 +03:00
Code

rename of 16 new_smb_io functions to smb_io_* for consistency sake

Browse Source 
(merge from 2.2)
(This used to be commit ea963a648b889da9e47661c61c7fafe13b277e75)
This commit is contained in:
Gerald Carter 2001-03-28 16:08:00 +00:00
parent 87f8d78fd7
commit 738a83a14f
4 changed files with 165 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source3/include/proto.h
View File

@ -3257,24 +3257,24 @@ BOOL spoolss_io_q_rffpcnex(char *desc, SPOOL_Q_RFFPCNEX *q_u, prs_struct *ps, in
BOOL spoolss_io_r_rffpcnex(char *desc, SPOOL_R_RFFPCNEX *r_u, prs_struct *ps, int depth);
BOOL spoolss_io_q_rfnpcnex(char *desc, SPOOL_Q_RFNPCNEX *q_u, prs_struct *ps, int depth);
BOOL spoolss_io_r_rfnpcnex(char *desc, SPOOL_R_RFNPCNEX *r_u, prs_struct *ps, int depth);
BOOL new_smb_io_printer_info_0(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_0 *info, int depth);
BOOL new_smb_io_printer_info_1(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_1 *info, int depth);
BOOL new_smb_io_printer_info_2(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_2 *info, int depth);
BOOL new_smb_io_printer_info_3(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_3 *info, int depth);
BOOL new_smb_io_port_info_1(char *desc, NEW_BUFFER *buffer, PORT_INFO_1 *info, int depth);
BOOL new_smb_io_port_info_2(char *desc, NEW_BUFFER *buffer, PORT_INFO_2 *info, int depth);
BOOL new_smb_io_printer_driver_info_1(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_1 *info, int depth) ;
BOOL new_smb_io_printer_driver_info_2(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_2 *info, int depth) ;
BOOL new_smb_io_printer_driver_info_3(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_3 *info, int depth);
BOOL new_smb_io_printer_driver_info_6(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_6 *info, int depth);
BOOL new_smb_io_job_info_1(char *desc, NEW_BUFFER *buffer, JOB_INFO_1 *info, int depth);
BOOL new_smb_io_job_info_2(char *desc, NEW_BUFFER *buffer, JOB_INFO_2 *info, int depth);
BOOL new_smb_io_form_1(char *desc, NEW_BUFFER *buffer, FORM_1 *info, int depth);
BOOL smb_io_printer_info_0(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_0 *info, int depth);
BOOL smb_io_printer_info_1(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_1 *info, int depth);
BOOL smb_io_printer_info_2(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_2 *info, int depth);
BOOL smb_io_printer_info_3(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_3 *info, int depth);
BOOL smb_io_port_info_1(char *desc, NEW_BUFFER *buffer, PORT_INFO_1 *info, int depth);
BOOL smb_io_port_info_2(char *desc, NEW_BUFFER *buffer, PORT_INFO_2 *info, int depth);
BOOL smb_io_printer_driver_info_1(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_1 *info, int depth) ;
BOOL smb_io_printer_driver_info_2(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_2 *info, int depth) ;
BOOL smb_io_printer_driver_info_3(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_3 *info, int depth);
BOOL smb_io_printer_driver_info_6(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_6 *info, int depth);
BOOL smb_io_job_info_1(char *desc, NEW_BUFFER *buffer, JOB_INFO_1 *info, int depth);
BOOL smb_io_job_info_2(char *desc, NEW_BUFFER *buffer, JOB_INFO_2 *info, int depth);
BOOL smb_io_form_1(char *desc, NEW_BUFFER *buffer, FORM_1 *info, int depth);
void spoolss_move_buffer(NEW_BUFFER *src, NEW_BUFFER **dest);
uint32 new_get_buffer_size(NEW_BUFFER *buffer);
BOOL new_smb_io_driverdir_1(char *desc, NEW_BUFFER *buffer, DRIVER_DIRECTORY_1 *info, int depth);
BOOL new_smb_io_port_1(char *desc, NEW_BUFFER *buffer, PORT_INFO_1 *info, int depth);
BOOL new_smb_io_port_2(char *desc, NEW_BUFFER *buffer, PORT_INFO_2 *info, int depth);
BOOL smb_io_driverdir_1(char *desc, NEW_BUFFER *buffer, DRIVER_DIRECTORY_1 *info, int depth);
BOOL smb_io_port_1(char *desc, NEW_BUFFER *buffer, PORT_INFO_1 *info, int depth);
BOOL smb_io_port_2(char *desc, NEW_BUFFER *buffer, PORT_INFO_2 *info, int depth);
BOOL smb_io_printprocessor_info_1(char *desc, NEW_BUFFER *buffer, PRINTPROCESSOR_1 *info, int depth);
BOOL smb_io_printprocdatatype_info_1(char *desc, NEW_BUFFER *buffer, PRINTPROCDATATYPE_1 *info, int depth);
BOOL smb_io_printmonitor_info_1(char *desc, NEW_BUFFER *buffer, PRINTMONITOR_1 *info, int depth);

20
source3/libsmb/cli_spoolss.c
View File

@ -212,7 +212,7 @@ static void decode_printer_info_0(NEW_BUFFER *buffer, uint32 returned,
buffer->prs.data_offset=0;
for (i=0; i<returned; i++) {
new_smb_io_printer_info_0("", buffer, &inf[i], 0);
smb_io_printer_info_0("", buffer, &inf[i], 0);
}
*info=inf;
@ -229,7 +229,7 @@ static void decode_printer_info_1(NEW_BUFFER *buffer, uint32 returned,
buffer->prs.data_offset=0;
for (i=0; i<returned; i++) {
new_smb_io_printer_info_1("", buffer, &inf[i], 0);
smb_io_printer_info_1("", buffer, &inf[i], 0);
}
*info=inf;
@ -248,7 +248,7 @@ static void decode_printer_info_2(NEW_BUFFER *buffer, uint32 returned,
for (i=0; i<returned; i++) {
/* a little initialization as we go */
inf[i].secdesc = NULL;
new_smb_io_printer_info_2("", buffer, &inf[i], 0);
smb_io_printer_info_2("", buffer, &inf[i], 0);
}
*info=inf;
@ -266,7 +266,7 @@ static void decode_printer_info_3(NEW_BUFFER *buffer, uint32 returned,
for (i=0; i<returned; i++) {
inf[i].secdesc = NULL;
new_smb_io_printer_info_3("", buffer, &inf[i], 0);
smb_io_printer_info_3("", buffer, &inf[i], 0);
}
*info=inf;
@ -286,7 +286,7 @@ static void decode_port_info_1(NEW_BUFFER *buffer, uint32 returned,
prs_set_offset(&buffer->prs, 0);
for (i=0; i<returned; i++) {
new_smb_io_port_info_1("", buffer, &(inf[i]), 0);
smb_io_port_info_1("", buffer, &(inf[i]), 0);
}
*info=inf;
@ -306,7 +306,7 @@ static void decode_port_info_2(NEW_BUFFER *buffer, uint32 returned,
prs_set_offset(&buffer->prs, 0);
for (i=0; i<returned; i++) {
new_smb_io_port_info_2("", buffer, &(inf[i]), 0);
smb_io_port_info_2("", buffer, &(inf[i]), 0);
}
*info=inf;
@ -323,7 +323,7 @@ static void decode_printer_driver_1(NEW_BUFFER *buffer, uint32 returned,
buffer->prs.data_offset=0;
for (i=0; i<returned; i++) {
new_smb_io_printer_driver_info_1("", buffer, &(inf[i]), 0);
smb_io_printer_driver_info_1("", buffer, &(inf[i]), 0);
}
*info=inf;
@ -340,7 +340,7 @@ static void decode_printer_driver_2(NEW_BUFFER *buffer, uint32 returned,
buffer->prs.data_offset=0;
for (i=0; i<returned; i++) {
new_smb_io_printer_driver_info_2("", buffer, &(inf[i]), 0);
smb_io_printer_driver_info_2("", buffer, &(inf[i]), 0);
}
*info=inf;
@ -360,7 +360,7 @@ static void decode_printer_driver_3(
buffer->prs.data_offset=0;
for (i=0; i<returned; i++) {
new_smb_io_printer_driver_info_3("", buffer, &(inf[i]), 0);
smb_io_printer_driver_info_3("", buffer, &(inf[i]), 0);
}
*info=inf;
@ -378,7 +378,7 @@ static void decode_printerdriverdir_1 (
prs_set_offset(&buffer->prs, 0);
new_smb_io_driverdir_1("", buffer, inf, 0);
smb_io_driverdir_1("", buffer, inf, 0);
*info=inf;
}

232
source3/rpc_parse/parse_spoolss.c
View File

@ -1638,7 +1638,7 @@ static BOOL spoolss_smb_io_unistr(char *desc, UNISTR *uni, prs_struct *ps, int d
*
********************************************************************/
static BOOL new_smb_io_relstr(char *desc, NEW_BUFFER *buffer, int depth, UNISTR *string)
static BOOL smb_io_relstr(char *desc, NEW_BUFFER *buffer, int depth, UNISTR *string)
{
prs_struct *ps=&buffer->prs;
@ -1691,7 +1691,7 @@ static BOOL new_smb_io_relstr(char *desc, NEW_BUFFER *buffer, int depth, UNISTR
* used by 2 RPC structs
********************************************************************/
static BOOL new_smb_io_relarraystr(char *desc, NEW_BUFFER *buffer, int depth, uint16 **string)
static BOOL smb_io_relarraystr(char *desc, NEW_BUFFER *buffer, int depth, uint16 **string)
{
UNISTR chaine;
@ -1814,11 +1814,11 @@ static BOOL new_smb_io_relarraystr(char *desc, NEW_BUFFER *buffer, int depth, ui
Parse a DEVMODE structure and its relative pointer.
********************************************************************/
static BOOL new_smb_io_relsecdesc(char *desc, NEW_BUFFER *buffer, int depth, SEC_DESC **secdesc)
static BOOL smb_io_relsecdesc(char *desc, NEW_BUFFER *buffer, int depth, SEC_DESC **secdesc)
{
prs_struct *ps= &buffer->prs;
prs_debug(ps, depth, desc, "new_smb_io_relsecdesc");
prs_debug(ps, depth, desc, "smb_io_relsecdesc");
depth++;
if (MARSHALLING(ps)) {
@ -1875,11 +1875,11 @@ static BOOL new_smb_io_relsecdesc(char *desc, NEW_BUFFER *buffer, int depth, SEC
Parse a DEVMODE structure and its relative pointer.
********************************************************************/
static BOOL new_smb_io_reldevmode(char *desc, NEW_BUFFER *buffer, int depth, DEVICEMODE **devmode)
static BOOL smb_io_reldevmode(char *desc, NEW_BUFFER *buffer, int depth, DEVICEMODE **devmode)
{
prs_struct *ps=&buffer->prs;
prs_debug(ps, depth, desc, "new_smb_io_reldevmode");
prs_debug(ps, depth, desc, "smb_io_reldevmode");
depth++;
if (MARSHALLING(ps)) {
@ -1939,7 +1939,7 @@ static BOOL new_smb_io_reldevmode(char *desc, NEW_BUFFER *buffer, int depth, DEV
Parse a PRINTER_INFO_0 structure.
********************************************************************/
BOOL new_smb_io_printer_info_0(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_0 *info, int depth)
BOOL smb_io_printer_info_0(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_0 *info, int depth)
{
prs_struct *ps=&buffer->prs;
@ -1948,9 +1948,9 @@ BOOL new_smb_io_printer_info_0(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_0 *i
buffer->struct_start=prs_offset(ps);
if (!new_smb_io_relstr("printername", buffer, depth, &info->printername))
if (!smb_io_relstr("printername", buffer, depth, &info->printername))
return False;
if (!new_smb_io_relstr("servername", buffer, depth, &info->servername))
if (!smb_io_relstr("servername", buffer, depth, &info->servername))
return False;
if(!prs_uint32("cjobs", ps, depth, &info->cjobs))
@ -2040,22 +2040,22 @@ BOOL new_smb_io_printer_info_0(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_0 *i
Parse a PRINTER_INFO_1 structure.
********************************************************************/
BOOL new_smb_io_printer_info_1(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_1 *info, int depth)
BOOL smb_io_printer_info_1(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_1 *info, int depth)
{
prs_struct *ps=&buffer->prs;
prs_debug(ps, depth, desc, "new_smb_io_printer_info_1");
prs_debug(ps, depth, desc, "smb_io_printer_info_1");
depth++;
buffer->struct_start=prs_offset(ps);
if (!prs_uint32("flags", ps, depth, &info->flags))
return False;
if (!new_smb_io_relstr("description", buffer, depth, &info->description))
if (!smb_io_relstr("description", buffer, depth, &info->description))
return False;
if (!new_smb_io_relstr("name", buffer, depth, &info->name))
if (!smb_io_relstr("name", buffer, depth, &info->name))
return False;
if (!new_smb_io_relstr("comment", buffer, depth, &info->comment))
if (!smb_io_relstr("comment", buffer, depth, &info->comment))
return False;
return True;
@ -2065,44 +2065,44 @@ BOOL new_smb_io_printer_info_1(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_1 *i
Parse a PRINTER_INFO_2 structure.
********************************************************************/
BOOL new_smb_io_printer_info_2(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_2 *info, int depth)
BOOL smb_io_printer_info_2(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_2 *info, int depth)
{
prs_struct *ps=&buffer->prs;
prs_debug(ps, depth, desc, "new_smb_io_printer_info_2");
prs_debug(ps, depth, desc, "smb_io_printer_info_2");
depth++;
buffer->struct_start=prs_offset(ps);
if (!new_smb_io_relstr("servername", buffer, depth, &info->servername))
if (!smb_io_relstr("servername", buffer, depth, &info->servername))
return False;
if (!new_smb_io_relstr("printername", buffer, depth, &info->printername))
if (!smb_io_relstr("printername", buffer, depth, &info->printername))
return False;
if (!new_smb_io_relstr("sharename", buffer, depth, &info->sharename))
if (!smb_io_relstr("sharename", buffer, depth, &info->sharename))
return False;
if (!new_smb_io_relstr("portname", buffer, depth, &info->portname))
if (!smb_io_relstr("portname", buffer, depth, &info->portname))
return False;
if (!new_smb_io_relstr("drivername", buffer, depth, &info->drivername))
if (!smb_io_relstr("drivername", buffer, depth, &info->drivername))
return False;
if (!new_smb_io_relstr("comment", buffer, depth, &info->comment))
if (!smb_io_relstr("comment", buffer, depth, &info->comment))
return False;
if (!new_smb_io_relstr("location", buffer, depth, &info->location))
if (!smb_io_relstr("location", buffer, depth, &info->location))
return False;
/* NT parses the DEVMODE at the end of the struct */
if (!new_smb_io_reldevmode("devmode", buffer, depth, &info->devmode))
if (!smb_io_reldevmode("devmode", buffer, depth, &info->devmode))
return False;
if (!new_smb_io_relstr("sepfile", buffer, depth, &info->sepfile))
if (!smb_io_relstr("sepfile", buffer, depth, &info->sepfile))
return False;
if (!new_smb_io_relstr("printprocessor", buffer, depth, &info->printprocessor))
if (!smb_io_relstr("printprocessor", buffer, depth, &info->printprocessor))
return False;
if (!new_smb_io_relstr("datatype", buffer, depth, &info->datatype))
if (!smb_io_relstr("datatype", buffer, depth, &info->datatype))
return False;
if (!new_smb_io_relstr("parameters", buffer, depth, &info->parameters))
if (!smb_io_relstr("parameters", buffer, depth, &info->parameters))
return False;
if (!new_smb_io_relsecdesc("secdesc", buffer, depth, &info->secdesc))
if (!smb_io_relsecdesc("secdesc", buffer, depth, &info->secdesc))
return False;
if (!prs_uint32("attributes", ps, depth, &info->attributes))
@ -2136,11 +2136,11 @@ BOOL new_smb_io_printer_info_2(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_2 *i
Parse a PRINTER_INFO_3 structure.
********************************************************************/
BOOL new_smb_io_printer_info_3(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_3 *info, int depth)
BOOL smb_io_printer_info_3(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_3 *info, int depth)
{
prs_struct *ps=&buffer->prs;
prs_debug(ps, depth, desc, "new_smb_io_printer_info_3");
prs_debug(ps, depth, desc, "smb_io_printer_info_3");
depth++;
buffer->struct_start=prs_offset(ps);
@ -2157,16 +2157,16 @@ BOOL new_smb_io_printer_info_3(char *desc, NEW_BUFFER *buffer, PRINTER_INFO_3 *i
Parse a PORT_INFO_1 structure.
********************************************************************/
BOOL new_smb_io_port_info_1(char *desc, NEW_BUFFER *buffer, PORT_INFO_1 *info, int depth)
BOOL smb_io_port_info_1(char *desc, NEW_BUFFER *buffer, PORT_INFO_1 *info, int depth)
{
prs_struct *ps=&buffer->prs;
prs_debug(ps, depth, desc, "new_smb_io_port_info_1");
prs_debug(ps, depth, desc, "smb_io_port_info_1");
depth++;
buffer->struct_start=prs_offset(ps);
if (!new_smb_io_relstr("port_name", buffer, depth, &info->port_name))
if (!smb_io_relstr("port_name", buffer, depth, &info->port_name))
return False;
return True;
@ -2176,20 +2176,20 @@ BOOL new_smb_io_port_info_1(char *desc, NEW_BUFFER *buffer, PORT_INFO_1 *info, i
Parse a PORT_INFO_2 structure.
********************************************************************/
BOOL new_smb_io_port_info_2(char *desc, NEW_BUFFER *buffer, PORT_INFO_2 *info, int depth)
BOOL smb_io_port_info_2(char *desc, NEW_BUFFER *buffer, PORT_INFO_2 *info, int depth)
{
prs_struct *ps=&buffer->prs;
prs_debug(ps, depth, desc, "new_smb_io_port_info_2");
prs_debug(ps, depth, desc, "smb_io_port_info_2");
depth++;
buffer->struct_start=prs_offset(ps);
if (!new_smb_io_relstr("port_name", buffer, depth, &info->port_name))
if (!smb_io_relstr("port_name", buffer, depth, &info->port_name))
return False;
if (!new_smb_io_relstr("monitor_name", buffer, depth, &info->monitor_name))
if (!smb_io_relstr("monitor_name", buffer, depth, &info->monitor_name))
return False;
if (!new_smb_io_relstr("description", buffer, depth, &info->description))
if (!smb_io_relstr("description", buffer, depth, &info->description))
return False;
if (!prs_uint32("port_type", ps, depth, &info->port_type))
return False;
@ -2203,16 +2203,16 @@ BOOL new_smb_io_port_info_2(char *desc, NEW_BUFFER *buffer, PORT_INFO_2 *info, i
Parse a DRIVER_INFO_1 structure.
********************************************************************/
BOOL new_smb_io_printer_driver_info_1(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_1 *info, int depth)
BOOL smb_io_printer_driver_info_1(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_1 *info, int depth)
{
prs_struct *ps=&buffer->prs;
prs_debug(ps, depth, desc, "new_smb_io_printer_driver_info_1");
prs_debug(ps, depth, desc, "smb_io_printer_driver_info_1");
depth++;
buffer->struct_start=prs_offset(ps);
if (!new_smb_io_relstr("name", buffer, depth, &info->name))
if (!smb_io_relstr("name", buffer, depth, &info->name))
return False;
return True;
@ -2222,26 +2222,26 @@ BOOL new_smb_io_printer_driver_info_1(char *desc, NEW_BUFFER *buffer, DRIVER_INF
Parse a DRIVER_INFO_2 structure.
********************************************************************/
BOOL new_smb_io_printer_driver_info_2(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_2 *info, int depth)
BOOL smb_io_printer_driver_info_2(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_2 *info, int depth)
{
prs_struct *ps=&buffer->prs;
prs_debug(ps, depth, desc, "new_smb_io_printer_driver_info_2");
prs_debug(ps, depth, desc, "smb_io_printer_driver_info_2");
depth++;
buffer->struct_start=prs_offset(ps);
if (!prs_uint32("version", ps, depth, &info->version))
return False;
if (!new_smb_io_relstr("name", buffer, depth, &info->name))
if (!smb_io_relstr("name", buffer, depth, &info->name))
return False;
if (!new_smb_io_relstr("architecture", buffer, depth, &info->architecture))
if (!smb_io_relstr("architecture", buffer, depth, &info->architecture))
return False;
if (!new_smb_io_relstr("driverpath", buffer, depth, &info->driverpath))
if (!smb_io_relstr("driverpath", buffer, depth, &info->driverpath))
return False;
if (!new_smb_io_relstr("datafile", buffer, depth, &info->datafile))
if (!smb_io_relstr("datafile", buffer, depth, &info->datafile))
return False;
if (!new_smb_io_relstr("configfile", buffer, depth, &info->configfile))
if (!smb_io_relstr("configfile", buffer, depth, &info->configfile))
return False;
return True;
@ -2251,36 +2251,36 @@ BOOL new_smb_io_printer_driver_info_2(char *desc, NEW_BUFFER *buffer, DRIVER_INF
Parse a DRIVER_INFO_3 structure.
********************************************************************/
BOOL new_smb_io_printer_driver_info_3(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_3 *info, int depth)
BOOL smb_io_printer_driver_info_3(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_3 *info, int depth)
{
prs_struct *ps=&buffer->prs;
prs_debug(ps, depth, desc, "new_smb_io_printer_driver_info_3");
prs_debug(ps, depth, desc, "smb_io_printer_driver_info_3");
depth++;
buffer->struct_start=prs_offset(ps);
if (!prs_uint32("version", ps, depth, &info->version))
return False;
if (!new_smb_io_relstr("name", buffer, depth, &info->name))
if (!smb_io_relstr("name", buffer, depth, &info->name))
return False;
if (!new_smb_io_relstr("architecture", buffer, depth, &info->architecture))
if (!smb_io_relstr("architecture", buffer, depth, &info->architecture))
return False;
if (!new_smb_io_relstr("driverpath", buffer, depth, &info->driverpath))
if (!smb_io_relstr("driverpath", buffer, depth, &info->driverpath))
return False;
if (!new_smb_io_relstr("datafile", buffer, depth, &info->datafile))
if (!smb_io_relstr("datafile", buffer, depth, &info->datafile))
return False;
if (!new_smb_io_relstr("configfile", buffer, depth, &info->configfile))
if (!smb_io_relstr("configfile", buffer, depth, &info->configfile))
return False;
if (!new_smb_io_relstr("helpfile", buffer, depth, &info->helpfile))
if (!smb_io_relstr("helpfile", buffer, depth, &info->helpfile))
return False;
if (!new_smb_io_relarraystr("dependentfiles", buffer, depth, &info->dependentfiles))
if (!smb_io_relarraystr("dependentfiles", buffer, depth, &info->dependentfiles))
return False;
if (!new_smb_io_relstr("monitorname", buffer, depth, &info->monitorname))
if (!smb_io_relstr("monitorname", buffer, depth, &info->monitorname))
return False;
if (!new_smb_io_relstr("defaultdatatype", buffer, depth, &info->defaultdatatype))
if (!smb_io_relstr("defaultdatatype", buffer, depth, &info->defaultdatatype))
return False;
return True;
@ -2290,39 +2290,39 @@ BOOL new_smb_io_printer_driver_info_3(char *desc, NEW_BUFFER *buffer, DRIVER_INF
Parse a DRIVER_INFO_6 structure.
********************************************************************/
BOOL new_smb_io_printer_driver_info_6(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_6 *info, int depth)
BOOL smb_io_printer_driver_info_6(char *desc, NEW_BUFFER *buffer, DRIVER_INFO_6 *info, int depth)
{
prs_struct *ps=&buffer->prs;
prs_debug(ps, depth, desc, "new_smb_io_printer_driver_info_6");
prs_debug(ps, depth, desc, "smb_io_printer_driver_info_6");
depth++;
buffer->struct_start=prs_offset(ps);
if (!prs_uint32("version", ps, depth, &info->version))
return False;
if (!new_smb_io_relstr("name", buffer, depth, &info->name))
if (!smb_io_relstr("name", buffer, depth, &info->name))
return False;
if (!new_smb_io_relstr("architecture", buffer, depth, &info->architecture))
if (!smb_io_relstr("architecture", buffer, depth, &info->architecture))
return False;
if (!new_smb_io_relstr("driverpath", buffer, depth, &info->driverpath))
if (!smb_io_relstr("driverpath", buffer, depth, &info->driverpath))
return False;
if (!new_smb_io_relstr("datafile", buffer, depth, &info->datafile))
if (!smb_io_relstr("datafile", buffer, depth, &info->datafile))
return False;
if (!new_smb_io_relstr("configfile", buffer, depth, &info->configfile))
if (!smb_io_relstr("configfile", buffer, depth, &info->configfile))
return False;
if (!new_smb_io_relstr("helpfile", buffer, depth, &info->helpfile))
if (!smb_io_relstr("helpfile", buffer, depth, &info->helpfile))
return False;
if (!new_smb_io_relarraystr("dependentfiles", buffer, depth, &info->dependentfiles))
if (!smb_io_relarraystr("dependentfiles", buffer, depth, &info->dependentfiles))
return False;
if (!new_smb_io_relstr("monitorname", buffer, depth, &info->monitorname))
if (!smb_io_relstr("monitorname", buffer, depth, &info->monitorname))
return False;
if (!new_smb_io_relstr("defaultdatatype", buffer, depth, &info->defaultdatatype))
if (!smb_io_relstr("defaultdatatype", buffer, depth, &info->defaultdatatype))
return False;
if (!new_smb_io_relarraystr("previousdrivernames", buffer, depth, &info->previousdrivernames))
if (!smb_io_relarraystr("previousdrivernames", buffer, depth, &info->previousdrivernames))
return False;
if (!prs_uint32("date.low", ps, depth, &info->driver_date.low))
@ -2339,13 +2339,13 @@ BOOL new_smb_io_printer_driver_info_6(char *desc, NEW_BUFFER *buffer, DRIVER_INF
if (!prs_uint32("driver_version_high", ps, depth, &info->driver_version_high))
return False;
if (!new_smb_io_relstr("mfgname", buffer, depth, &info->mfgname))
if (!smb_io_relstr("mfgname", buffer, depth, &info->mfgname))
return False;
if (!new_smb_io_relstr("oem_url", buffer, depth, &info->oem_url))
if (!smb_io_relstr("oem_url", buffer, depth, &info->oem_url))
return False;
if (!new_smb_io_relstr("hardware_id", buffer, depth, &info->hardware_id))
if (!smb_io_relstr("hardware_id", buffer, depth, &info->hardware_id))
return False;
if (!new_smb_io_relstr("provider", buffer, depth, &info->provider))
if (!smb_io_relstr("provider", buffer, depth, &info->provider))
return False;
return True;
@ -2355,28 +2355,28 @@ BOOL new_smb_io_printer_driver_info_6(char *desc, NEW_BUFFER *buffer, DRIVER_INF
Parse a JOB_INFO_1 structure.
********************************************************************/
BOOL new_smb_io_job_info_1(char *desc, NEW_BUFFER *buffer, JOB_INFO_1 *info, int depth)
BOOL smb_io_job_info_1(char *desc, NEW_BUFFER *buffer, JOB_INFO_1 *info, int depth)
{
prs_struct *ps=&buffer->prs;
prs_debug(ps, depth, desc, "new_smb_io_job_info_1");
prs_debug(ps, depth, desc, "smb_io_job_info_1");
depth++;
buffer->struct_start=prs_offset(ps);
if (!prs_uint32("jobid", ps, depth, &info->jobid))
return False;
if (!new_smb_io_relstr("printername", buffer, depth, &info->printername))
if (!smb_io_relstr("printername", buffer, depth, &info->printername))
return False;
if (!new_smb_io_relstr("machinename", buffer, depth, &info->machinename))
if (!smb_io_relstr("machinename", buffer, depth, &info->machinename))
return False;
if (!new_smb_io_relstr("username", buffer, depth, &info->username))
if (!smb_io_relstr("username", buffer, depth, &info->username))
return False;
if (!new_smb_io_relstr("document", buffer, depth, &info->document))
if (!smb_io_relstr("document", buffer, depth, &info->document))
return False;
if (!new_smb_io_relstr("datatype", buffer, depth, &info->datatype))
if (!smb_io_relstr("datatype", buffer, depth, &info->datatype))
return False;
if (!new_smb_io_relstr("text_status", buffer, depth, &info->text_status))
if (!smb_io_relstr("text_status", buffer, depth, &info->text_status))
return False;
if (!prs_uint32("status", ps, depth, &info->status))
return False;
@ -2398,40 +2398,40 @@ BOOL new_smb_io_job_info_1(char *desc, NEW_BUFFER *buffer, JOB_INFO_1 *info, int
Parse a JOB_INFO_2 structure.
********************************************************************/
BOOL new_smb_io_job_info_2(char *desc, NEW_BUFFER *buffer, JOB_INFO_2 *info, int depth)
BOOL smb_io_job_info_2(char *desc, NEW_BUFFER *buffer, JOB_INFO_2 *info, int depth)
{
uint pipo=0;
prs_struct *ps=&buffer->prs;
prs_debug(ps, depth, desc, "new_smb_io_job_info_2");
prs_debug(ps, depth, desc, "smb_io_job_info_2");
depth++;
buffer->struct_start=prs_offset(ps);
if (!prs_uint32("jobid",ps, depth, &info->jobid))
return False;
if (!new_smb_io_relstr("printername", buffer, depth, &info->printername))
if (!smb_io_relstr("printername", buffer, depth, &info->printername))
return False;
if (!new_smb_io_relstr("machinename", buffer, depth, &info->machinename))
if (!smb_io_relstr("machinename", buffer, depth, &info->machinename))
return False;
if (!new_smb_io_relstr("username", buffer, depth, &info->username))
if (!smb_io_relstr("username", buffer, depth, &info->username))
return False;
if (!new_smb_io_relstr("document", buffer, depth, &info->document))
if (!smb_io_relstr("document", buffer, depth, &info->document))
return False;
if (!new_smb_io_relstr("notifyname", buffer, depth, &info->notifyname))
if (!smb_io_relstr("notifyname", buffer, depth, &info->notifyname))
return False;
if (!new_smb_io_relstr("datatype", buffer, depth, &info->datatype))
if (!smb_io_relstr("datatype", buffer, depth, &info->datatype))
return False;
if (!new_smb_io_relstr("printprocessor", buffer, depth, &info->printprocessor))
if (!smb_io_relstr("printprocessor", buffer, depth, &info->printprocessor))
return False;
if (!new_smb_io_relstr("parameters", buffer, depth, &info->parameters))
if (!smb_io_relstr("parameters", buffer, depth, &info->parameters))
return False;
if (!new_smb_io_relstr("drivername", buffer, depth, &info->drivername))
if (!smb_io_relstr("drivername", buffer, depth, &info->drivername))
return False;
if (!new_smb_io_reldevmode("devmode", buffer, depth, &info->devmode))
if (!smb_io_reldevmode("devmode", buffer, depth, &info->devmode))
return False;
if (!new_smb_io_relstr("text_status", buffer, depth, &info->text_status))
if (!smb_io_relstr("text_status", buffer, depth, &info->text_status))
return False;
/* SEC_DESC sec_desc;*/
@ -2465,11 +2465,11 @@ BOOL new_smb_io_job_info_2(char *desc, NEW_BUFFER *buffer, JOB_INFO_2 *info, int
/*******************************************************************
********************************************************************/
BOOL new_smb_io_form_1(char *desc, NEW_BUFFER *buffer, FORM_1 *info, int depth)
BOOL smb_io_form_1(char *desc, NEW_BUFFER *buffer, FORM_1 *info, int depth)
{
prs_struct *ps=&buffer->prs;
prs_debug(ps, depth, desc, "new_smb_io_form_1");
prs_debug(ps, depth, desc, "smb_io_form_1");
depth++;
buffer->struct_start=prs_offset(ps);
@ -2477,7 +2477,7 @@ BOOL new_smb_io_form_1(char *desc, NEW_BUFFER *buffer, FORM_1 *info, int depth)
if (!prs_uint32("flag", ps, depth, &info->flag))
return False;
if (!new_smb_io_relstr("name", buffer, depth, &info->name))
if (!smb_io_relstr("name", buffer, depth, &info->name))
return False;
if (!prs_uint32("width", ps, depth, &info->width))
@ -2611,11 +2611,11 @@ uint32 new_get_buffer_size(NEW_BUFFER *buffer)
Parse a DRIVER_DIRECTORY_1 structure.
********************************************************************/
BOOL new_smb_io_driverdir_1(char *desc, NEW_BUFFER *buffer, DRIVER_DIRECTORY_1 *info, int depth)
BOOL smb_io_driverdir_1(char *desc, NEW_BUFFER *buffer, DRIVER_DIRECTORY_1 *info, int depth)
{
prs_struct *ps=&buffer->prs;
prs_debug(ps, depth, desc, "new_smb_io_driverdir_1");
prs_debug(ps, depth, desc, "smb_io_driverdir_1");
depth++;
buffer->struct_start=prs_offset(ps);
@ -2630,16 +2630,16 @@ BOOL new_smb_io_driverdir_1(char *desc, NEW_BUFFER *buffer, DRIVER_DIRECTORY_1 *
Parse a PORT_INFO_1 structure.
********************************************************************/
BOOL new_smb_io_port_1(char *desc, NEW_BUFFER *buffer, PORT_INFO_1 *info, int depth)
BOOL smb_io_port_1(char *desc, NEW_BUFFER *buffer, PORT_INFO_1 *info, int depth)
{
prs_struct *ps=&buffer->prs;
prs_debug(ps, depth, desc, "new_smb_io_port_1");
prs_debug(ps, depth, desc, "smb_io_port_1");
depth++;
buffer->struct_start=prs_offset(ps);
if(!new_smb_io_relstr("port_name", buffer, depth, &info->port_name))
if(!smb_io_relstr("port_name", buffer, depth, &info->port_name))
return False;
return True;
@ -2649,20 +2649,20 @@ BOOL new_smb_io_port_1(char *desc, NEW_BUFFER *buffer, PORT_INFO_1 *info, int de
Parse a PORT_INFO_2 structure.
********************************************************************/
BOOL new_smb_io_port_2(char *desc, NEW_BUFFER *buffer, PORT_INFO_2 *info, int depth)
BOOL smb_io_port_2(char *desc, NEW_BUFFER *buffer, PORT_INFO_2 *info, int depth)
{
prs_struct *ps=&buffer->prs;
prs_debug(ps, depth, desc, "new_smb_io_port_2");
prs_debug(ps, depth, desc, "smb_io_port_2");
depth++;
buffer->struct_start=prs_offset(ps);
if(!new_smb_io_relstr("port_name", buffer, depth, &info->port_name))
if(!smb_io_relstr("port_name", buffer, depth, &info->port_name))
return False;
if(!new_smb_io_relstr("monitor_name", buffer, depth, &info->monitor_name))
if(!smb_io_relstr("monitor_name", buffer, depth, &info->monitor_name))
return False;
if(!new_smb_io_relstr("description", buffer, depth, &info->description))
if(!smb_io_relstr("description", buffer, depth, &info->description))
return False;
if(!prs_uint32("port_type", ps, depth, &info->port_type))
return False;
@ -2684,7 +2684,7 @@ BOOL smb_io_printprocessor_info_1(char *desc, NEW_BUFFER *buffer, PRINTPROCESSOR
buffer->struct_start=prs_offset(ps);
if (new_smb_io_relstr("name", buffer, depth, &info->name))
if (smb_io_relstr("name", buffer, depth, &info->name))
return False;
return True;
@ -2702,7 +2702,7 @@ BOOL smb_io_printprocdatatype_info_1(char *desc, NEW_BUFFER *buffer, PRINTPROCDA
buffer->struct_start=prs_offset(ps);
if (new_smb_io_relstr("name", buffer, depth, &info->name))
if (smb_io_relstr("name", buffer, depth, &info->name))
return False;
return True;
@ -2720,7 +2720,7 @@ BOOL smb_io_printmonitor_info_1(char *desc, NEW_BUFFER *buffer, PRINTMONITOR_1 *
buffer->struct_start=prs_offset(ps);
if (!new_smb_io_relstr("name", buffer, depth, &info->name))
if (!smb_io_relstr("name", buffer, depth, &info->name))
return False;
return True;
@ -2738,11 +2738,11 @@ BOOL smb_io_printmonitor_info_2(char *desc, NEW_BUFFER *buffer, PRINTMONITOR_2 *
buffer->struct_start=prs_offset(ps);
if (!new_smb_io_relstr("name", buffer, depth, &info->name))
if (!smb_io_relstr("name", buffer, depth, &info->name))
return False;
if (!new_smb_io_relstr("environment", buffer, depth, &info->environment))
if (!smb_io_relstr("environment", buffer, depth, &info->environment))
return False;
if (!new_smb_io_relstr("dll_name", buffer, depth, &info->dll_name))
if (!smb_io_relstr("dll_name", buffer, depth, &info->dll_name))
return False;
return True;

46
source3/rpc_server/srv_spoolss_nt.c
View File

@ -2853,7 +2853,7 @@ static BOOL enum_all_printers_info_1(uint32 flags, NEW_BUFFER *buffer, uint32 of
/* fill the buffer with the structures */
for (i=0; i<*returned; i++)
new_smb_io_printer_info_1("", buffer, &printers[i], 0);
smb_io_printer_info_1("", buffer, &printers[i], 0);
/* clear memory */
safe_free(printers);
@ -2935,7 +2935,7 @@ static BOOL enum_all_printers_info_1_remote(fstring name, NEW_BUFFER *buffer, ui
}
/* fill the buffer with the structures */
new_smb_io_printer_info_1("", buffer, printer, 0);
smb_io_printer_info_1("", buffer, printer, 0);
/* clear memory */
safe_free(printer);
@ -3001,7 +3001,7 @@ static BOOL enum_all_printers_info_2(NEW_BUFFER *buffer, uint32 offered, uint32
/* fill the buffer with the structures */
for (i=0; i<*returned; i++)
new_smb_io_printer_info_2("", buffer, &(printers[i]), 0);
smb_io_printer_info_2("", buffer, &(printers[i]), 0);
/* clear memory */
for (i=0; i<*returned; i++) {
@ -3161,7 +3161,7 @@ static uint32 getprinter_level_0(int snum, NEW_BUFFER *buffer, uint32 offered, u
}
/* fill the buffer with the structures */
new_smb_io_printer_info_0("", buffer, printer, 0);
smb_io_printer_info_0("", buffer, printer, 0);
/* clear memory */
safe_free(printer);
@ -3193,7 +3193,7 @@ static uint32 getprinter_level_1(int snum, NEW_BUFFER *buffer, uint32 offered, u
}
/* fill the buffer with the structures */
new_smb_io_printer_info_1("", buffer, printer, 0);
smb_io_printer_info_1("", buffer, printer, 0);
/* clear memory */
safe_free(printer);
@ -3225,7 +3225,7 @@ static uint32 getprinter_level_2(int snum, NEW_BUFFER *buffer, uint32 offered, u
}
/* fill the buffer with the structures */
if (!new_smb_io_printer_info_2("", buffer, printer, 0)) {
if (!smb_io_printer_info_2("", buffer, printer, 0)) {
free_printer_info_2(printer);
return ERROR_NOT_ENOUGH_MEMORY;
}
@ -3258,7 +3258,7 @@ static uint32 getprinter_level_3(int snum, NEW_BUFFER *buffer, uint32 offered, u
}
/* fill the buffer with the structures */
new_smb_io_printer_info_3("", buffer, printer, 0);
smb_io_printer_info_3("", buffer, printer, 0);
/* clear memory */
free_printer_info_3(printer);
@ -3662,7 +3662,7 @@ static uint32 getprinterdriver2_level1(fstring servername, fstring architecture,
}
/* fill the buffer with the structures */
new_smb_io_printer_driver_info_1("", buffer, info, 0);
smb_io_printer_driver_info_1("", buffer, info, 0);
/* clear memory */
safe_free(info);
@ -3698,7 +3698,7 @@ static uint32 getprinterdriver2_level2(fstring servername, fstring architecture,
}
/* fill the buffer with the structures */
new_smb_io_printer_driver_info_2("", buffer, info, 0);
smb_io_printer_driver_info_2("", buffer, info, 0);
/* clear memory */
safe_free(info);
@ -3732,7 +3732,7 @@ static uint32 getprinterdriver2_level3(fstring servername, fstring architecture,
}
/* fill the buffer with the structures */
new_smb_io_printer_driver_info_3("", buffer, &info, 0);
smb_io_printer_driver_info_3("", buffer, &info, 0);
free_printer_driver_info_3(&info);
@ -3765,7 +3765,7 @@ static uint32 getprinterdriver2_level6(fstring servername, fstring architecture,
}
/* fill the buffer with the structures */
new_smb_io_printer_driver_info_6("", buffer, &info, 0);
smb_io_printer_driver_info_6("", buffer, &info, 0);
free_printer_driver_info_6(&info);
@ -4750,7 +4750,7 @@ static uint32 enumjobs_level1(print_queue_struct *queue, int snum,
/* fill the buffer with the structures */
for (i=0; i<*returned; i++)
new_smb_io_job_info_1("", buffer, &info[i], 0);
smb_io_job_info_1("", buffer, &info[i], 0);
/* clear memory */
safe_free(info);
@ -4802,7 +4802,7 @@ static uint32 enumjobs_level2(print_queue_struct *queue, int snum,
/* fill the buffer with the structures */
for (i=0; i<*returned; i++)
new_smb_io_job_info_2("", buffer, &info[i], 0);
smb_io_job_info_2("", buffer, &info[i], 0);
/* clear memory */
for (i = 0; i < *returned; i++)
@ -4993,7 +4993,7 @@ static uint32 enumprinterdrivers_level1(fstring servername, fstring architecture
/* fill the buffer with the driver structures */
for (i=0; i<*returned; i++) {
DEBUGADD(6,("adding driver [%d] to buffer\n",i));
new_smb_io_printer_driver_info_1("", buffer, &driver_info_1[i], 0);
smb_io_printer_driver_info_1("", buffer, &driver_info_1[i], 0);
}
safe_free(driver_info_1);
@ -5069,7 +5069,7 @@ static uint32 enumprinterdrivers_level2(fstring servername, fstring architecture
/* fill the buffer with the form structures */
for (i=0; i<*returned; i++) {
DEBUGADD(6,("adding driver [%d] to buffer\n",i));
new_smb_io_printer_driver_info_2("", buffer, &(driver_info_2[i]), 0);
smb_io_printer_driver_info_2("", buffer, &(driver_info_2[i]), 0);
}
safe_free(driver_info_2);
@ -5145,7 +5145,7 @@ static uint32 enumprinterdrivers_level3(fstring servername, fstring architecture
/* fill the buffer with the driver structures */
for (i=0; i<*returned; i++) {
DEBUGADD(6,("adding driver [%d] to buffer\n",i));
new_smb_io_printer_driver_info_3("", buffer, &driver_info_3[i], 0);
smb_io_printer_driver_info_3("", buffer, &driver_info_3[i], 0);
}
for (i=0; i<*returned; i++)
@ -5280,7 +5280,7 @@ uint32 _spoolss_enumforms(pipes_struct *p, SPOOL_Q_ENUMFORMS *q_u, SPOOL_R_ENUMF
/* fill the buffer with the form structures */
for (i=0; i<*numofforms; i++) {
DEBUGADD(6,("adding form [%d] to buffer\n",i));
new_smb_io_form_1("", buffer, &forms_1[i], 0);
smb_io_form_1("", buffer, &forms_1[i], 0);
}
safe_free(forms_1);
@ -5364,7 +5364,7 @@ uint32 _spoolss_getform(pipes_struct *p, SPOOL_Q_GETFORM *q_u, SPOOL_R_GETFORM *
/* fill the buffer with the form structures */
DEBUGADD(6,("adding form %s [%d] to buffer\n", form_name, i));
new_smb_io_form_1("", buffer, &form_1, 0);
smb_io_form_1("", buffer, &form_1, 0);
return NT_STATUS_NO_PROBLEMO;
@ -5477,7 +5477,7 @@ static uint32 enumports_level_1(NEW_BUFFER *buffer, uint32 offered, uint32 *need
/* fill the buffer with the ports structures */
for (i=0; i<*returned; i++) {
DEBUGADD(6,("adding port [%d] to buffer\n", i));
new_smb_io_port_1("", buffer, &ports[i], 0);
smb_io_port_1("", buffer, &ports[i], 0);
}
safe_free(ports);
@ -5576,7 +5576,7 @@ static uint32 enumports_level_2(NEW_BUFFER *buffer, uint32 offered, uint32 *need
/* fill the buffer with the ports structures */
for (i=0; i<*returned; i++) {
DEBUGADD(6,("adding port [%d] to buffer\n", i));
new_smb_io_port_2("", buffer, &ports[i], 0);
smb_io_port_2("", buffer, &ports[i], 0);
}
safe_free(ports);
@ -5799,7 +5799,7 @@ static uint32 getprinterdriverdir_level_1(UNISTR2 *name, UNISTR2 *uni_environmen
return ERROR_INSUFFICIENT_BUFFER;
}
new_smb_io_driverdir_1("", buffer, info, 0);
smb_io_driverdir_1("", buffer, info, 0);
safe_free(info);
@ -6485,7 +6485,7 @@ static uint32 getjob_level_1(print_queue_struct *queue, int count, int snum, uin
return ERROR_INSUFFICIENT_BUFFER;
}
new_smb_io_job_info_1("", buffer, info_1, 0);
smb_io_job_info_1("", buffer, info_1, 0);
safe_free(info_1);
@ -6543,7 +6543,7 @@ static uint32 getjob_level_2(print_queue_struct *queue, int count, int snum, uin
return ERROR_INSUFFICIENT_BUFFER;
}
new_smb_io_job_info_2("", buffer, info_2, 0);
smb_io_job_info_2("", buffer, info_2, 0);
free_job_info_2(info_2);
free(info_2);