From 5bf95a71ddfeb6d2a77d7b4f488a4f5cf57f00f0 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 2 Feb 2009 08:39:45 +0100 Subject: s4:smb_server: s/private/private_data metze --- source4/smb_server/smb/receive.c | 4 ++-- source4/smb_server/smb/search.c | 4 ++-- source4/smb_server/smb/trans2.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source4/smb_server/smb') diff --git a/source4/smb_server/smb/receive.c b/source4/smb_server/smb/receive.c index 0afa3a652d..03631f8f0b 100644 --- a/source4/smb_server/smb/receive.c +++ b/source4/smb_server/smb/receive.c @@ -351,9 +351,9 @@ static const struct smb_message_struct receive a SMB request header from the wire, forming a request_context from the result ****************************************************************************/ -NTSTATUS smbsrv_recv_smb_request(void *private, DATA_BLOB blob) +NTSTATUS smbsrv_recv_smb_request(void *private_data, DATA_BLOB blob) { - struct smbsrv_connection *smb_conn = talloc_get_type(private, struct smbsrv_connection); + struct smbsrv_connection *smb_conn = talloc_get_type(private_data, struct smbsrv_connection); struct smbsrv_request *req; struct timeval cur_time = timeval_current(); uint8_t command; diff --git a/source4/smb_server/smb/search.c b/source4/smb_server/smb/search.c index 90b2331271..bf4721757b 100644 --- a/source4/smb_server/smb/search.c +++ b/source4/smb_server/smb/search.c @@ -65,9 +65,9 @@ static bool find_fill_info(struct smbsrv_request *req, } /* callback function for search first/next */ -static bool find_callback(void *private, const union smb_search_data *file) +static bool find_callback(void *private_data, const union smb_search_data *file) { - struct search_state *state = (struct search_state *)private; + struct search_state *state = (struct search_state *)private_data; return find_fill_info(state->req, file); } diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c index 40ffeeef48..e0f6438dc6 100644 --- a/source4/smb_server/smb/trans2.c +++ b/source4/smb_server/smb/trans2.c @@ -800,9 +800,9 @@ static NTSTATUS find_fill_info(struct find_state *state, } /* callback function for trans2 findfirst/findnext */ -static bool find_callback(void *private, const union smb_search_data *file) +static bool find_callback(void *private_data, const union smb_search_data *file) { - struct find_state *state = talloc_get_type(private, struct find_state); + struct find_state *state = talloc_get_type(private_data, struct find_state); struct smb_trans2 *trans = state->op->trans; uint_t old_length; -- cgit