diff options
| -rw-r--r-- | source4/libcli/dgram/dgramsocket.c | 8 | ||||
| -rw-r--r-- | source4/libcli/dgram/libdgram.h | 6 | ||||
| -rw-r--r-- | source4/libcli/dgram/mailslot.c | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/source4/libcli/dgram/dgramsocket.c b/source4/libcli/dgram/dgramsocket.c index 5c878f19fa..1a5cc6dce8 100644 --- a/source4/libcli/dgram/dgramsocket.c +++ b/source4/libcli/dgram/dgramsocket.c @@ -140,9 +140,9 @@ static void dgm_socket_send(struct nbt_dgram_socket *dgmsock) handle fd events on a nbt_dgram_socket */ static void dgm_socket_handler(struct tevent_context *ev, struct tevent_fd *fde, - uint16_t flags, void *private) + uint16_t flags, void *private_data) { - struct nbt_dgram_socket *dgmsock = talloc_get_type(private, + struct nbt_dgram_socket *dgmsock = talloc_get_type(private_data, struct nbt_dgram_socket); if (flags & EVENT_FD_WRITE) { dgm_socket_send(dgmsock); @@ -200,10 +200,10 @@ NTSTATUS dgram_set_incoming_handler(struct nbt_dgram_socket *dgmsock, void (*handler)(struct nbt_dgram_socket *, struct nbt_dgram_packet *, struct socket_address *), - void *private) + void *private_data) { dgmsock->incoming.handler = handler; - dgmsock->incoming.private = private; + dgmsock->incoming.private = private_data; EVENT_FD_READABLE(dgmsock->fde); return NT_STATUS_OK; } diff --git a/source4/libcli/dgram/libdgram.h b/source4/libcli/dgram/libdgram.h index 8060d8cf53..b303afa6dc 100644 --- a/source4/libcli/dgram/libdgram.h +++ b/source4/libcli/dgram/libdgram.h @@ -91,7 +91,7 @@ NTSTATUS dgram_set_incoming_handler(struct nbt_dgram_socket *dgmsock, void (*handler)(struct nbt_dgram_socket *, struct nbt_dgram_packet *, struct socket_address *), - void *private); + void *private_data); struct nbt_dgram_socket *nbt_dgram_socket_init(TALLOC_CTX *mem_ctx, struct tevent_context *event_ctx, struct smb_iconv_convenience *); @@ -102,11 +102,11 @@ struct dgram_mailslot_handler *dgram_mailslot_find(struct nbt_dgram_socket *dgms struct dgram_mailslot_handler *dgram_mailslot_listen(struct nbt_dgram_socket *dgmsock, const char *mailslot_name, dgram_mailslot_handler_t handler, - void *private); + void *private_data); struct dgram_mailslot_handler *dgram_mailslot_temp(struct nbt_dgram_socket *dgmsock, const char *mailslot_name, dgram_mailslot_handler_t handler, - void *private); + void *private_data); DATA_BLOB dgram_mailslot_data(struct nbt_dgram_packet *dgram); diff --git a/source4/libcli/dgram/mailslot.c b/source4/libcli/dgram/mailslot.c index 3bd587aa54..bc607e3b24 100644 --- a/source4/libcli/dgram/mailslot.c +++ b/source4/libcli/dgram/mailslot.c @@ -52,7 +52,7 @@ static int dgram_mailslot_destructor(struct dgram_mailslot_handler *dgmslot) struct dgram_mailslot_handler *dgram_mailslot_listen(struct nbt_dgram_socket *dgmsock, const char *mailslot_name, dgram_mailslot_handler_t handler, - void *private) + void *private_data) { struct dgram_mailslot_handler *dgmslot; @@ -66,7 +66,7 @@ struct dgram_mailslot_handler *dgram_mailslot_listen(struct nbt_dgram_socket *dg return NULL; } dgmslot->handler = handler; - dgmslot->private = private; + dgmslot->private = private_data; DLIST_ADD(dgmsock->mailslot_handlers, dgmslot); talloc_set_destructor(dgmslot, dgram_mailslot_destructor); @@ -115,7 +115,7 @@ const char *dgram_mailslot_name(struct nbt_dgram_packet *packet) struct dgram_mailslot_handler *dgram_mailslot_temp(struct nbt_dgram_socket *dgmsock, const char *mailslot_name, dgram_mailslot_handler_t handler, - void *private) + void *private_data) { char *name; int i; @@ -131,7 +131,7 @@ struct dgram_mailslot_handler *dgram_mailslot_temp(struct nbt_dgram_socket *dgms talloc_free(name); return NULL; } - dgmslot = dgram_mailslot_listen(dgmsock, name, handler, private); + dgmslot = dgram_mailslot_listen(dgmsock, name, handler, private_data); talloc_free(name); if (dgmslot != NULL) { return dgmslot; |