s4:libcli/raw: s/private/private_data

metze

5 files changed, 34 insertions, 34 deletions

diff --git a/source4/libcli/raw/clioplock.c b/source4/libcli/raw/clioplock.c
index 47ffb6dd31..5005f878af 100644
--- a/source4/libcli/raw/clioplock.c
+++ b/source4/libcli/raw/clioplock.c
@@ -55,8 +55,8 @@ set the oplock handler for a connection
 ****************************************************************************/
 _PUBLIC_ void smbcli_oplock_handler(struct smbcli_transport *transport, 
 			bool (*handler)(struct smbcli_transport *, uint16_t, uint16_t, uint8_t, void *),
-			void *private)
+			void *private_data)
 {
 	transport->oplock.handler = handler;
-	transport->oplock.private = private;
+	transport->oplock.private = private_data;
 }
diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c
index 22e2552edc..e6f27b1159 100644
--- a/source4/libcli/raw/clitransport.c
+++ b/source4/libcli/raw/clitransport.c
@@ -35,9 +35,9 @@
 */
 static void smbcli_transport_event_handler(struct tevent_context *ev, 
 					   struct tevent_fd *fde, 
-					   uint16_t flags, void *private)
+					   uint16_t flags, void *private_data)
 {
-	struct smbcli_transport *transport = talloc_get_type(private,
+	struct smbcli_transport *transport = talloc_get_type(private_data,
 							     struct smbcli_transport);
 	if (flags & EVENT_FD_READ) {
 		packet_recv(transport->packet);
@@ -61,13 +61,13 @@ static int transport_destructor(struct smbcli_transport *transport)
 /*
   handle receive errors
 */
-static void smbcli_transport_error(void *private, NTSTATUS status)
+static void smbcli_transport_error(void *private_data, NTSTATUS status)
 {
-	struct smbcli_transport *transport = talloc_get_type(private, struct smbcli_transport);
+	struct smbcli_transport *transport = talloc_get_type(private_data, struct smbcli_transport);
 	smbcli_transport_dead(transport, status);
 }
 
-static NTSTATUS smbcli_transport_finish_recv(void *private, DATA_BLOB blob);
+static NTSTATUS smbcli_transport_finish_recv(void *private_data, DATA_BLOB blob);
 
 /*
   create a transport structure based on an established socket
@@ -308,9 +308,9 @@ again:
 }
 
 static void idle_handler(struct tevent_context *ev, 
-			 struct tevent_timer *te, struct timeval t, void *private)
+			 struct tevent_timer *te, struct timeval t, void *private_data)
 {
-	struct smbcli_transport *transport = talloc_get_type(private,
+	struct smbcli_transport *transport = talloc_get_type(private_data,
 							     struct smbcli_transport);
 	struct timeval next = timeval_add(&t, 0, transport->idle.period);
 	transport->socket->event.te = event_add_timed(transport->socket->event.ctx, 
@@ -327,10 +327,10 @@ static void idle_handler(struct tevent_context *ev,
 _PUBLIC_ void smbcli_transport_idle_handler(struct smbcli_transport *transport, 
 				   void (*idle_func)(struct smbcli_transport *, void *),
 				   uint64_t period,
-				   void *private)
+				   void *private_data)
 {
 	transport->idle.func = idle_func;
-	transport->idle.private = private;
+	transport->idle.private = private_data;
 	transport->idle.period = period;
 
 	if (transport->socket->event.te != NULL) {
@@ -347,9 +347,9 @@ _PUBLIC_ void smbcli_transport_idle_handler(struct smbcli_transport *transport,
   we have a full request in our receive buffer - match it to a pending request
   and process
  */
-static NTSTATUS smbcli_transport_finish_recv(void *private, DATA_BLOB blob)
+static NTSTATUS smbcli_transport_finish_recv(void *private_data, DATA_BLOB blob)
 {
-	struct smbcli_transport *transport = talloc_get_type(private, 
+	struct smbcli_transport *transport = talloc_get_type(private_data,
 							     struct smbcli_transport);
 	uint8_t *buffer, *hdr, *vwv;
 	int len;
@@ -542,9 +542,9 @@ _PUBLIC_ bool smbcli_transport_process(struct smbcli_transport *transport)
   handle timeouts of individual smb requests
 */
 static void smbcli_timeout_handler(struct tevent_context *ev, struct tevent_timer *te, 
-				   struct timeval t, void *private)
+				   struct timeval t, void *private_data)
 {
-	struct smbcli_request *req = talloc_get_type(private, struct smbcli_request);
+	struct smbcli_request *req = talloc_get_type(private_data, struct smbcli_request);
 
 	if (req->state == SMBCLI_REQUEST_RECV) {
 		DLIST_REMOVE(req->transport->pending_recv, req);
diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index c2269cbbc2..a0584c0aa4 100644
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -2698,7 +2698,7 @@ union smb_search_data {
 };
 
 /* Callback function passed to the raw search interface. */
-typedef bool (*smbcli_search_callback)(void *private, const union smb_search_data *file);
+typedef bool (*smbcli_search_callback)(void *private_data, const union smb_search_data *file);
 
 enum smb_search_close_level {RAW_FINDCLOSE_GENERIC, RAW_FINDCLOSE_FCLOSE, RAW_FINDCLOSE_FINDCLOSE};
 
diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index 0ab6f5650c..1b9cba8e38 100644
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/libcli/raw/libcliraw.h
@@ -149,7 +149,7 @@ struct smbcli_transport {
 	struct {
 		/* a oplock break request handler */
 		bool (*handler)(struct smbcli_transport *transport, 
-				uint16_t tid, uint16_t fnum, uint8_t level, void *private);
+				uint16_t tid, uint16_t fnum, uint8_t level, void *private_data);
 		/* private data passed to the oplock handler */
 		void *private;
 	} oplock;
@@ -328,11 +328,11 @@ struct smbcli_tree *smbcli_tree_init(struct smbcli_session *session, TALLOC_CTX
 NTSTATUS smb_raw_tcon(struct smbcli_tree *tree, TALLOC_CTX *mem_ctx, union smb_tcon *parms);
 void smbcli_oplock_handler(struct smbcli_transport *transport, 
 			bool (*handler)(struct smbcli_transport *, uint16_t, uint16_t, uint8_t, void *),
-			void *private);
+			void *private_data);
 void smbcli_transport_idle_handler(struct smbcli_transport *transport, 
 				   void (*idle_func)(struct smbcli_transport *, void *),
 				   uint64_t period,
-				   void *private);
+				   void *private_data);
 NTSTATUS smbcli_request_simple_recv(struct smbcli_request *req);
 bool smbcli_oplock_ack(struct smbcli_tree *tree, uint16_t fnum, uint16_t ack_level);
 NTSTATUS smb_raw_open(struct smbcli_tree *tree, TALLOC_CTX *mem_ctx, union smb_open *parms);
@@ -366,7 +366,7 @@ struct smbcli_request *smb_raw_echo_send(struct smbcli_transport *transport,
 					 struct smb_echo *p);
 NTSTATUS smb_raw_search_first(struct smbcli_tree *tree,
 			      TALLOC_CTX *mem_ctx,
-			      union smb_search_first *io, void *private,
+			      union smb_search_first *io, void *private_data,
 			      smbcli_search_callback callback);
 NTSTATUS smb_raw_flush(struct smbcli_tree *tree, union smb_flush *parms);
 
diff --git a/source4/libcli/raw/rawsearch.c b/source4/libcli/raw/rawsearch.c
index 99141574e2..9c90d45492 100644
--- a/source4/libcli/raw/rawsearch.c
+++ b/source4/libcli/raw/rawsearch.c
@@ -28,7 +28,7 @@
 static void smb_raw_search_backend(struct smbcli_request *req,
 				   TALLOC_CTX *mem_ctx,
 				   uint16_t count, 
-				   void *private,
+				   void *private_data,
 				   smbcli_search_callback callback)
 
 {
@@ -57,7 +57,7 @@ static void smb_raw_search_backend(struct smbcli_request *req,
 		search_data.search.size             = IVAL(p, 26);
 		smbcli_req_pull_ascii(&req->in.bufinfo, mem_ctx, &name, p+30, 13, STR_ASCII);
 		search_data.search.name = name;
-		if (!callback(private, &search_data)) {
+		if (!callback(private_data, &search_data)) {
 			break;
 		}
 		p += 43;
@@ -69,7 +69,7 @@ static void smb_raw_search_backend(struct smbcli_request *req,
 ****************************************************************************/
 static NTSTATUS smb_raw_search_first_old(struct smbcli_tree *tree,
 					 TALLOC_CTX *mem_ctx,
-					 union smb_search_first *io, void *private,
+					 union smb_search_first *io, void *private_data,
 					 smbcli_search_callback callback)
 
 {
@@ -99,7 +99,7 @@ static NTSTATUS smb_raw_search_first_old(struct smbcli_tree *tree,
 
 	if (NT_STATUS_IS_OK(req->status)) {
 		io->search_first.out.count = SVAL(req->in.vwv, VWV(0));	
-		smb_raw_search_backend(req, mem_ctx, io->search_first.out.count, private, callback);
+		smb_raw_search_backend(req, mem_ctx, io->search_first.out.count, private_data, callback);
 	}
 
 	return smbcli_request_destroy(req);
@@ -110,7 +110,7 @@ static NTSTATUS smb_raw_search_first_old(struct smbcli_tree *tree,
 ****************************************************************************/
 static NTSTATUS smb_raw_search_next_old(struct smbcli_tree *tree,
 					TALLOC_CTX *mem_ctx,
-					union smb_search_next *io, void *private,
+					union smb_search_next *io, void *private_data,
 					smbcli_search_callback callback)
 
 {
@@ -146,7 +146,7 @@ static NTSTATUS smb_raw_search_next_old(struct smbcli_tree *tree,
 
 	if (NT_STATUS_IS_OK(req->status)) {
 		io->search_next.out.count = SVAL(req->in.vwv, VWV(0));
-		smb_raw_search_backend(req, mem_ctx, io->search_next.out.count, private, callback);
+		smb_raw_search_backend(req, mem_ctx, io->search_next.out.count, private_data, callback);
 	}
 	
 	return smbcli_request_destroy(req);
@@ -682,7 +682,7 @@ static NTSTATUS smb_raw_t2search_backend(struct smbcli_tree *tree,
 					 uint16_t flags,
 					 int16_t count,
 					 DATA_BLOB *blob,
-					 void *private,
+					 void *private_data,
 					 smbcli_search_callback callback)
 
 {
@@ -703,7 +703,7 @@ static NTSTATUS smb_raw_t2search_backend(struct smbcli_tree *tree,
 
 		/* the callback function can tell us that no more will
 		   fit - in that case we stop, but it isn't an error */
-		if (!callback(private, &search_data)) {
+		if (!callback(private_data, &search_data)) {
 			break;
 		}
 
@@ -721,7 +721,7 @@ static NTSTATUS smb_raw_t2search_backend(struct smbcli_tree *tree,
  */
 _PUBLIC_ NTSTATUS smb_raw_search_first(struct smbcli_tree *tree,
 			      TALLOC_CTX *mem_ctx,
-			      union smb_search_first *io, void *private,
+			      union smb_search_first *io, void *private_data,
 			      smbcli_search_callback callback)
 {
 	DATA_BLOB p_blob, d_blob;
@@ -731,7 +731,7 @@ _PUBLIC_ NTSTATUS smb_raw_search_first(struct smbcli_tree *tree,
 	case RAW_SEARCH_SEARCH:
 	case RAW_SEARCH_FFIRST:
 	case RAW_SEARCH_FUNIQUE:
-		return smb_raw_search_first_old(tree, mem_ctx, io, private, callback);
+		return smb_raw_search_first_old(tree, mem_ctx, io, private_data, callback);
 
 	case RAW_SEARCH_TRANS2:
 		break;
@@ -760,7 +760,7 @@ _PUBLIC_ NTSTATUS smb_raw_search_first(struct smbcli_tree *tree,
 	status = smb_raw_t2search_backend(tree, mem_ctx,
 					  io->generic.data_level, 
 					  io->t2ffirst.in.flags, io->t2ffirst.out.count,
-					  &d_blob, private, callback);
+					  &d_blob, private_data, callback);
 	
 	return status;
 }
@@ -769,7 +769,7 @@ _PUBLIC_ NTSTATUS smb_raw_search_first(struct smbcli_tree *tree,
  */
 NTSTATUS smb_raw_search_next(struct smbcli_tree *tree,
 			     TALLOC_CTX *mem_ctx,
-			     union smb_search_next *io, void *private,
+			     union smb_search_next *io, void *private_data,
 			     smbcli_search_callback callback)
 {
 	DATA_BLOB p_blob, d_blob;
@@ -778,7 +778,7 @@ NTSTATUS smb_raw_search_next(struct smbcli_tree *tree,
 	switch (io->generic.level) {
 	case RAW_SEARCH_SEARCH:
 	case RAW_SEARCH_FFIRST:
-		return smb_raw_search_next_old(tree, mem_ctx, io, private, callback);
+		return smb_raw_search_next_old(tree, mem_ctx, io, private_data, callback);
 
 	case RAW_SEARCH_FUNIQUE:
 		return NT_STATUS_INVALID_LEVEL;
@@ -809,7 +809,7 @@ NTSTATUS smb_raw_search_next(struct smbcli_tree *tree,
 	status = smb_raw_t2search_backend(tree, mem_ctx,
 					  io->generic.data_level, 
 					  io->t2fnext.in.flags, io->t2fnext.out.count,
-					  &d_blob, private, callback);
+					  &d_blob, private_data, callback);
 	
 	return status;
 }