From 4639eb5a58f8c0906afdc8e8f8f67f82e9547f75 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 8 Feb 2004 00:51:07 +0000
Subject: Convert libcli routines to use cli_tree instead of cli_state. Port
 smbtorture to use the new interface.

Part 2 will be to eliminate cli_state from smbtorture as this is now
the only place where it is used.
(This used to be commit db1cc96af62ea42837d60592877fc3f93cef143b)
---
 source4/torture/utable.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'source4/torture/utable.c')

diff --git a/source4/torture/utable.c b/source4/torture/utable.c
index 2d7ad5a025..9d23f10121 100644
--- a/source4/torture/utable.c
+++ b/source4/torture/utable.c
@@ -41,8 +41,8 @@ BOOL torture_utable(int dummy)
 
 	memset(valid, 0, sizeof(valid));
 
-	cli_mkdir(cli, "\\utable");
-	cli_unlink(cli, "\\utable\\*");
+	cli_mkdir(cli->tree, "\\utable");
+	cli_unlink(cli->tree, "\\utable\\*");
 
 	for (c=1; c < 0x10000; c++) {
 		char *p;
@@ -56,13 +56,13 @@ BOOL torture_utable(int dummy)
 		p[len] = 0;
 		fstrcat(fname,"_a_long_extension");
 
-		fnum = cli_open(cli, fname, O_RDWR | O_CREAT | O_TRUNC, 
+		fnum = cli_open(cli->tree, fname, O_RDWR | O_CREAT | O_TRUNC, 
 				DENY_NONE);
 		if (fnum == -1) continue;
 
 		chars_allowed++;
 
-		cli_qpathinfo_alt_name(cli, fname, &alt_name);
+		cli_qpathinfo_alt_name(cli->tree, fname, &alt_name);
 
 		if (strncmp(alt_name, "X_A_L", 5) != 0) {
 			alt_allowed++;
@@ -70,8 +70,8 @@ BOOL torture_utable(int dummy)
 			d_printf("fname=[%s] alt_name=[%s]\n", fname, alt_name);
 		}
 
-		cli_close(cli, fnum);
-		cli_unlink(cli, fname);
+		cli_close(cli->tree, fnum);
+		cli_unlink(cli->tree, fname);
 
 		if (c % 100 == 0) {
 			printf("%d (%d/%d)\r", c, chars_allowed, alt_allowed);
@@ -79,7 +79,7 @@ BOOL torture_utable(int dummy)
 	}
 	printf("%d (%d/%d)\n", c, chars_allowed, alt_allowed);
 
-	cli_rmdir(cli, "\\utable");
+	cli_rmdir(cli->tree, "\\utable");
 
 	d_printf("%d chars allowed   %d alt chars allowed\n", chars_allowed, alt_allowed);
 
@@ -132,8 +132,8 @@ BOOL torture_casetable(int dummy)
 
 	memset(equiv, 0, sizeof(equiv));
 
-	cli_deltree(cli, "\\utable");
-	if (!cli_mkdir(cli, "\\utable")) {
+	cli_deltree(cli->tree, "\\utable");
+	if (!cli_mkdir(cli->tree, "\\utable")) {
 		printf("Failed to create utable directory!\n");
 		return False;
 	}
@@ -146,7 +146,7 @@ BOOL torture_casetable(int dummy)
 		d_printf("%04x (%c)\n", c, isprint(c)?c:'.');
 
 		fname = form_name(c);
-		fnum = cli_nt_create_full(cli, fname, 0,
+		fnum = cli_nt_create_full(cli->tree, fname, 0,
 #if 0
 					  SEC_RIGHT_MAXIMUM_ALLOWED, 
 #else
@@ -163,7 +163,7 @@ BOOL torture_casetable(int dummy)
 
 		size = 0;
 
-		if (!cli_qfileinfo(cli, fnum, NULL, &size, 
+		if (!cli_qfileinfo(cli->tree, fnum, NULL, &size, 
 				   NULL, NULL, NULL, NULL, NULL)) continue;
 
 		if (size > 0) {
@@ -173,11 +173,11 @@ BOOL torture_casetable(int dummy)
 			if (size/sizeof(int) >= MAX_EQUIVALENCE) {
 				printf("too many chars match?? size=%d c=0x%04x\n",
 				       size, c);
-				cli_close(cli, fnum);
+				cli_close(cli->tree, fnum);
 				return False;
 			}
 
-			cli_read(cli, fnum, (char *)c2, 0, size);
+			cli_read(cli->tree, fnum, (char *)c2, 0, size);
 			printf("%04x: ", c);
 			equiv[c][0] = c;
 			for (i=0; i<size/sizeof(int); i++) {
@@ -188,12 +188,12 @@ BOOL torture_casetable(int dummy)
 			fflush(stdout);
 		}
 
-		cli_write(cli, fnum, 0, (char *)&c, size, sizeof(c));
-		cli_close(cli, fnum);
+		cli_write(cli->tree, fnum, 0, (char *)&c, size, sizeof(c));
+		cli_close(cli->tree, fnum);
 	}
 
-	cli_unlink(cli, "\\utable\\*");
-	cli_rmdir(cli, "\\utable");
+	cli_unlink(cli->tree, "\\utable\\*");
+	cli_rmdir(cli->tree, "\\utable");
 
 	return True;
 }
-- 
cgit