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

[jra at samba.org]

Author: jra
Date: 2004-11-19 19:44:57 +0000 (Fri, 19 Nov 2004)
New Revision: 3879

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

Log:
Tidy up some unused/shadowed variable usage.
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	2004-11-19 19:32:58 UTC (rev 3878)
+++ trunk/source/utils/net_rpc_printer.c	2004-11-19 19:44:57 UTC (rev 3879)
@@ -305,7 +305,7 @@
 	int fnum_dst = 0;
 	SEC_DESC *sd = NULL;
 	uint16 attr;
-	time_t atime, ctime, mtime;
+	time_t f_atime, f_ctime, f_mtime;
 
 
 	if (!copy_timestamps && !copy_acls && !copy_attrs)
@@ -346,7 +346,7 @@
 
 		/* get file attributes */
 		if (!cli_getattrE(cli_share_src, fnum_src, &attr, NULL, 
-				 &ctime, &atime, &mtime)) {
+				 &f_ctime, &f_atime, &f_mtime)) {
 			DEBUG(0,("failed to get file-attrs: %s\n", 
 				cli_errstr(cli_share_src)));
 			nt_status = cli_nt_error(cli_share_src);
@@ -368,7 +368,7 @@
 	if (copy_timestamps) {
 
 		/* set timestamps */
-		if (!cli_setattrE(cli_share_dst, fnum_dst, ctime, atime, mtime)) {
+		if (!cli_setattrE(cli_share_dst, fnum_dst, f_ctime, f_atime, f_mtime)) {
 			DEBUG(0,("failed to set file-attrs (timestamps): %s\n",
 				cli_errstr(cli_share_dst)));
 			nt_status = cli_nt_error(cli_share_dst);
@@ -1312,7 +1312,7 @@
 	POLICY_HND hnd;
 	BOOL got_hnd = False;
 	WERROR result;
-	char *action_str;
+	const char *action_str;
 
 	if (!get_printer_info(cli, mem_ctx, 2, argc, argv, &num_printers, &ctr))
 		return nt_status;
@@ -1348,6 +1348,7 @@
 			action_str = "unpublished";
 			break;
 		default:
+			action_str = "unknown action";
 			printf("unkown action: %d\n", action);
 			break;
 		}