diff options
| author | Gerald Carter <jerry@samba.org> | 2005-06-28 20:29:34 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2005-06-28 20:29:34 +0000 |
| commit | 8878c5e3db52d654dbe17f49829e3b1016580d3f (patch) | |
| tree | 0e7d79a588fc6ffac12520fab79cd751cef6dd72 | |
| parent | 2a85f87ae4f53ebd5cf9a6397fbdf31d888d28af (diff) | |
| download | samba-8878c5e3db52d654dbe17f49829e3b1016580d3f.tar.gz samba-8878c5e3db52d654dbe17f49829e3b1016580d3f.tar.xz samba-8878c5e3db52d654dbe17f49829e3b1016580d3f.zip | |
r7983: clean up some use of un-initialized variables found by valgrind
| -rw-r--r-- | source/printing/nt_printing.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c index 2796de835a1..f23f4b7dfa9 100644 --- a/source/printing/nt_printing.c +++ b/source/printing/nt_printing.c @@ -1659,12 +1659,11 @@ WERROR move_driver_to_download_area(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract slprintf(new_name, sizeof(new_name)-1, "%s/%s", architecture, driver->driverpath); slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->driverpath); if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) { - NTSTATUS status; driver_unix_convert(new_name, conn, NULL, &bad_path, &st); if ( !copy_file(new_name, old_name, conn, FILE_EXISTS_TRUNCATE|FILE_CREATE_IF_NOT_EXIST, 0, False, &err) ) { DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n", new_name, old_name)); - *perr = ntstatus_to_werror(status); + *perr = WERR_ACCESS_DENIED; ver = -1; } } @@ -1675,12 +1674,11 @@ WERROR move_driver_to_download_area(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract slprintf(new_name, sizeof(new_name)-1, "%s/%s", architecture, driver->datafile); slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->datafile); if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) { - NTSTATUS status; driver_unix_convert(new_name, conn, NULL, &bad_path, &st); if ( !copy_file(new_name, old_name, conn, FILE_EXISTS_TRUNCATE|FILE_CREATE_IF_NOT_EXIST, 0, False, &err) ) { DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n", new_name, old_name)); - *perr = ntstatus_to_werror(status); + *perr = WERR_ACCESS_DENIED; ver = -1; } } @@ -1693,12 +1691,11 @@ WERROR move_driver_to_download_area(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract slprintf(new_name, sizeof(new_name)-1, "%s/%s", architecture, driver->configfile); slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->configfile); if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) { - NTSTATUS status; driver_unix_convert(new_name, conn, NULL, &bad_path, &st); if ( !copy_file(new_name, old_name, conn, FILE_EXISTS_TRUNCATE|FILE_CREATE_IF_NOT_EXIST, 0, False, &err) ) { DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n", new_name, old_name)); - *perr = ntstatus_to_werror(status); + *perr = WERR_ACCESS_DENIED; ver = -1; } } @@ -1712,12 +1709,11 @@ WERROR move_driver_to_download_area(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract slprintf(new_name, sizeof(new_name)-1, "%s/%s", architecture, driver->helpfile); slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->helpfile); if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) { - NTSTATUS status; driver_unix_convert(new_name, conn, NULL, &bad_path, &st); if ( !copy_file(new_name, old_name, conn, FILE_EXISTS_TRUNCATE|FILE_CREATE_IF_NOT_EXIST, 0, False, &err) ) { DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n", new_name, old_name)); - *perr = ntstatus_to_werror(status); + *perr = WERR_ACCESS_DENIED; ver = -1; } } @@ -1740,12 +1736,11 @@ WERROR move_driver_to_download_area(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract slprintf(new_name, sizeof(new_name)-1, "%s/%s", architecture, driver->dependentfiles[i]); slprintf(old_name, sizeof(old_name)-1, "%s/%s", new_dir, driver->dependentfiles[i]); if (ver != -1 && (ver=file_version_is_newer(conn, new_name, old_name)) > 0) { - NTSTATUS status; driver_unix_convert(new_name, conn, NULL, &bad_path, &st); if ( !copy_file(new_name, old_name, conn, FILE_EXISTS_TRUNCATE|FILE_CREATE_IF_NOT_EXIST, 0, False, &err) ) { DEBUG(0,("move_driver_to_download_area: Unable to rename [%s] to [%s]\n", new_name, old_name)); - *perr = ntstatus_to_werror(status); + *perr = WERR_ACCESS_DENIED; ver = -1; } } |