diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
| commit | 6d139ca4680abcbda5110f2f0886aa038ff62088 (patch) | |
| tree | 7d61db40fb058bcbf08ccd8e0dadc365b819371b /source4/librpc/rpc/dcerpc_sock.c | |
| parent | 4a9b3052caeb8bb144803b49dcfae82395172bc3 (diff) | |
| parent | afa960cbbcd609123d710c301e7a9a070c1fed70 (diff) | |
| download | samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.gz samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.bz2 samba-6d139ca4680abcbda5110f2f0886aa038ff62088.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts:
librpc/ndr.pc.in
Diffstat (limited to 'source4/librpc/rpc/dcerpc_sock.c')
| -rw-r--r-- | source4/librpc/rpc/dcerpc_sock.c | 14 |
1 files changed, 7 insertions, 7 deletions
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; |