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

s3-spoolss: remove old leftover driver print functions.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2009-03-09 18:25:52 +01:00
parent a540815b5f
commit 058f47d08d
2 changed files with 0 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
source3/rpcclient/cmd_spoolss.c
View File

@ -895,116 +895,6 @@ static WERROR cmd_spoolss_getprinterdataex(struct rpc_pipe_client *cli,
/****************************************************************************
****************************************************************************/
static void display_print_driver_1(DRIVER_INFO_1 *i1)
{
fstring name;
if (i1 == NULL)
return;
rpcstr_pull(name, i1->name.buffer, sizeof(name), -1, STR_TERMINATE);
printf ("Printer Driver Info 1:\n");
printf ("\tDriver Name: [%s]\n\n", name);
return;
}
/****************************************************************************
****************************************************************************/
static void display_print_driver_2(DRIVER_INFO_2 *i1)
{
fstring name;
fstring architecture;
fstring driverpath;
fstring datafile;
fstring configfile;
if (i1 == NULL)
return;
rpcstr_pull(name, i1->name.buffer, sizeof(name), -1, STR_TERMINATE);
rpcstr_pull(architecture, i1->architecture.buffer, sizeof(architecture), -1, STR_TERMINATE);
rpcstr_pull(driverpath, i1->driverpath.buffer, sizeof(driverpath), -1, STR_TERMINATE);
rpcstr_pull(datafile, i1->datafile.buffer, sizeof(datafile), -1, STR_TERMINATE);
rpcstr_pull(configfile, i1->configfile.buffer, sizeof(configfile), -1, STR_TERMINATE);
printf ("Printer Driver Info 2:\n");
printf ("\tVersion: [%x]\n", i1->version);
printf ("\tDriver Name: [%s]\n", name);
printf ("\tArchitecture: [%s]\n", architecture);
printf ("\tDriver Path: [%s]\n", driverpath);
printf ("\tDatafile: [%s]\n", datafile);
printf ("\tConfigfile: [%s]\n\n", configfile);
return;
}
/****************************************************************************
****************************************************************************/
static void display_print_driver_3(DRIVER_INFO_3 *i1)
{
fstring name = "";
fstring architecture = "";
fstring driverpath = "";
fstring datafile = "";
fstring configfile = "";
fstring helpfile = "";
fstring dependentfiles = "";
fstring monitorname = "";
fstring defaultdatatype = "";
int length=0;
bool valid = True;
if (i1 == NULL)
return;
rpcstr_pull(name, i1->name.buffer, sizeof(name), -1, STR_TERMINATE);
rpcstr_pull(architecture, i1->architecture.buffer, sizeof(architecture), -1, STR_TERMINATE);
rpcstr_pull(driverpath, i1->driverpath.buffer, sizeof(driverpath), -1, STR_TERMINATE);
rpcstr_pull(datafile, i1->datafile.buffer, sizeof(datafile), -1, STR_TERMINATE);
rpcstr_pull(configfile, i1->configfile.buffer, sizeof(configfile), -1, STR_TERMINATE);
rpcstr_pull(helpfile, i1->helpfile.buffer, sizeof(helpfile), -1, STR_TERMINATE);
rpcstr_pull(monitorname, i1->monitorname.buffer, sizeof(monitorname), -1, STR_TERMINATE);
rpcstr_pull(defaultdatatype, i1->defaultdatatype.buffer, sizeof(defaultdatatype), -1, STR_TERMINATE);
printf ("Printer Driver Info 3:\n");
printf ("\tVersion: [%x]\n", i1->version);
printf ("\tDriver Name: [%s]\n",name);
printf ("\tArchitecture: [%s]\n", architecture);
printf ("\tDriver Path: [%s]\n", driverpath);
printf ("\tDatafile: [%s]\n", datafile);
printf ("\tConfigfile: [%s]\n", configfile);
printf ("\tHelpfile: [%s]\n\n", helpfile);
while (valid)
{
rpcstr_pull(dependentfiles, i1->dependentfiles+length, sizeof(dependentfiles), -1, STR_TERMINATE);
length+=strlen(dependentfiles)+1;
if (strlen(dependentfiles) > 0)
{
printf ("\tDependentfiles: [%s]\n", dependentfiles);
}
else
{
valid = False;
}
}
printf ("\n");
printf ("\tMonitorname: [%s]\n", monitorname);
printf ("\tDefaultdatatype: [%s]\n\n", defaultdatatype);
return;
}
/****************************************************************************
****************************************************************************/
static void display_print_driver1(struct spoolss_DriverInfo1 *r)
{
if (!r) {

56
source3/utils/net_rpc_printer.c
View File

@ -77,62 +77,6 @@ static void display_print_driver3(struct spoolss_DriverInfo3 *r)
printf("\tDefaultdatatype: [%s]\n\n", r->default_datatype);
}
static void display_print_driver_3(DRIVER_INFO_3 *i1)
{
fstring name = "";
fstring architecture = "";
fstring driverpath = "";
fstring datafile = "";
fstring configfile = "";
fstring helpfile = "";
fstring dependentfiles = "";
fstring monitorname = "";
fstring defaultdatatype = "";
int length=0;
bool valid = true;
if (i1 == NULL)
return;
rpcstr_pull(name, i1->name.buffer, sizeof(name), -1, STR_TERMINATE);
rpcstr_pull(architecture, i1->architecture.buffer, sizeof(architecture), -1, STR_TERMINATE);
rpcstr_pull(driverpath, i1->driverpath.buffer, sizeof(driverpath), -1, STR_TERMINATE);
rpcstr_pull(datafile, i1->datafile.buffer, sizeof(datafile), -1, STR_TERMINATE);
rpcstr_pull(configfile, i1->configfile.buffer, sizeof(configfile), -1, STR_TERMINATE);
rpcstr_pull(helpfile, i1->helpfile.buffer, sizeof(helpfile), -1, STR_TERMINATE);
rpcstr_pull(monitorname, i1->monitorname.buffer, sizeof(monitorname), -1, STR_TERMINATE);
rpcstr_pull(defaultdatatype, i1->defaultdatatype.buffer, sizeof(defaultdatatype), -1, STR_TERMINATE);
d_printf ("Printer Driver Info 3:\n");
d_printf ("\tVersion: [%x]\n", i1->version);
d_printf ("\tDriver Name: [%s]\n",name);
d_printf ("\tArchitecture: [%s]\n", architecture);
d_printf ("\tDriver Path: [%s]\n", driverpath);
d_printf ("\tDatafile: [%s]\n", datafile);
d_printf ("\tConfigfile: [%s]\n", configfile);
d_printf ("\tHelpfile: [%s]\n\n", helpfile);
while (valid) {
rpcstr_pull(dependentfiles, i1->dependentfiles+length, sizeof(dependentfiles), -1, STR_TERMINATE);
length+=strlen(dependentfiles)+1;
if (strlen(dependentfiles) > 0) {
d_printf ("\tDependentfiles: [%s]\n", dependentfiles);
} else {
valid = false;
}
}
printf ("\n");
d_printf ("\tMonitorname: [%s]\n", monitorname);
d_printf ("\tDefaultdatatype: [%s]\n\n", defaultdatatype);
return;
}
static void display_reg_value(const char *subkey, REGISTRY_VALUE value)
{
char *text;