sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

[PATCH] composite: make it possible to call composite_is_ok() without callback fn

Browse Source 
metze
(This used to be commit 4e459f1fb3)
This commit is contained in:
Stefan Metzmacher 2008-02-12 12:16:38 +01:00 committed by Kai Blin
parent 69d6dd1923
commit e08a78abcd
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source4/libcli/composite/composite.c
View File

@ -64,23 +64,6 @@ _PUBLIC_ NTSTATUS composite_wait(struct composite_context *c)
return c->status;
}
/*
* Some composite helpers that are handy if you write larger composite
* functions.
*/
_PUBLIC_ bool composite_is_ok(struct composite_context *ctx)
{
if (NT_STATUS_IS_OK(ctx->status)) {
return true;
}
ctx->state = COMPOSITE_STATE_ERROR;
if (ctx->async.fn != NULL) {
ctx->async.fn(ctx);
}
return false;
}
/*
callback from composite_done() and composite_error()
@ -110,7 +93,10 @@ _PUBLIC_ void composite_error(struct composite_context *ctx, NTSTATUS status)
event_add_timed(ctx->event_ctx, ctx, timeval_zero(), composite_trigger, ctx);
}
ctx->status = status;
SMB_ASSERT(!composite_is_ok(ctx));
ctx->state = COMPOSITE_STATE_ERROR;
if (ctx->async.fn != NULL) {
ctx->async.fn(ctx);
}
}
_PUBLIC_ bool composite_nomem(const void *p, struct composite_context *ctx)
@ -122,6 +108,15 @@ _PUBLIC_ bool composite_nomem(const void *p, struct composite_context *ctx)
return true;
}
_PUBLIC_ bool composite_is_ok(struct composite_context *ctx)
{
if (NT_STATUS_IS_OK(ctx->status)) {
return true;
}
composite_error(ctx, ctx->status);
return false;
}
_PUBLIC_ void composite_done(struct composite_context *ctx)
{
if (!ctx->used_wait && !ctx->async.fn) {