sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

s4:torture: Make sure we do not create a shadow 'struct params'

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2019-03-04 16:59:18 +01:00 committed by Andrew Bartlett
parent a7d09580ae
commit c1b6fe62a4
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source4/torture/basic/misc.c
View File

@ -451,6 +451,19 @@ enum benchrw_stage {
FINISHED 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 benchrw_state {
struct torture_context *tctx; struct torture_context *tctx;
char *dname; char *dname;
@ -465,18 +478,7 @@ struct benchrw_state {
int num_parallel_requests; int num_parallel_requests;
void *req_params; void *req_params;
enum benchrw_stage mode; enum benchrw_stage mode;
struct params{ struct bench_params *lpcfg_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;
}; };
/* /*
@ -484,7 +486,7 @@ struct benchrw_state {
return number of unclist entries return number of unclist entries
*/ */
static int init_benchrw_params(struct torture_context *tctx, static int init_benchrw_params(struct torture_context *tctx,
struct params *lpar) struct bench_params *lpar)
{ {
char **unc_list = NULL; char **unc_list = NULL;
int num_unc_names = 0, conn_index=0, empty_lines=0; 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; int i , num_unc_names;
struct tevent_context *ev ; struct tevent_context *ev ;
struct composite_context *req1; struct composite_context *req1;
struct params lpparams; struct bench_params lpparams;
union smb_mkdir parms; union smb_mkdir parms;
int finished = 0; int finished = 0;
bool success=true; bool success=true;