From: Tim Prouty <tprouty@samba.org>
Date: Wed, 10 Jun 2009 16:59:42 +0000 (-0700)
Subject: s3: Remove extraneous calls to unix_convert
X-Git-Tag: tdb-1.1.5~106
X-Git-Url: http://git.samba.org/samba.git/?p=nivanova%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=ab779f5c345ef59308362781501e4ae1e1191496

s3: Remove extraneous calls to unix_convert

Not only are these unnecessary in spirit because unlink_internals
calls unix_convert, but in practice the return value is simply being
ignored right now.
---

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index a05e0def7b7..02ac7eeca25 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -5134,7 +5134,6 @@ static bool delete_driver_files(struct pipes_struct *rpc_pipe,
 	const char *file;
 	connection_struct *conn;
 	NTSTATUS nt_status;
-	SMB_STRUCT_STAT  st;
 	char *oldcwd;
 	fstring printdollar;
 	int printdollar_snum;
@@ -5172,7 +5171,6 @@ static bool delete_driver_files(struct pipes_struct *rpc_pipe,
 	if ( *info_3->driverpath ) {
 		if ( (s = strchr( &info_3->driverpath[1], '\\' )) != NULL ) {
 			file = s;
-			driver_unix_convert(conn,file,&st);
 			DEBUG(10,("deleting driverfile [%s]\n", s));
 			unlink_internals(conn, NULL, 0, file, False);
 		}
@@ -5181,7 +5179,6 @@ static bool delete_driver_files(struct pipes_struct *rpc_pipe,
 	if ( *info_3->configfile ) {
 		if ( (s = strchr( &info_3->configfile[1], '\\' )) != NULL ) {
 			file = s;
-			driver_unix_convert(conn,file,&st);
 			DEBUG(10,("deleting configfile [%s]\n", s));
 			unlink_internals(conn, NULL, 0, file, False);
 		}
@@ -5190,7 +5187,6 @@ static bool delete_driver_files(struct pipes_struct *rpc_pipe,
 	if ( *info_3->datafile ) {
 		if ( (s = strchr( &info_3->datafile[1], '\\' )) != NULL ) {
 			file = s;
-			driver_unix_convert(conn,file,&st);
 			DEBUG(10,("deleting datafile [%s]\n", s));
 			unlink_internals(conn, NULL, 0, file, False);
 		}
@@ -5199,7 +5195,6 @@ static bool delete_driver_files(struct pipes_struct *rpc_pipe,
 	if ( *info_3->helpfile ) {
 		if ( (s = strchr( &info_3->helpfile[1], '\\' )) != NULL ) {
 			file = s;
-			driver_unix_convert(conn,file,&st);
 			DEBUG(10,("deleting helpfile [%s]\n", s));
 			unlink_internals(conn, NULL, 0, file, False);
 		}
@@ -5215,7 +5210,6 @@ static bool delete_driver_files(struct pipes_struct *rpc_pipe,
 
 			if ( (p = strchr( info_3->dependentfiles[i]+1, '\\' )) != NULL ) {
 				file = p;
-				driver_unix_convert(conn,file,&st);
 				DEBUG(10,("deleting dependent file [%s]\n", file));
 				unlink_internals(conn, NULL, 0, file, False);
 			}