diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-02-01 00:03:47 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-02-01 00:17:20 +0100 |
| commit | 5f13710ced2565355c3cdcef04067cacdf74a9ad (patch) | |
| tree | 577f87ed1495048eba1f5321f94e11581a42aa5c /source4/lib | |
| parent | 96f176dbd84090fd18b8c796f869ddaa2da39e59 (diff) | |
| download | samba-5f13710ced2565355c3cdcef04067cacdf74a9ad.tar.gz samba-5f13710ced2565355c3cdcef04067cacdf74a9ad.tar.bz2 samba-5f13710ced2565355c3cdcef04067cacdf74a9ad.zip | |
s4:irpc: avoid c++ reserved word 'private'
metze
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/messaging/irpc.h | 4 | ||||
| -rw-r--r-- | source4/lib/messaging/messaging.c | 4 | ||||
| -rw-r--r-- | source4/lib/messaging/tests/irpc.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/messaging/irpc.h b/source4/lib/messaging/irpc.h index 9be8461f6a..3c518828ab 100644 --- a/source4/lib/messaging/irpc.h +++ b/source4/lib/messaging/irpc.h @@ -30,7 +30,7 @@ */ struct irpc_message { struct server_id from; - void *private; + void *private_data; struct irpc_header header; struct ndr_pull *ndr; bool defer_reply; @@ -76,7 +76,7 @@ struct irpc_request { TALLOC_CTX *mem_ctx; struct { void (*fn)(struct irpc_request *); - void *private; + void *private_data; } async; }; diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c index c27f977cce..cfceeffac7 100644 --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c @@ -109,7 +109,7 @@ static void ping_message(struct messaging_context *msg, void *private_data, static NTSTATUS irpc_uptime(struct irpc_message *msg, struct irpc_uptime *r) { - struct messaging_context *ctx = talloc_get_type(msg->private, struct messaging_context); + struct messaging_context *ctx = talloc_get_type(msg->private_data, struct messaging_context); *r->out.start_time = timeval_to_nttime(&ctx->start_time); return NT_STATUS_OK; } @@ -768,7 +768,7 @@ static void irpc_handler_request(struct messaging_context *msg_ctx, if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) goto failed; /* make the call */ - m->private = i->private_data; + m->private_data= i->private_data; m->defer_reply = false; m->msg_ctx = msg_ctx; m->irpc = i; diff --git a/source4/lib/messaging/tests/irpc.c b/source4/lib/messaging/tests/irpc.c index 42a811d116..3eb23e0f7d 100644 --- a/source4/lib/messaging/tests/irpc.c +++ b/source4/lib/messaging/tests/irpc.c @@ -145,7 +145,7 @@ static bool test_echodata(struct torture_context *tctx, static void irpc_callback(struct irpc_request *irpc) { struct echo_AddOne *r = (struct echo_AddOne *)irpc->r; - int *pong_count = (int *)irpc->async.private; + int *pong_count = (int *)irpc->async.private_data; NTSTATUS status = irpc_call_recv(irpc); if (!NT_STATUS_IS_OK(status)) { printf("irpc call failed - %s\n", nt_errstr(status)); @@ -186,7 +186,7 @@ static bool test_speed(struct torture_context *tctx, torture_assert(tctx, irpc != NULL, "AddOne send failed"); irpc->async.fn = irpc_callback; - irpc->async.private = &pong_count; + irpc->async.private_data = &pong_count; ping_count++; |