s4:torture: s/private/private_data

metze

5 files changed, 25 insertions, 25 deletions

diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 0677d9ac8e..428be25503 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -125,9 +125,9 @@ static struct smb2_handle bad_smb2_handle;
 
 static bool oplock_handler_smb2(struct smb2_transport *transport, const struct smb2_handle *handle,
 				uint8_t level, void *private_data);
-static void idle_func_smb2(struct smb2_transport *transport, void *private);
-static bool oplock_handler_smb(struct smbcli_transport *transport, uint16_t tid, uint16_t fnum, uint8_t level, void *private);
-static void idle_func_smb(struct smbcli_transport *transport, void *private);
+static void idle_func_smb2(struct smb2_transport *transport, void *private_data);
+static bool oplock_handler_smb(struct smbcli_transport *transport, uint16_t tid, uint16_t fnum, uint8_t level, void *private_data);
+static void idle_func_smb(struct smbcli_transport *transport, void *private_data);
 
 /*
   check if a string should be ignored. This is used as the basis
@@ -976,7 +976,7 @@ static void oplock_handler_close_recv_smb(struct smbcli_request *req)
 /*
   the oplock handler will either ack the break or close the file
 */
-static bool oplock_handler_smb(struct smbcli_transport *transport, uint16_t tid, uint16_t fnum, uint8_t level, void *private)
+static bool oplock_handler_smb(struct smbcli_transport *transport, uint16_t tid, uint16_t fnum, uint8_t level, void *private_data)
 {
 	union smb_close io;
 	int i, j;
@@ -1035,7 +1035,7 @@ static bool oplock_handler_smb(struct smbcli_transport *transport, uint16_t tid,
   an operation on another connection blocking until that break is acked
   we check for operations on all transports in the idle function
 */
-static void idle_func_smb(struct smbcli_transport *transport, void *private)
+static void idle_func_smb(struct smbcli_transport *transport, void *private_data)
 {
 	int i, j;
 	for (i=0;i<NSERVERS;i++) {
@@ -1155,7 +1155,7 @@ static bool oplock_handler_smb2(struct smb2_transport *transport, const struct s
   an operation on another connection blocking until that break is acked
   we check for operations on all transports in the idle function
 */
-static void idle_func_smb2(struct smb2_transport *transport, void *private)
+static void idle_func_smb2(struct smb2_transport *transport, void *private_data)
 {
 	int i, j;
 	for (i=0;i<NSERVERS;i++) {
diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c
index be09018acf..fa5fe5d2d6 100644
--- a/source4/torture/nbench/nbio.c
+++ b/source4/torture/nbench/nbio.c
@@ -384,9 +384,9 @@ static struct smbcli_state *c;
   a handler function for oplock break requests
 */
 static bool oplock_handler(struct smbcli_transport *transport, uint16_t tid, 
-			   uint16_t fnum, uint8_t level, void *private)
+			   uint16_t fnum, uint8_t level, void *private_data)
 {
-	struct smbcli_tree *tree = (struct smbcli_tree *)private;
+	struct smbcli_tree *tree = (struct smbcli_tree *)private_data;
 	return smbcli_oplock_ack(tree, fnum, OPLOCK_BREAK_TO_NONE);
 }
 
@@ -906,7 +906,7 @@ bool nb_qfsinfo(int level, NTSTATUS status)
 }
 
 /* callback function used for trans2 search */
-static bool findfirst_callback(void *private, const union smb_search_data *file)
+static bool findfirst_callback(void *private_data, const union smb_search_data *file)
 {
 	return true;
 }
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index d31d841e13..1f85725d9e 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -74,9 +74,9 @@ static struct {
 */
 static bool oplock_handler_ack_to_given(struct smbcli_transport *transport,
 					uint16_t tid, uint16_t fnum,
-					uint8_t level, void *private)
+					uint8_t level, void *private_data)
 {
-	struct smbcli_tree *tree = (struct smbcli_tree *)private;
+	struct smbcli_tree *tree = (struct smbcli_tree *)private_data;
 	const char *name;
 
 	break_info.fnum = fnum;
@@ -105,9 +105,9 @@ static bool oplock_handler_ack_to_given(struct smbcli_transport *transport,
 */
 static bool oplock_handler_ack_to_none(struct smbcli_transport *transport, 
 				       uint16_t tid, uint16_t fnum, 
-				       uint8_t level, void *private)
+				       uint8_t level, void *private_data)
 {
-	struct smbcli_tree *tree = (struct smbcli_tree *)private;
+	struct smbcli_tree *tree = (struct smbcli_tree *)private_data;
 	break_info.fnum = fnum;
 	break_info.level = level;
 	break_info.count++;
@@ -122,7 +122,7 @@ static bool oplock_handler_ack_to_none(struct smbcli_transport *transport,
 */
 static bool oplock_handler_timeout(struct smbcli_transport *transport,
 				   uint16_t tid, uint16_t fnum,
-				   uint8_t level, void *private)
+				   uint8_t level, void *private_data)
 {
 	break_info.fnum = fnum;
 	break_info.level = level;
@@ -146,10 +146,10 @@ static void oplock_handler_close_recv(struct smbcli_request *req)
   a handler function for oplock break requests - close the file
 */
 static bool oplock_handler_close(struct smbcli_transport *transport, uint16_t tid, 
-				 uint16_t fnum, uint8_t level, void *private)
+				 uint16_t fnum, uint8_t level, void *private_data)
 {
 	union smb_close io;
-	struct smbcli_tree *tree = (struct smbcli_tree *)private;
+	struct smbcli_tree *tree = (struct smbcli_tree *)private_data;
 	struct smbcli_request *req;
 
 	break_info.fnum = fnum;
@@ -2999,9 +2999,9 @@ static struct hold_oplock_info {
 
 static bool oplock_handler_hold(struct smbcli_transport *transport, 
 				uint16_t tid, uint16_t fnum, uint8_t level, 
-				void *private)
+				void *private_data)
 {
-	struct smbcli_tree *tree = (struct smbcli_tree *)private;
+	struct smbcli_tree *tree = (struct smbcli_tree *)private_data;
 	struct hold_oplock_info *info;
 	int i;
 
@@ -3019,7 +3019,7 @@ static bool oplock_handler_hold(struct smbcli_transport *transport,
 	if (info->close_on_break) {
 		printf("oplock break on %s - closing\n",
 		       info->fname);
-		oplock_handler_close(transport, tid, fnum, level, private);
+		oplock_handler_close(transport, tid, fnum, level, private_data);
 		return true;
 	}
 
diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c
index 2a6aef20b5..8a3168dcc4 100644
--- a/source4/torture/raw/search.c
+++ b/source4/torture/raw/search.c
@@ -31,9 +31,9 @@
 /*
   callback function for single_search
 */
-static bool single_search_callback(void *private, const union smb_search_data *file)
+static bool single_search_callback(void *private_data, const union smb_search_data *file)
 {
-	union smb_search_data *data = (union smb_search_data *)private;
+	union smb_search_data *data = (union smb_search_data *)private_data;
 
 	*data = *file;
 
@@ -510,9 +510,9 @@ struct multiple_result {
 /*
   callback function for multiple_search
 */
-static bool multiple_search_callback(void *private, const union smb_search_data *file)
+static bool multiple_search_callback(void *private_data, const union smb_search_data *file)
 {
-	struct multiple_result *data = (struct multiple_result *)private;
+	struct multiple_result *data = (struct multiple_result *)private_data;
 
 
 	data->count++;
diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c
index d0a2c3d041..30fe912234 100644
--- a/source4/torture/unix/unix_info2.c
+++ b/source4/torture/unix/unix_info2.c
@@ -201,9 +201,9 @@ static bool query_path_info2(void *mem_ctx,
 			-1, fname, info2);
 }
 
-static bool search_callback(void *private, const union smb_search_data *fdata)
+static bool search_callback(void *private_data, const union smb_search_data *fdata)
 {
-	struct unix_info2 *info2 = (struct unix_info2 *)private;
+	struct unix_info2 *info2 = (struct unix_info2 *)private_data;
 
 	info2->end_of_file = fdata->unix_info2.end_of_file;
 	info2->num_bytes = fdata->unix_info2.num_bytes;