diff options
| author | Andreas Schneider <asn@samba.org> | 2019-03-04 16:59:18 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-03-04 21:41:17 +0000 |
| commit | c1b6fe62a4b5bfe4c534cf4eaad24b8ed57d3520 (patch) | |
| tree | 248dbee88c80d09004e4ee1815a8d667608fd872 /source4/torture | |
| parent | a7d09580ae0e03568b6708cf91d4609a881b0a14 (diff) | |
| download | samba-c1b6fe62a4b5bfe4c534cf4eaad24b8ed57d3520.tar.gz | |
s4:torture: Make sure we do not create a shadow 'struct params'
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/basic/misc.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c index 8b187f8ddd4..2ce3e9a787c 100644 --- a/source4/torture/basic/misc.c +++ b/source4/torture/basic/misc.c @@ -451,6 +451,19 @@ enum benchrw_stage { FINISHED }; +struct bench_params { + struct unclist{ + const char *host; + const char *share; + } **unc; + const char *workgroup; + int retry; + unsigned int writeblocks; + unsigned int blocksize; + unsigned int writeratio; + int num_parallel_requests; +}; + struct benchrw_state { struct torture_context *tctx; char *dname; @@ -465,18 +478,7 @@ struct benchrw_state { int num_parallel_requests; void *req_params; enum benchrw_stage mode; - struct params{ - struct unclist{ - const char *host; - const char *share; - } **unc; - const char *workgroup; - int retry; - unsigned int writeblocks; - unsigned int blocksize; - unsigned int writeratio; - int num_parallel_requests; - } *lpcfg_params; + struct bench_params *lpcfg_params; }; /* @@ -484,7 +486,7 @@ struct benchrw_state { return number of unclist entries */ static int init_benchrw_params(struct torture_context *tctx, - struct params *lpar) + struct bench_params *lpar) { char **unc_list = NULL; int num_unc_names = 0, conn_index=0, empty_lines=0; @@ -892,7 +894,7 @@ bool run_benchrw(struct torture_context *tctx) int i , num_unc_names; struct tevent_context *ev ; struct composite_context *req1; - struct params lpparams; + struct bench_params lpparams; union smb_mkdir parms; int finished = 0; bool success=true; |