summaryrefslogtreecommitdiff
path: root/source4/torture/basic/misc.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-10-18 14:23:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:21:24 -0500
commita39f239cb28e4ac6be207d4179bacffce97f1b3e (patch)
treeb9f7e4e7e4c6ad7a5d0107b99c75ee2e9ac2132f /source4/torture/basic/misc.c
parent19af876bbb7038f5a40cd87eced81661a2fc2ee6 (diff)
downloadsamba-a39f239cb28e4ac6be207d4179bacffce97f1b3e.tar.gz
samba-a39f239cb28e4ac6be207d4179bacffce97f1b3e.tar.bz2
samba-a39f239cb28e4ac6be207d4179bacffce97f1b3e.zip
r19392: Use torture_setting_* rather than lp_parm_* where possible.
(This used to be commit b28860978fe29c5b10abfb8c59d7182864e21dd6)
Diffstat (limited to 'source4/torture/basic/misc.c')
-rw-r--r--source4/torture/basic/misc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c
index c00372b805..0059574939 100644
--- a/source4/torture/basic/misc.c
+++ b/source4/torture/basic/misc.c
@@ -419,13 +419,13 @@ static int init_benchrw_params(struct torture_context *tctx, struct params *lpar
char **unc_list = NULL;
int num_unc_names = 0, conn_index=0, empty_lines=0;
const char *p;
- lpar->retry = lp_parm_int(-1, "torture", "retry",3);
- lpar->blocksize = lp_parm_int(-1, "torture", "blocksize",65535);
- lpar->writeblocks = lp_parm_int(-1, "torture", "writeblocks",15);
- lpar->writeratio = lp_parm_int(-1, "torture", "writeratio",5);
+ lpar->retry = torture_setting_int(tctx, "retry",3);
+ lpar->blocksize = torture_setting_int(tctx, "blocksize",65535);
+ lpar->writeblocks = torture_setting_int(tctx, "writeblocks",15);
+ lpar->writeratio = torture_setting_int(tctx, "writeratio",5);
lpar->workgroup = lp_workgroup();
- p = lp_parm_string(-1, "torture", "unclist");
+ p = torture_setting_string(tctx, "unclist", NULL);
if (p) {
char *h, *s;
unc_list = file_lines_load(p, &num_unc_names, NULL);
@@ -455,8 +455,8 @@ static int init_benchrw_params(struct torture_context *tctx, struct params *lpar
}else{
lpar->unc = talloc_array(tctx, struct unclist *, 1);
lpar->unc[0] = talloc(tctx,struct unclist);
- lpar->unc[0]->host = lp_parm_string(-1, "torture", "host");
- lpar->unc[0]->share = lp_parm_string(-1, "torture", "share");
+ lpar->unc[0]->host = torture_setting_string(tctx, "host", NULL);
+ lpar->unc[0]->share = torture_setting_string(tctx, "share", NULL);
return 1;
}
}