diff options
author | Stefan Metzmacher <metze@samba.org> | 2004-08-04 13:23:35 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:57:47 -0500 |
commit | c5fbb6f23c2d399c7510bc552cdb1a27b1ef66a8 (patch) | |
tree | 6fccf75601681c68afca5dd9c6b840de44f7f31c /source4/torture/nbench | |
parent | a0cb701b6fac6e75da691e239cd0407b9269533a (diff) | |
download | samba-c5fbb6f23c2d399c7510bc552cdb1a27b1ef66a8.tar.gz samba-c5fbb6f23c2d399c7510bc552cdb1a27b1ef66a8.tar.bz2 samba-c5fbb6f23c2d399c7510bc552cdb1a27b1ef66a8.zip |
r1654: rename cli_ -> smbcli_
rename CLI_ -> SMBCLI_
metze
(This used to be commit 8441750fd9427dd6fe477f27e603821b4026f038)
Diffstat (limited to 'source4/torture/nbench')
-rw-r--r-- | source4/torture/nbench/nbench.c | 4 | ||||
-rw-r--r-- | source4/torture/nbench/nbio.c | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c index 30291a829e..316e87ce99 100644 --- a/source4/torture/nbench/nbench.c +++ b/source4/torture/nbench/nbench.c @@ -28,7 +28,7 @@ static const char *loadfile; #define ival(s) strtol(s, NULL, 0) /* run a test that simulates an approximate netbench client load */ -static BOOL run_netbench(struct cli_state *cli, int client) +static BOOL run_netbench(struct smbcli_state *cli, int client) { int i; pstring line; @@ -164,7 +164,7 @@ BOOL torture_nbench(int dummy) { BOOL correct = True; extern int torture_nprocs; - struct cli_state *cli; + struct smbcli_state *cli; const char *p; p = lp_parm_string(-1, "torture", "timelimit"); diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c index a7a82027a3..9b6ec7943d 100644 --- a/source4/torture/nbench/nbio.c +++ b/source4/torture/nbench/nbio.c @@ -138,18 +138,18 @@ static int find_handle(int handle) -static struct cli_state *c; +static struct smbcli_state *c; /* a handler function for oplock break requests */ -static BOOL oplock_handler(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8_t level, void *private) +static BOOL oplock_handler(struct smbcli_transport *transport, uint16_t tid, uint16_t fnum, uint8_t level, void *private) { - struct cli_tree *tree = private; - return cli_oplock_ack(tree, fnum, level); + struct smbcli_tree *tree = private; + return smbcli_oplock_ack(tree, fnum, level); } -void nb_setup(struct cli_state *cli, int id, int warmupt) +void nb_setup(struct smbcli_state *cli, int id, int warmupt) { warmup = warmupt; nbio_id = id; @@ -162,7 +162,7 @@ void nb_setup(struct cli_state *cli, int id, int warmupt) printf("skipping I/O\n"); if (cli) { - cli_oplock_handler(cli->transport, oplock_handler, cli->tree); + smbcli_oplock_handler(cli->transport, oplock_handler, cli->tree); } } @@ -560,7 +560,7 @@ void nb_qfsinfo(int level, NTSTATUS status) TALLOC_CTX *mem_ctx; NTSTATUS ret; - mem_ctx = talloc_init("cli_dskattr"); + mem_ctx = talloc_init("smbcli_dskattr"); io.generic.level = level; ret = smb_raw_fsinfo(c->tree, mem_ctx, &io); @@ -582,7 +582,7 @@ void nb_findfirst(const char *mask, int level, int maxcnt, int count, NTSTATUS s TALLOC_CTX *mem_ctx; NTSTATUS ret; - mem_ctx = talloc_init("cli_dskattr"); + mem_ctx = talloc_init("smbcli_dskattr"); io.t2ffirst.level = level; io.t2ffirst.in.max_count = maxcnt; @@ -630,14 +630,14 @@ void nb_deltree(const char *dname) free(f); } - total_deleted = cli_deltree(c->tree, dname); + total_deleted = smbcli_deltree(c->tree, dname); if (total_deleted == -1) { printf("Failed to cleanup tree %s - exiting\n", dname); exit(1); } - cli_rmdir(c->tree, dname); + smbcli_rmdir(c->tree, dname); } void nb_cleanup(const char *cname) @@ -646,6 +646,6 @@ void nb_cleanup(const char *cname) asprintf(&dname, "\\clients\\%s", cname); nb_deltree(dname); free(dname); - cli_rmdir(c->tree, "clients"); + smbcli_rmdir(c->tree, "clients"); children[nbio_id].done = 1; } |