[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1217-ge77c17e

[Volker Lendecke]

The branch, master has been updated
       via  e77c17ec3e2aa65b458a7fb243b5806cb12fff44 (commit)
      from  703d5897701c22250a2d6e8ffba9ecf01db58f1f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e77c17ec3e2aa65b458a7fb243b5806cb12fff44
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Apr 22 11:17:38 2009 +0200

    Remove some shadowed definition warnings

-----------------------------------------------------------------------

Summary of changes:
 source3/torture/torture.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 7e2b3a5..3500423 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -5112,7 +5112,7 @@ static bool run_mangle1(int dummy)
 	int fnum;
 	fstring alt_name;
 	NTSTATUS status;
-	time_t change, access, write;
+	time_t change_time, access_time, write_time;
 	SMB_OFF_T size;
 	uint16_t mode;
 
@@ -5148,8 +5148,8 @@ static bool run_mangle1(int dummy)
 	}
 	cli_close(cli, fnum);
 
-	if (!cli_qpathinfo(cli, alt_name, &change, &access, &write, &size,
-			   &mode)) {
+	if (!cli_qpathinfo(cli, alt_name, &change_time, &access_time,
+			   &write_time, &size, &mode)) {
 		d_printf("cli_qpathinfo(%s) failed: %s\n", alt_name,
 			 cli_errstr(cli));
 		return false;


-- 
Samba Shared Repository