diff options
| author | Jeremy Allison <jra@samba.org> | 2000-06-22 01:39:17 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-06-22 01:39:17 +0000 |
| commit | f9e9f98a4a579f24d8ad1804b22bf36ede250e23 (patch) | |
| tree | 23a89fdcc3b34315bbc8625ec3cffd4460ec8608 /source3/printing/nt_printing.c | |
| parent | a7b5b10a0a32dd9a3f82c600898393fc53cfc4fc (diff) | |
| download | samba-f9e9f98a4a579f24d8ad1804b22bf36ede250e23.tar.gz samba-f9e9f98a4a579f24d8ad1804b22bf36ede250e23.tar.bz2 samba-f9e9f98a4a579f24d8ad1804b22bf36ede250e23.zip | |
lib/util_unistr.c: Removed ascii_to_unistr() as it does no codepage.
Removed unistr_to_ascii() as it was never used.
printing/nt_printing.c: Removed "DUMMY.XX" files.
rpc_server/srv_spoolss_nt.c: Use dos_PutUniCode() instead of ascii_to_unistr().
Attempted to fix the "return value" size code based on J.F's
comments. This needs looking at.
Jeremy.
(This used to be commit de99011bf3b2a23bd1854a047382a107aaeb9c68)
Diffstat (limited to 'source3/printing/nt_printing.c')
| -rw-r--r-- | source3/printing/nt_printing.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 3d6d6f573a..ec1251821c 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -378,16 +378,16 @@ static uint32 get_a_printer_driver_3_default(NT_PRINTER_DRIVER_INFO_LEVEL_3 **in fstrcpy(info.name, lp_printerdriver(snum)); fstrcpy(info.defaultdatatype, "RAW"); - fstrcpy(info.driverpath, "DUMMY.DLL"); - fstrcpy(info.datafile, "DUMMY.PPD"); - fstrcpy(info.configfile, "DUMMY.DLL"); - fstrcpy(info.helpfile, "DUMMY.HLP"); + fstrcpy(info.driverpath, ""); + fstrcpy(info.datafile, ""); + fstrcpy(info.configfile, ""); + fstrcpy(info.helpfile, ""); if ((info.dependentfiles=(fstring *)malloc(2*sizeof(fstring))) == NULL) return ERROR_NOT_ENOUGH_MEMORY; memset(info.dependentfiles, '\0', 2*sizeof(fstring)); - fstrcpy(info.dependentfiles[0], "DUMMY.PPD"); + fstrcpy(info.dependentfiles[0], ""); *info_ptr = memdup(&info, sizeof(info)); @@ -734,8 +734,7 @@ BOOL unlink_specific_param_if_exist(NT_PRINTER_INFO_LEVEL_2 *info_2, NT_PRINTER_ if (current==NULL) return (False); if ( !strcmp(current->value, param->value) && - (strlen(current->value)==strlen(param->value)) ) - { + (strlen(current->value)==strlen(param->value)) ) { DEBUG(109,("deleting first value\n")); info_2->specific=current->next; safe_free(current->data); @@ -746,13 +745,12 @@ BOOL unlink_specific_param_if_exist(NT_PRINTER_INFO_LEVEL_2 *info_2, NT_PRINTER_ current=previous->next; - while ( current!=NULL ) - { + while ( current!=NULL ) { if (!strcmp(current->value, param->value) && - strlen(current->value)==strlen(param->value) ) - { + strlen(current->value)==strlen(param->value) ) { DEBUG(109,("deleting current value\n")); previous->next=current->next; + safe_free(current->data); safe_free(current); DEBUG(109,("deleted current value\n")); return(True); |