svn commit: samba r20456 - in branches/SAMBA_4_0/source/torture/libnet: .

[abartlet at samba.org]

Author: abartlet
Date: 2007-01-02 01:39:53 +0000 (Tue, 02 Jan 2007)
New Revision: 20456

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

Log:
Rename variables to avoid shadowing global function names.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/torture/libnet/libnet_domain.c
   branches/SAMBA_4_0/source/torture/libnet/libnet_share.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/libnet/libnet_domain.c
===================================================================
--- branches/SAMBA_4_0/source/torture/libnet/libnet_domain.c	2007-01-02 01:07:44 UTC (rev 20455)
+++ branches/SAMBA_4_0/source/torture/libnet/libnet_domain.c	2007-01-02 01:39:53 UTC (rev 20456)
@@ -128,7 +128,7 @@
 	BOOL ret = True;
 	struct libnet_context *ctx;
 	struct libnet_DomainOpen r;
-	struct lsa_Close close;
+	struct lsa_Close lsa_close;
 	struct dcerpc_binding *binding;
 	struct policy_handle h;
 	const char *bindstr;
@@ -160,11 +160,11 @@
 		goto done;
 	}
 
-	ZERO_STRUCT(close);
-	close.in.handle  = &ctx->lsa.handle;
-	close.out.handle = &h;
+	ZERO_STRUCT(lsa_close);
+	lsa_close.in.handle  = &ctx->lsa.handle;
+	lsa_close.out.handle = &h;
 	
-	status = dcerpc_lsa_Close(ctx->lsa.pipe, ctx, &close);
+	status = dcerpc_lsa_Close(ctx->lsa.pipe, ctx, &lsa_close);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("failed to close domain on lsa service: %s\n", nt_errstr(status));
 		ret = False;

Modified: branches/SAMBA_4_0/source/torture/libnet/libnet_share.c
===================================================================
--- branches/SAMBA_4_0/source/torture/libnet/libnet_share.c	2007-01-02 01:07:44 UTC (rev 20455)
+++ branches/SAMBA_4_0/source/torture/libnet/libnet_share.c	2007-01-02 01:39:53 UTC (rev 20456)
@@ -169,7 +169,7 @@
 }
 
 
-static BOOL test_addshare(struct dcerpc_pipe *pipe, TALLOC_CTX *mem_ctx, const char *host,
+static BOOL test_addshare(struct dcerpc_pipe *svc_pipe, TALLOC_CTX *mem_ctx, const char *host,
 			  const char* share)
 {
 	NTSTATUS status;
@@ -188,7 +188,7 @@
 	add.in.level      = 2;
 	add.in.info.info2 = &i;
 
-	status = dcerpc_srvsvc_NetShareAdd(pipe, mem_ctx, &add);
+	status = dcerpc_srvsvc_NetShareAdd(svc_pipe, mem_ctx, &add);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("Failed to add a new share\n");
 		return False;