diff options
| author | Simo Sorce <idra@samba.org> | 2006-07-22 16:56:33 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:10:16 -0500 |
| commit | c93817b36d3ff7f44cb7b3e1d1a29e37ec12affe (patch) | |
| tree | 70d3018287cbbe9ceee3cae3ab66ce33f32559aa /source4/lib/ldb/common/ldb.c | |
| parent | 550f5fb26e67f46eead182476f7a9bcfd1ac5dc0 (diff) | |
| download | samba-c93817b36d3ff7f44cb7b3e1d1a29e37ec12affe.tar.gz samba-c93817b36d3ff7f44cb7b3e1d1a29e37ec12affe.tar.bz2 samba-c93817b36d3ff7f44cb7b3e1d1a29e37ec12affe.zip | |
r17185: Oh, I wanted to do this for sooo long time.
Finally acknowledge that ldb is inherently async and does not have a dual personality anymore
Rename all ldb_async_XXX functions to ldb_XXX except for ldb_async_result, it is now ldb_reply
to reflect the real function of this structure.
Simo.
(This used to be commit 25fc7354049d62efeba17681ef1cdd326bc3f2ef)
Diffstat (limited to 'source4/lib/ldb/common/ldb.c')
| -rw-r--r-- | source4/lib/ldb/common/ldb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index 8e814778d1..a962aa4322 100644 --- a/source4/lib/ldb/common/ldb.c +++ b/source4/lib/ldb/common/ldb.c @@ -335,7 +335,7 @@ static int ldb_autotransaction_request(struct ldb_context *ldb, struct ldb_reque ret = ldb_request(ldb, req); if (ret == LDB_SUCCESS) { - ret = ldb_async_wait(req->async.handle, LDB_WAIT_ALL); + ret = ldb_wait(req->async.handle, LDB_WAIT_ALL); } if (ret == LDB_SUCCESS) { @@ -353,13 +353,13 @@ static int ldb_autotransaction_request(struct ldb_context *ldb, struct ldb_reque return ret; } -int ldb_async_wait(struct ldb_async_handle *handle, enum ldb_async_wait_type type) +int ldb_wait(struct ldb_handle *handle, enum ldb_wait_type type) { if (!handle) { return LDB_SUCCESS; } - return handle->module->ops->async_wait(handle, type); + return handle->module->ops->wait(handle, type); } /* set the specified timeout or, if timeout is 0 set the default timeout */ @@ -454,7 +454,7 @@ int ldb_request(struct ldb_context *ldb, struct ldb_request *req) Use talloc_free to free the ldb_message returned in 'res', if successful */ -static int ldb_search_callback(struct ldb_context *ldb, void *context, struct ldb_async_result *ares) +static int ldb_search_callback(struct ldb_context *ldb, void *context, struct ldb_reply *ares) { struct ldb_result *res; int n; @@ -563,7 +563,7 @@ int ldb_search(struct ldb_context *ldb, ret = ldb_request(ldb, req); if (ret == LDB_SUCCESS) { - ret = ldb_async_wait(req->async.handle, LDB_WAIT_ALL); + ret = ldb_wait(req->async.handle, LDB_WAIT_ALL); } if (ret != LDB_SUCCESS) { |