summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-02-01 00:03:47 +0100
committerStefan Metzmacher <metze@samba.org>2009-02-01 00:17:20 +0100
commit5f13710ced2565355c3cdcef04067cacdf74a9ad (patch)
tree577f87ed1495048eba1f5321f94e11581a42aa5c /source4/libcli
parent96f176dbd84090fd18b8c796f869ddaa2da39e59 (diff)
downloadsamba-5f13710ced2565355c3cdcef04067cacdf74a9ad.tar.gz
samba-5f13710ced2565355c3cdcef04067cacdf74a9ad.tar.bz2
samba-5f13710ced2565355c3cdcef04067cacdf74a9ad.zip
s4:irpc: avoid c++ reserved word 'private'
metze
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/composite/composite.c2
-rw-r--r--source4/libcli/finddcs.c2
-rw-r--r--source4/libcli/wbclient/wbclient.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/source4/libcli/composite/composite.c b/source4/libcli/composite/composite.c
index aff8f79481..a6b1c68d1c 100644
--- a/source4/libcli/composite/composite.c
+++ b/source4/libcli/composite/composite.c
@@ -184,7 +184,7 @@ _PUBLIC_ void composite_continue_irpc(struct composite_context *ctx,
{
if (composite_nomem(new_req, ctx)) return;
new_req->async.fn = continuation;
- new_req->async.private = private_data;
+ new_req->async.private_data = private_data;
}
_PUBLIC_ void composite_continue_smb(struct composite_context *ctx,
diff --git a/source4/libcli/finddcs.c b/source4/libcli/finddcs.c
index 6e531391a6..2e4fad9332 100644
--- a/source4/libcli/finddcs.c
+++ b/source4/libcli/finddcs.c
@@ -174,7 +174,7 @@ static void finddcs_name_resolved(struct composite_context *ctx)
static void finddcs_getdc_replied(struct irpc_request *ireq)
{
struct finddcs_state *state =
- talloc_get_type(ireq->async.private, struct finddcs_state);
+ talloc_get_type(ireq->async.private_data, struct finddcs_state);
state->ctx->status = irpc_call_recv(ireq);
if (!composite_is_ok(state->ctx)) return;
diff --git a/source4/libcli/wbclient/wbclient.c b/source4/libcli/wbclient/wbclient.c
index b881e32f7b..da7d678da9 100644
--- a/source4/libcli/wbclient/wbclient.c
+++ b/source4/libcli/wbclient/wbclient.c
@@ -117,7 +117,7 @@ struct composite_context *wbc_sids_to_xids_send(struct wbc_context *wbc_ctx,
static void sids_to_xids_recv_ids(struct irpc_request *req)
{
struct wbc_idmap_state *state = talloc_get_type_abort(
- req->async.private,
+ req->async.private_data,
struct wbc_idmap_state);
state->ctx->status = irpc_call_recv(state->irpc_req);
@@ -183,7 +183,7 @@ struct composite_context *wbc_xids_to_sids_send(struct wbc_context *wbc_ctx,
static void xids_to_sids_recv_ids(struct irpc_request *req)
{
struct wbc_idmap_state *state = talloc_get_type_abort(
- req->async.private,
+ req->async.private_data,
struct wbc_idmap_state);
state->ctx->status = irpc_call_recv(state->irpc_req);