From d617556ef50863d6a03c81a04f0f6b05848a250e Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 10 Oct 2005 19:57:55 +0000 Subject: r10878: Reply to some comments by tridge and metze: * rename the composite helper functions from comp_* to composite_* * Move the lsa initialization to wb_connect_lsa.c * Equip smb_composite_connect with a fallback_to_anonymous The latter two simplify wb_init_domain.c quite a bit. Volker (This used to be commit deb127e04ea01ae93394da5ebffb39d81caeb6d9) --- source4/libcli/composite/composite.c | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'source4/libcli/composite') diff --git a/source4/libcli/composite/composite.c b/source4/libcli/composite/composite.c index 6458a971b4..f5eed77300 100644 --- a/source4/libcli/composite/composite.c +++ b/source4/libcli/composite/composite.c @@ -75,7 +75,7 @@ void composite_trigger_done(struct composite_context *c) * functions. */ -BOOL comp_is_ok(struct composite_context *ctx) +BOOL composite_is_ok(struct composite_context *ctx) { if (NT_STATUS_IS_OK(ctx->status)) { return True; @@ -87,22 +87,22 @@ BOOL comp_is_ok(struct composite_context *ctx) return False; } -void comp_error(struct composite_context *ctx, NTSTATUS status) +void composite_error(struct composite_context *ctx, NTSTATUS status) { ctx->status = status; - SMB_ASSERT(!comp_is_ok(ctx)); + SMB_ASSERT(!composite_is_ok(ctx)); } -BOOL comp_nomem(const void *p, struct composite_context *ctx) +BOOL composite_nomem(const void *p, struct composite_context *ctx) { if (p != NULL) { return False; } - comp_error(ctx, NT_STATUS_NO_MEMORY); + composite_error(ctx, NT_STATUS_NO_MEMORY); return True; } -void comp_done(struct composite_context *ctx) +void composite_done(struct composite_context *ctx) { ctx->state = COMPOSITE_STATE_DONE; if (ctx->async.fn != NULL) { @@ -110,32 +110,32 @@ void comp_done(struct composite_context *ctx) } } -void comp_cont(struct composite_context *ctx, - struct composite_context *new_ctx, - void (*continuation)(struct composite_context *), - void *private_data) +void composite_continue(struct composite_context *ctx, + struct composite_context *new_ctx, + void (*continuation)(struct composite_context *), + void *private_data) { - if (comp_nomem(new_ctx, ctx)) return; + if (composite_nomem(new_ctx, ctx)) return; new_ctx->async.fn = continuation; new_ctx->async.private_data = private_data; } -void rpc_cont(struct composite_context *ctx, - struct rpc_request *new_req, - void (*continuation)(struct rpc_request *), - void *private_data) +void composite_continue_rpc(struct composite_context *ctx, + struct rpc_request *new_req, + void (*continuation)(struct rpc_request *), + void *private_data) { - if (comp_nomem(new_req, ctx)) return; + if (composite_nomem(new_req, ctx)) return; new_req->async.callback = continuation; new_req->async.private = private_data; } -void irpc_cont(struct composite_context *ctx, - struct irpc_request *new_req, - void (*continuation)(struct irpc_request *), - void *private_data) +void composite_continue_irpc(struct composite_context *ctx, + struct irpc_request *new_req, + void (*continuation)(struct irpc_request *), + void *private_data) { - if (comp_nomem(new_req, ctx)) return; + if (composite_nomem(new_req, ctx)) return; new_req->async.fn = continuation; new_req->async.private = private_data; } -- cgit