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

r4936: moved to a convention where the completion function is only called in

Browse Source 
one place. This makes the code more robust, and simpler (it would have
prevented the error that volker found).
(This used to be commit 420b53091e)
This commit is contained in:
Andrew Tridgell 2005-01-23 08:16:16 +00:00 committed by Gerald (Jerry) Carter
parent 8eb0963c95
commit 0db8b5a949
2 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source4/libcli/composite/loadfile.c
View File

@ -170,9 +170,6 @@ static NTSTATUS loadfile_close(struct smbcli_composite *c,
NT_STATUS_NOT_OK_RETURN(status);
c->state = SMBCLI_REQUEST_DONE;
if (c->async.fn) {
c->async.fn(c);
}
return NT_STATUS_OK;
}
@ -185,30 +182,30 @@ static void loadfile_handler(struct smbcli_request *req)
{
struct smbcli_composite *c = req->async.private;
struct loadfile_state *state = talloc_get_type(c->private, struct loadfile_state);
NTSTATUS status;
/* when this handler is called, the stage indicates what
call has just finished */
switch (state->stage) {
case LOADFILE_OPEN:
status = loadfile_open(c, state->io);
c->status = loadfile_open(c, state->io);
break;
case LOADFILE_READ:
status = loadfile_read(c, state->io);
c->status = loadfile_read(c, state->io);
break;
case LOADFILE_CLOSE:
status = loadfile_close(c, state->io);
c->status = loadfile_close(c, state->io);
break;
}
if (!NT_STATUS_IS_OK(status)) {
c->status = status;
if (!NT_STATUS_IS_OK(c->status)) {
c->state = SMBCLI_REQUEST_ERROR;
if (c->async.fn) {
c->async.fn(c);
}
}
if (c->state >= SMBCLI_REQUEST_DONE &&
c->async.fn) {
c->async.fn(c);
}
}

21
source4/libcli/composite/savefile.c
View File

@ -171,9 +171,6 @@ static NTSTATUS savefile_close(struct smbcli_composite *c,
}
c->state = SMBCLI_REQUEST_DONE;
if (c->async.fn) {
c->async.fn(c);
}
return NT_STATUS_OK;
}
@ -186,30 +183,30 @@ static void savefile_handler(struct smbcli_request *req)
{
struct smbcli_composite *c = req->async.private;
struct savefile_state *state = talloc_get_type(c->private, struct savefile_state);
NTSTATUS status;
/* when this handler is called, the stage indicates what
call has just finished */
switch (state->stage) {
case SAVEFILE_OPEN:
status = savefile_open(c, state->io);
c->status = savefile_open(c, state->io);
break;
case SAVEFILE_WRITE:
status = savefile_write(c, state->io);
c->status = savefile_write(c, state->io);
break;
case SAVEFILE_CLOSE:
status = savefile_close(c, state->io);
c->status = savefile_close(c, state->io);
break;
}
if (!NT_STATUS_IS_OK(status)) {
c->status = status;
if (!NT_STATUS_IS_OK(c->status)) {
c->state = SMBCLI_REQUEST_ERROR;
if (c->async.fn) {
c->async.fn(c);
}
}
if (c->state >= SMBCLI_REQUEST_DONE &&
c->async.fn) {
c->async.fn(c);
}
}