The branch, master has been updated via 813bd03 ldb: Move doxygen comments for ldb_connect to the right place from 95c891c dsdb: Make linked_attributes module GUID based for renames
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 813bd0353fda0eb6d7c78392d5abd3002115da96 Author: Stephen Gallagher <sgall...@redhat.com> Date: Wed Jan 2 11:22:16 2013 -0500 ldb: Move doxygen comments for ldb_connect to the right place Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Mon Jan 14 16:21:02 CET 2013 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: lib/ldb/include/ldb.h | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/ldb/include/ldb.h b/lib/ldb/include/ldb.h index b60fc9b..748def9 100644 --- a/lib/ldb/include/ldb.h +++ b/lib/ldb/include/ldb.h @@ -1033,6 +1033,18 @@ int ldb_global_init(void); */ struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx); +typedef void (*ldb_async_timeout_fn) (void *); +typedef bool (*ldb_async_callback_fn) (void *); +typedef int (*ldb_async_ctx_add_op_fn)(void *, time_t, void *, ldb_async_timeout_fn, ldb_async_callback_fn); +typedef int (*ldb_async_ctx_wait_op_fn)(void *); + +void ldb_async_ctx_set_private_data(struct ldb_context *ldb, + void *private_data); +void ldb_async_ctx_set_add_op(struct ldb_context *ldb, + ldb_async_ctx_add_op_fn add_op); +void ldb_async_ctx_set_wait_op(struct ldb_context *ldb, + ldb_async_ctx_wait_op_fn wait_op); + /** Connect to a database. @@ -1056,19 +1068,6 @@ struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx) (that is, with LDB_FLG_RDONLY). However in read-write mode, the database will be created if it does not exist. */ - -typedef void (*ldb_async_timeout_fn) (void *); -typedef bool (*ldb_async_callback_fn) (void *); -typedef int (*ldb_async_ctx_add_op_fn)(void *, time_t, void *, ldb_async_timeout_fn, ldb_async_callback_fn); -typedef int (*ldb_async_ctx_wait_op_fn)(void *); - -void ldb_async_ctx_set_private_data(struct ldb_context *ldb, - void *private_data); -void ldb_async_ctx_set_add_op(struct ldb_context *ldb, - ldb_async_ctx_add_op_fn add_op); -void ldb_async_ctx_set_wait_op(struct ldb_context *ldb, - ldb_async_ctx_wait_op_fn wait_op); - int ldb_connect(struct ldb_context *ldb, const char *url, unsigned int flags, const char *options[]); /* -- Samba Shared Repository