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>

diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c
index 8b187f8ddd42c888bb71270ecd0272aa7a692c0d..2ce3e9a787ced823d29f4fa6f78175b3bb49cd4f 100644 (file)
--- 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;