summaryrefslogtreecommitdiff
path: root/source4/libcli/cldap
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-02-02 08:22:40 +0100
committerStefan Metzmacher <metze@samba.org>2009-02-02 13:08:26 +0100
commitea7ea27f2f5d729629cf326424ea8b1123b9fc6e (patch)
tree8dcef72bb1e417a6f4700169ee70a6d9bea5441d /source4/libcli/cldap
parent79ae2de00135b3047dcb835c14a3afac6eb168eb (diff)
downloadsamba-ea7ea27f2f5d729629cf326424ea8b1123b9fc6e.tar.gz
samba-ea7ea27f2f5d729629cf326424ea8b1123b9fc6e.tar.bz2
samba-ea7ea27f2f5d729629cf326424ea8b1123b9fc6e.zip
s4:libcli/cldap: s/private/private_data
metze
Diffstat (limited to 'source4/libcli/cldap')
-rw-r--r--source4/libcli/cldap/cldap.c12
-rw-r--r--source4/libcli/cldap/cldap.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c
index 556f9bcec3..d9a6c970b9 100644
--- a/source4/libcli/cldap/cldap.c
+++ b/source4/libcli/cldap/cldap.c
@@ -146,9 +146,9 @@ static void cldap_socket_recv(struct cldap_socket *cldap)
*/
static void cldap_request_timeout(struct tevent_context *event_ctx,
struct tevent_timer *te, struct timeval t,
- void *private)
+ void *private_data)
{
- struct cldap_request *req = talloc_get_type(private, struct cldap_request);
+ struct cldap_request *req = talloc_get_type(private_data, struct cldap_request);
/* possibly try again */
if (req->num_retries != 0) {
@@ -224,9 +224,9 @@ static void cldap_socket_send(struct cldap_socket *cldap)
handle fd events on a cldap_socket
*/
static void cldap_socket_handler(struct tevent_context *ev, struct tevent_fd *fde,
- uint16_t flags, void *private)
+ uint16_t flags, void *private_data)
{
- struct cldap_socket *cldap = talloc_get_type(private, struct cldap_socket);
+ struct cldap_socket *cldap = talloc_get_type(private_data, struct cldap_socket);
if (flags & EVENT_FD_WRITE) {
cldap_socket_send(cldap);
}
@@ -282,10 +282,10 @@ failed:
NTSTATUS cldap_set_incoming_handler(struct cldap_socket *cldap,
void (*handler)(struct cldap_socket *, struct ldap_message *,
struct socket_address *),
- void *private)
+ void *private_data)
{
cldap->incoming.handler = handler;
- cldap->incoming.private = private;
+ cldap->incoming.private = private_data;
EVENT_FD_READABLE(cldap->fde);
return NT_STATUS_OK;
}
diff --git a/source4/libcli/cldap/cldap.h b/source4/libcli/cldap/cldap.h
index 17e88716c5..1841e82540 100644
--- a/source4/libcli/cldap/cldap.h
+++ b/source4/libcli/cldap/cldap.h
@@ -117,7 +117,7 @@ struct cldap_socket *cldap_socket_init(TALLOC_CTX *mem_ctx,
NTSTATUS cldap_set_incoming_handler(struct cldap_socket *cldap,
void (*handler)(struct cldap_socket *, struct ldap_message *,
struct socket_address *),
- void *private);
+ void *private_data);
struct cldap_request *cldap_search_send(struct cldap_socket *cldap,
struct cldap_search *io);
NTSTATUS cldap_search_recv(struct cldap_request *req, TALLOC_CTX *mem_ctx,