svn commit: samba r7983 - in branches/SAMBA_3_0/source/printing: .

[jerry at samba.org]

Author: jerry
Date: 2005-06-28 20:29:34 +0000 (Tue, 28 Jun 2005)
New Revision: 7983

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7983

Log:
clean up some use of un-initialized variables found by valgrind
Modified:
   branches/SAMBA_3_0/source/printing/nt_printing.c


Changeset:
Modified: branches/SAMBA_3_0/source/printing/nt_printing.c
===================================================================
--- branches/SAMBA_3_0/source/printing/nt_printing.c	2005-06-28 19:25:48 UTC (rev 7982)
+++ branches/SAMBA_3_0/source/printing/nt_printing.c	2005-06-28 20:29:34 UTC (rev 7983)
@@ -1659,12 +1659,11 @@
 		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 @@
 			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 @@
 			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 @@
 			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 @@
 				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;
 					}
 				}