summaryrefslogtreecommitdiff
path: root/source4/libcli/nbt
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-09-23 09:02:16 +0200
committerGünther Deschner <gd@samba.org>2008-09-23 09:37:24 +0200
commit13a3971438fb12d60aa0eaf88d22019a5e4f67cd (patch)
treea5682223bfce97e5815a3f383cb7d3c088b96195 /source4/libcli/nbt
parentc48186f507219e8732f02bdc2f835a7d8d02541c (diff)
downloadsamba-13a3971438fb12d60aa0eaf88d22019a5e4f67cd.tar.gz
samba-13a3971438fb12d60aa0eaf88d22019a5e4f67cd.tar.bz2
samba-13a3971438fb12d60aa0eaf88d22019a5e4f67cd.zip
s4-nbt: use private_data instead of private.
Guenther
Diffstat (limited to 'source4/libcli/nbt')
-rw-r--r--source4/libcli/nbt/libnbt.h8
-rw-r--r--source4/libcli/nbt/namerefresh.c8
-rw-r--r--source4/libcli/nbt/nameregister.c14
-rw-r--r--source4/libcli/nbt/nbtsocket.c2
4 files changed, 16 insertions, 16 deletions
diff --git a/source4/libcli/nbt/libnbt.h b/source4/libcli/nbt/libnbt.h
index 0b01365510..ff4fe65ac8 100644
--- a/source4/libcli/nbt/libnbt.h
+++ b/source4/libcli/nbt/libnbt.h
@@ -83,7 +83,7 @@ struct nbt_name_request {
/* information on what to do on completion */
struct {
void (*fn)(struct nbt_name_request *);
- void *private;
+ void *private_data;
} async;
};
@@ -113,14 +113,14 @@ struct nbt_name_socket {
struct {
void (*handler)(struct nbt_name_socket *, struct nbt_name_packet *,
struct socket_address *);
- void *private;
+ void *private_data;
} incoming;
/* what to do with unexpected replies */
struct {
void (*handler)(struct nbt_name_socket *, struct nbt_name_packet *,
struct socket_address *);
- void *private;
+ void *private_data;
} unexpected;
};
@@ -323,7 +323,7 @@ NTSTATUS nbt_name_refresh_recv(struct nbt_name_request *req,
NTSTATUS nbt_set_incoming_handler(struct nbt_name_socket *nbtsock,
void (*handler)(struct nbt_name_socket *, struct nbt_name_packet *,
struct socket_address *),
- void *private);
+ void *private_data);
NTSTATUS nbt_name_reply_send(struct nbt_name_socket *nbtsock,
struct socket_address *dest,
struct nbt_name_packet *request);
diff --git a/source4/libcli/nbt/namerefresh.c b/source4/libcli/nbt/namerefresh.c
index b372e4a3f3..b939c97740 100644
--- a/source4/libcli/nbt/namerefresh.c
+++ b/source4/libcli/nbt/namerefresh.c
@@ -159,7 +159,7 @@ struct refresh_wins_state {
*/
static void name_refresh_wins_handler(struct nbt_name_request *req)
{
- struct composite_context *c = talloc_get_type(req->async.private,
+ struct composite_context *c = talloc_get_type(req->async.private_data,
struct composite_context);
struct refresh_wins_state *state = talloc_get_type(c->private_data,
struct refresh_wins_state);
@@ -184,7 +184,7 @@ static void name_refresh_wins_handler(struct nbt_name_request *req)
c->status = NT_STATUS_NO_MEMORY;
} else {
state->req->async.fn = name_refresh_wins_handler;
- state->req->async.private = c;
+ state->req->async.private_data = c;
}
} else if (!NT_STATUS_IS_OK(status)) {
c->state = COMPOSITE_STATE_ERROR;
@@ -200,7 +200,7 @@ static void name_refresh_wins_handler(struct nbt_name_request *req)
c->status = NT_STATUS_NO_MEMORY;
} else {
state->req->async.fn = name_refresh_wins_handler;
- state->req->async.private = c;
+ state->req->async.private_data = c;
}
} else {
c->state = COMPOSITE_STATE_DONE;
@@ -259,7 +259,7 @@ _PUBLIC_ struct composite_context *nbt_name_refresh_wins_send(struct nbt_name_so
if (state->req == NULL) goto failed;
state->req->async.fn = name_refresh_wins_handler;
- state->req->async.private = c;
+ state->req->async.private_data = c;
c->private_data = state;
c->state = COMPOSITE_STATE_IN_PROGRESS;
diff --git a/source4/libcli/nbt/nameregister.c b/source4/libcli/nbt/nameregister.c
index 9c5ae43d40..c50f9b3b3a 100644
--- a/source4/libcli/nbt/nameregister.c
+++ b/source4/libcli/nbt/nameregister.c
@@ -161,7 +161,7 @@ struct register_bcast_state {
*/
static void name_register_bcast_handler(struct nbt_name_request *req)
{
- struct composite_context *c = talloc_get_type(req->async.private, struct composite_context);
+ struct composite_context *c = talloc_get_type(req->async.private_data, struct composite_context);
struct register_bcast_state *state = talloc_get_type(c->private_data, struct register_bcast_state);
NTSTATUS status;
@@ -183,7 +183,7 @@ static void name_register_bcast_handler(struct nbt_name_request *req)
c->status = NT_STATUS_NO_MEMORY;
} else {
state->req->async.fn = name_register_bcast_handler;
- state->req->async.private = c;
+ state->req->async.private_data = c;
}
} else if (!NT_STATUS_IS_OK(status)) {
c->state = COMPOSITE_STATE_ERROR;
@@ -241,7 +241,7 @@ _PUBLIC_ struct composite_context *nbt_name_register_bcast_send(struct nbt_name_
if (state->req == NULL) goto failed;
state->req->async.fn = name_register_bcast_handler;
- state->req->async.private = c;
+ state->req->async.private_data = c;
c->private_data = state;
c->state = COMPOSITE_STATE_IN_PROGRESS;
@@ -297,7 +297,7 @@ struct register_wins_state {
*/
static void name_register_wins_handler(struct nbt_name_request *req)
{
- struct composite_context *c = talloc_get_type(req->async.private,
+ struct composite_context *c = talloc_get_type(req->async.private_data,
struct composite_context);
struct register_wins_state *state = talloc_get_type(c->private_data,
struct register_wins_state);
@@ -322,7 +322,7 @@ static void name_register_wins_handler(struct nbt_name_request *req)
c->status = NT_STATUS_NO_MEMORY;
} else {
state->req->async.fn = name_register_wins_handler;
- state->req->async.private = c;
+ state->req->async.private_data = c;
}
} else if (!NT_STATUS_IS_OK(status)) {
c->state = COMPOSITE_STATE_ERROR;
@@ -338,7 +338,7 @@ static void name_register_wins_handler(struct nbt_name_request *req)
c->status = NT_STATUS_NO_MEMORY;
} else {
state->req->async.fn = name_register_wins_handler;
- state->req->async.private = c;
+ state->req->async.private_data = c;
}
} else {
c->state = COMPOSITE_STATE_DONE;
@@ -399,7 +399,7 @@ _PUBLIC_ struct composite_context *nbt_name_register_wins_send(struct nbt_name_s
if (state->req == NULL) goto failed;
state->req->async.fn = name_register_wins_handler;
- state->req->async.private = c;
+ state->req->async.private_data = c;
c->private_data = state;
c->state = COMPOSITE_STATE_IN_PROGRESS;
diff --git a/source4/libcli/nbt/nbtsocket.c b/source4/libcli/nbt/nbtsocket.c
index 5d4611e2d9..49f175b8a3 100644
--- a/source4/libcli/nbt/nbtsocket.c
+++ b/source4/libcli/nbt/nbtsocket.c
@@ -488,7 +488,7 @@ _PUBLIC_ NTSTATUS nbt_set_incoming_handler(struct nbt_name_socket *nbtsock,
void *private)
{
nbtsock->incoming.handler = handler;
- nbtsock->incoming.private = private;
+ nbtsock->incoming.private_data = private;
EVENT_FD_READABLE(nbtsock->fde);
return NT_STATUS_OK;
}