s4:libcliraw: s/private/private_data

metze

6 files changed, 26 insertions, 26 deletions

diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c
index 23844a2c85..f4f91c8ba3 100644
--- a/source4/torture/basic/misc.c
+++ b/source4/torture/basic/misc.c
@@ -510,7 +510,7 @@ static NTSTATUS benchrw_close(struct torture_context *tctx,
 	NT_STATUS_HAVE_NO_MEMORY(req);
 	/*register the callback function!*/
 	req->async.fn = benchrw_callback;
-	req->async.private = state;
+	req->async.private_data = state;
 	
 	return NT_STATUS_OK;
 }
@@ -521,7 +521,7 @@ static void benchrw_callback(struct smbcli_request *req);
 
 static void benchrw_rw_callback(struct smbcli_request *req)
 {
-	struct benchrw_state *state = req->async.private;
+	struct benchrw_state *state = req->async.private_data;
 	struct torture_context *tctx = state->tctx;
 
 	if (!NT_STATUS_IS_OK(req->status)) {
@@ -596,7 +596,7 @@ static NTSTATUS benchrw_readwrite(struct torture_context *tctx,
 	NT_STATUS_HAVE_NO_MEMORY(req);
 	/*register the callback function!*/
 	req->async.fn = benchrw_rw_callback;
-	req->async.private = state;
+	req->async.private_data = state;
 	
 	return NT_STATUS_OK;
 }
@@ -644,7 +644,7 @@ static NTSTATUS benchrw_open(struct torture_context *tctx,
 	
 	/*register the callback function!*/
 	req->async.fn = benchrw_callback;
-	req->async.private = state;
+	req->async.private_data = state;
 	return NT_STATUS_OK;
 } 
 
@@ -691,7 +691,7 @@ static NTSTATUS benchrw_mkdir(struct torture_context *tctx,
 	
 	/*register the callback function!*/
 	req->async.fn = benchrw_callback;
-	req->async.private = state;
+	req->async.private_data = state;
 		
 	return NT_STATUS_OK;
 }
@@ -701,7 +701,7 @@ static NTSTATUS benchrw_mkdir(struct torture_context *tctx,
 */
 static void benchrw_callback(struct smbcli_request *req)
 {
-	struct benchrw_state *state = req->async.private;
+	struct benchrw_state *state = req->async.private_data;
 	struct torture_context *tctx = state->tctx;
 	
 	/*dont send new requests when torture_numops is reached*/
@@ -913,7 +913,7 @@ bool run_benchrw(struct torture_context *tctx)
 				req = smb_raw_mkdir_send(state[i]->cli,&parms);
 				/* register callback fn + private data */
 				req->async.fn = benchrw_callback;
-				req->async.private=state[i];
+				req->async.private_data=state[i];
 				break;
 			/* error occured , finish */
 			case ERROR:
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 428be25503..be02f33378 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -1024,7 +1024,7 @@ static bool oplock_handler_smb(struct smbcli_transport *transport, uint16_t tid,
 	}
 
 	req->async.fn = oplock_handler_close_recv_smb;
-	req->async.private = NULL;
+	req->async.private_data = NULL;
 
 	return true;
 }
diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c
index 4077ae97e6..d20175a018 100644
--- a/source4/torture/raw/lockbench.c
+++ b/source4/torture/raw/lockbench.c
@@ -112,7 +112,7 @@ static void lock_send(struct benchlock_state *state)
 		DEBUG(0,("Failed to setup lock\n"));
 		lock_failed++;
 	}
-	state->req->async.private = state;
+	state->req->async.private_data = state;
 	state->req->async.fn      = lock_completion;
 }
 
@@ -222,7 +222,7 @@ static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te
 */
 static void lock_completion(struct smbcli_request *req)
 {
-	struct benchlock_state *state = (struct benchlock_state *)req->async.private;
+	struct benchlock_state *state = (struct benchlock_state *)req->async.private_data;
 	NTSTATUS status = smbcli_request_simple_recv(req);
 	state->req = NULL;
 	if (!NT_STATUS_IS_OK(status)) {
@@ -262,7 +262,7 @@ static void lock_completion(struct smbcli_request *req)
 
 static void echo_completion(struct smbcli_request *req)
 {
-	struct benchlock_state *state = (struct benchlock_state *)req->async.private;
+	struct benchlock_state *state = (struct benchlock_state *)req->async.private_data;
 	NTSTATUS status = smbcli_request_simple_recv(req);
 	if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) ||
 	    NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT)) {
@@ -305,7 +305,7 @@ static void report_rate(struct tevent_context *ev, struct tevent_timer *te,
 		p.in.size = 0;
 		p.in.data = NULL;
 		req = smb_raw_echo_send(state[i].tree->session->transport, &p);
-		req->async.private = &state[i];
+		req->async.private_data = &state[i];
 		req->async.fn      = echo_completion;
 	}
 }
diff --git a/source4/torture/raw/offline.c b/source4/torture/raw/offline.c
index 2d97efa049..5322f471a2 100644
--- a/source4/torture/raw/offline.c
+++ b/source4/torture/raw/offline.c
@@ -159,7 +159,7 @@ static void savefile_callback(struct composite_context *ctx)
  */
 static void setoffline_callback(struct smbcli_request *req) 
 {
-	struct offline_state *state = req->async.private;
+	struct offline_state *state = req->async.private_data;
 	NTSTATUS status;
 
 	status = smbcli_request_simple_recv(req);
@@ -183,7 +183,7 @@ static void setoffline_callback(struct smbcli_request *req)
  */
 static void getoffline_callback(struct smbcli_request *req) 
 {
-	struct offline_state *state = req->async.private;
+	struct offline_state *state = req->async.private_data;
 	NTSTATUS status;
 	union smb_fileinfo io;
 
@@ -286,7 +286,7 @@ static void test_offline(struct offline_state *state)
 		}
 		
 		state->req->async.fn = setoffline_callback;
-		state->req->async.private = state;
+		state->req->async.private_data = state;
 		break;
 	}
 
@@ -303,7 +303,7 @@ static void test_offline(struct offline_state *state)
 		}
 		
 		state->req->async.fn = getoffline_callback;
