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/include | |
| 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/include')
| -rw-r--r-- | source4/lib/ldb/include/ldb.h | 16 | ||||
| -rw-r--r-- | source4/lib/ldb/include/ldb_private.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h index 2f0464b953..885842ff9c 100644 --- a/source4/lib/ldb/include/ldb.h +++ b/source4/lib/ldb/include/ldb.h @@ -578,12 +578,12 @@ enum ldb_reply_type { LDB_REPLY_DONE }; -enum ldb_async_wait_type { +enum ldb_wait_type { LDB_WAIT_ALL, LDB_WAIT_NONE }; -enum ldb_async_state { +enum ldb_state { LDB_ASYNC_INIT, LDB_ASYNC_PENDING, LDB_ASYNC_DONE @@ -596,16 +596,16 @@ struct ldb_result { struct ldb_control **controls; }; -struct ldb_async_result { +struct ldb_reply { enum ldb_reply_type type; struct ldb_message *message; char *referral; struct ldb_control **controls; }; -struct ldb_async_handle { +struct ldb_handle { int status; - enum ldb_async_state state; + enum ldb_state state; void *private_data; struct ldb_module *module; }; @@ -666,17 +666,17 @@ struct ldb_request { struct { void *context; - int (*callback)(struct ldb_context *, void *, struct ldb_async_result *); + int (*callback)(struct ldb_context *, void *, struct ldb_reply *); int timeout; time_t starttime; - struct ldb_async_handle *handle; + struct ldb_handle *handle; } async; }; int ldb_request(struct ldb_context *ldb, struct ldb_request *request); -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); int ldb_set_timeout(struct ldb_context *ldb, struct ldb_request *req, int timeout); int ldb_set_timeout_from_prev_req(struct ldb_context *ldb, struct ldb_request *oldreq, struct ldb_request *newreq); diff --git a/source4/lib/ldb/include/ldb_private.h b/source4/lib/ldb/include/ldb_private.h index 2f2df1a970..1360602000 100644 --- a/source4/lib/ldb/include/ldb_private.h +++ b/source4/lib/ldb/include/ldb_private.h @@ -66,7 +66,7 @@ struct ldb_module_ops { int (*start_transaction)(struct ldb_module *); int (*end_transaction)(struct ldb_module *); int (*del_transaction)(struct ldb_module *); - int (*async_wait)(struct ldb_async_handle *, enum ldb_async_wait_type); + int (*wait)(struct ldb_handle *, enum ldb_wait_type); int (*sequence_number)(struct ldb_module *, struct ldb_request *); }; |