sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

r20670: Make the logic more clear

Browse Source
This commit is contained in:
Simo Sorce 2007-01-10 22:31:42 +00:00 committed by Gerald (Jerry) Carter
parent 03de577059
commit 906630f18e
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
source/lib/ldb/modules/asq.c
View File

@ -339,22 +339,25 @@ static int asq_search_continue(struct ldb_handle *handle)
handle->status = ac->base_req->handle->status;
goto done;
}
if (ac->base_req->handle->state != LDB_ASYNC_DONE) {
return LDB_SUCCESS;
if (ac->base_req->handle->state == LDB_ASYNC_DONE) {
/* build up the requests call chain */
ret = asq_build_multiple_requests(ac, handle);
if (ret != LDB_SUCCESS) {
return ret;
}
if (handle->state == LDB_ASYNC_DONE) {
return LDB_SUCCESS;
}
ac->step = ASQ_SEARCH_MULTI;
return ldb_request(ac->module->ldb, ac->reqs[ac->cur_req]);
}
/* build up the requests call chain */
ret = asq_build_multiple_requests(ac, handle);
if (ret != LDB_SUCCESS) {
return ret;
}
if (handle->state == LDB_ASYNC_DONE) {
return LDB_SUCCESS;
}
ac->step = ASQ_SEARCH_MULTI;
return ldb_request(ac->module->ldb, ac->reqs[ac->cur_req]);
/* request still pending, return to cycle again */
return LDB_SUCCESS;
case ASQ_SEARCH_MULTI:
@ -371,13 +374,16 @@ static int asq_search_continue(struct ldb_handle *handle)
if (ac->reqs[ac->cur_req]->handle->state == LDB_ASYNC_DONE) {
ac->cur_req++;
if (ac->cur_req >= ac->num_reqs) {
return asq_terminate(handle);
if (ac->cur_req < ac->num_reqs) {
return ldb_request(ac->module->ldb, ac->reqs[ac->cur_req]);
}
return ldb_request(ac->module->ldb, ac->reqs[ac->cur_req]);
return asq_terminate(handle);
}
/* request still pending, return to cycle again */
return LDB_SUCCESS;
default:
ret = LDB_ERR_OPERATIONS_ERROR;
break;