svn commit: samba r14417 - in trunk/source/utils: .

[jra at samba.org]

Author: jra
Date: 2006-03-15 03:00:55 +0000 (Wed, 15 Mar 2006)
New Revision: 14417

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

Log:
Remove deadcode. Coverity #198.
Jeremy.

Modified:
   trunk/source/utils/net_rpc_printer.c


Changeset:
Modified: trunk/source/utils/net_rpc_printer.c
===================================================================
--- trunk/source/utils/net_rpc_printer.c	2006-03-15 03:00:49 UTC (rev 14416)
+++ trunk/source/utils/net_rpc_printer.c	2006-03-15 03:00:55 UTC (rev 14417)
@@ -1922,7 +1922,6 @@
 	if (!NT_STATUS_IS_OK(nt_status))
 		return nt_status;
 
-
 	/* enum printers */
 	if (!get_printer_info(pipe_hnd, mem_ctx, level, argc, argv, &num_printers, &ctr_enum)) {
 		nt_status = NT_STATUS_UNSUCCESSFUL;
@@ -1951,7 +1950,6 @@
 		d_printf("migrating printer queue for:    [%s] / [%s]\n", 
 			printername, sharename);
 
-
 		/* open dst printer handle */
 		if (!net_spoolss_open_printer_ex(pipe_hnd_dst, mem_ctx, sharename, 
 			PRINTER_ALL_ACCESS, cli->user_name, &hnd_dst)) {
@@ -1961,18 +1959,12 @@
 			got_hnd_dst = True;
 		}
 
-
 		/* check for existing dst printer */
 		if (!net_spoolss_getprinter(pipe_hnd_dst, mem_ctx, &hnd_dst, level, &ctr_dst)) {
 			printf ("could not get printer, creating printer.\n");
 		} else {
 			DEBUG(1,("printer already exists: %s\n", sharename));
-			/* close printer handles here */
-			if (got_hnd_src) {
-				rpccli_spoolss_close_printer(pipe_hnd, mem_ctx, &hnd_src);
-				got_hnd_src = False;
-			}
-
+			/* close printer handle here - dst only, not got src yet. */
 			if (got_hnd_dst) {
 				rpccli_spoolss_close_printer(pipe_hnd_dst, mem_ctx, &hnd_dst);
 				got_hnd_dst = False;
@@ -1980,7 +1972,6 @@
 			continue;
 		}
 
-
 		/* now get again src printer ctr via getprinter, 
 		   we first need a handle for that */
 
@@ -1995,7 +1986,6 @@
 		if (!net_spoolss_getprinter(pipe_hnd, mem_ctx, &hnd_src, level, &ctr_src)) 
 			goto done;
 
-
 		/* copy each src printer to a dst printer 1:1, 
 		   maybe some values have to be changed though */
 		d_printf("creating printer: %s\n", printername);