summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-02-02 08:27:33 +0100
committerStefan Metzmacher <metze@samba.org>2009-02-02 13:08:29 +0100
commit74e783bf5850658124d60503d7b5d2fba8a9bb87 (patch)
tree048dd2f5126716edc7a89efee951295c7e6aaf08
parentc005bbddb713c25f3201d6007e6ef1114084d041 (diff)
downloadsamba-74e783bf5850658124d60503d7b5d2fba8a9bb87.tar.gz
samba-74e783bf5850658124d60503d7b5d2fba8a9bb87.tar.bz2
samba-74e783bf5850658124d60503d7b5d2fba8a9bb87.zip
s4:librpc/rpc: s/private/private_data
metze
-rw-r--r--source4/librpc/rpc/dcerpc.c4
-rw-r--r--source4/librpc/rpc/dcerpc_connect.c4
-rw-r--r--source4/librpc/rpc/dcerpc_sock.c14
3 files changed, 11 insertions, 11 deletions
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 45c4e78cf1..7a568d3c9e 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -653,9 +653,9 @@ static void dcerpc_bind_recv_handler(struct rpc_request *req,
handle timeouts of individual dcerpc requests
*/
static void dcerpc_timeout_handler(struct tevent_context *ev, struct tevent_timer *te,
- struct timeval t, void *private)
+ struct timeval t, void *private_data)
{
- struct rpc_request *req = talloc_get_type(private, struct rpc_request);
+ struct rpc_request *req = talloc_get_type(private_data, struct rpc_request);
if (req->ignore_timeout) {
dcerpc_req_dequeue(req);
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index 9b8503c04b..0f9fbe0abc 100644
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -709,9 +709,9 @@ static void continue_pipe_auth(struct composite_context *ctx)
handle timeouts of a dcerpc connect
*/
static void dcerpc_connect_timeout_handler(struct tevent_context *ev, struct tevent_timer *te,
- struct timeval t, void *private)
+ struct timeval t, void *private_data)
{
- struct composite_context *c = talloc_get_type(private, struct composite_context);
+ struct composite_context *c = talloc_get_type(private_data, struct composite_context);
composite_error(c, NT_STATUS_IO_TIMEOUT);
}
diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c
index 689249288f..64a5b92e90 100644
--- a/source4/librpc/rpc/dcerpc_sock.c
+++ b/source4/librpc/rpc/dcerpc_sock.c
@@ -85,9 +85,9 @@ static void sock_dead(struct dcerpc_connection *p, NTSTATUS status)
/*
handle socket recv errors
*/
-static void sock_error_handler(void *private, NTSTATUS status)
+static void sock_error_handler(void *private_data, NTSTATUS status)
{
- struct dcerpc_connection *p = talloc_get_type(private,
+ struct dcerpc_connection *p = talloc_get_type(private_data,
struct dcerpc_connection);
sock_dead(p, status);
}
@@ -95,7 +95,7 @@ static void sock_error_handler(void *private, NTSTATUS status)
/*
check if a blob is a complete packet
*/
-static NTSTATUS sock_complete_packet(void *private, DATA_BLOB blob, size_t *size)
+static NTSTATUS sock_complete_packet(void *private_data, DATA_BLOB blob, size_t *size)
{
if (blob.length < DCERPC_FRAG_LEN_OFFSET+2) {
return STATUS_MORE_ENTRIES;
@@ -110,9 +110,9 @@ static NTSTATUS sock_complete_packet(void *private, DATA_BLOB blob, size_t *size
/*
process recv requests
*/
-static NTSTATUS sock_process_recv(void *private, DATA_BLOB blob)
+static NTSTATUS sock_process_recv(void *private_data, DATA_BLOB blob)
{
- struct dcerpc_connection *p = talloc_get_type(private,
+ struct dcerpc_connection *p = talloc_get_type(private_data,
struct dcerpc_connection);
struct sock_private *sock = (struct sock_private *)p->transport.private_data;
sock->pending_reads--;
@@ -127,9 +127,9 @@ static NTSTATUS sock_process_recv(void *private, DATA_BLOB blob)
called when a IO is triggered by the events system
*/
static void sock_io_handler(struct tevent_context *ev, struct tevent_fd *fde,
- uint16_t flags, void *private)
+ uint16_t flags, void *private_data)
{
- struct dcerpc_connection *p = talloc_get_type(private,
+ struct dcerpc_connection *p = talloc_get_type(private_data,
struct dcerpc_connection);
struct sock_private *sock = (struct sock_private *)p->transport.private_data;