-		state->req->async.private = state;
+		state->req->async.private_data = state;
 		break;
 	}
 
@@ -318,7 +318,7 @@ static void test_offline(struct offline_state *state)
 
 static void echo_completion(struct smbcli_request *req)
 {
-	struct offline_state *state = (struct offline_state *)req->async.private;
+	struct offline_state *state = (struct offline_state *)req->async.private_data;
 	NTSTATUS status = smbcli_request_simple_recv(req);
 	if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) ||
 	    NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT)) {
@@ -380,7 +380,7 @@ static void report_rate(struct tevent_context *ev, struct tevent_timer *te,
 		p.in.size = 0;
 		p.in.data = NULL;
 		req = smb_raw_echo_send(state[i].tree->session->transport, &p);
-		req->async.private = &state[i];
+		req->async.private_data = &state[i];
 		req->async.fn      = echo_completion;
 	}
 }
diff --git a/source4/torture/raw/openbench.c b/source4/torture/raw/openbench.c
index a9ce4aec0d..bdad2b16a5 100644
--- a/source4/torture/raw/openbench.c
+++ b/source4/torture/raw/openbench.c
@@ -186,7 +186,7 @@ static void next_open(struct benchopen_state *state)
 
 	state->req_open = smb_raw_open_send(state->tree, &state->open_parms);
 	state->req_open->async.fn = open_completed;
-	state->req_open->async.private = state;
+	state->req_open->async.private_data = state;
 }
 
 
@@ -203,7 +203,7 @@ static void next_close(struct benchopen_state *state)
 
 	state->req_close = smb_raw_close_send(state->tree, &state->close_parms);
 	state->req_close->async.fn = close_completed;
-	state->req_close->async.private = state;
+	state->req_close->async.private_data = state;
 }
 
 /*
@@ -211,7 +211,7 @@ static void next_close(struct benchopen_state *state)
 */
 static void open_completed(struct smbcli_request *req)
 {
-	struct benchopen_state *state = (struct benchopen_state *)req->async.private;
+	struct benchopen_state *state = (struct benchopen_state *)req->async.private_data;
 	TALLOC_CTX *tmp_ctx = talloc_new(state->mem_ctx);
 	NTSTATUS status;
 
@@ -243,7 +243,7 @@ static void open_completed(struct smbcli_request *req)
 		state->open_retries++;
 		state->req_open = smb_raw_open_send(state->tree, &state->open_parms);
 		state->req_open->async.fn = open_completed;
-		state->req_open->async.private = state;
+		state->req_open->async.private_data = state;
 		return;
 	}
 
@@ -275,7 +275,7 @@ static void open_completed(struct smbcli_request *req)
 */
 static void close_completed(struct smbcli_request *req)
 {
-	struct benchopen_state *state = (struct benchopen_state *)req->async.private;
+	struct benchopen_state *state = (struct benchopen_state *)req->async.private_data;
 	NTSTATUS status = smbcli_request_simple_recv(req);
 
 	state->req_close = NULL;
@@ -312,7 +312,7 @@ static void close_completed(struct smbcli_request *req)
 
 static void echo_completion(struct smbcli_request *req)
 {
-	struct benchopen_state *state = (struct benchopen_state *)req->async.private;
+	struct benchopen_state *state = (struct benchopen_state *)req->async.private_data;
 	NTSTATUS status = smbcli_request_simple_recv(req);
 	if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) ||
 	    NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT)) {
@@ -357,7 +357,7 @@ static void report_rate(struct tevent_context *ev, struct tevent_timer *te,
 		p.in.size = 0;
 		p.in.data = NULL;
 		req = smb_raw_echo_send(state[i].tree->session->transport, &p);
-		req->async.private = &state[i];
+		req->async.private_data = &state[i];
 		req->async.fn      = echo_completion;
 	}
 }
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 1f85725d9e..c10c49ecf3 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -166,7 +166,7 @@ static bool oplock_handler_close(struct smbcli_transport *transport, uint16_t ti
 	}
 
 	req->async.fn = oplock_handler_close_recv;
-	req->async.private = NULL;
+	req->async.private_data = NULL;
 
 	return true;
 }