sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s4:libcli/dgram: s/private/private_data

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2009-02-02 08:24:00 +01:00
parent 8d37900828
commit 0db079b9eb
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source4/libcli/dgram/dgramsocket.c
View File

@ -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;
}

6
source4/libcli/dgram/libdgram.h
View File

@ -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);

8
source4/libcli/dgram/mailslot.c
View File

@ -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;