summaryrefslogtreecommitdiff
path: root/source3/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-11-27 08:41:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:09 -0500
commit847644bdac520a3cca7f30ffa50c0de3eeedf6d9 (patch)
tree94026c95cc94cfbf00da44dd0b32da29aa07f747 /source3/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
parentfb5d4f9c863c5486eed607dfb723254411758f89 (diff)
downloadsamba-847644bdac520a3cca7f30ffa50c0de3eeedf6d9.tar.gz
samba-847644bdac520a3cca7f30ffa50c0de3eeedf6d9.tar.bz2
samba-847644bdac520a3cca7f30ffa50c0de3eeedf6d9.zip
r19917: Fix warnings
(This used to be commit cf4309b9048a8417104cac660421a3dcd2e96ffe)
Diffstat (limited to 'source3/lib/ldb/ldb_tdb/ldb_tdb_wrap.c')
-rw-r--r--source3/lib/ldb/ldb_tdb/ldb_tdb_wrap.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/lib/ldb/ldb_tdb/ldb_tdb_wrap.c b/source3/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
index c9eac013fc..4f3acad9ea 100644
--- a/source3/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
+++ b/source3/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
@@ -59,8 +59,8 @@ static int ltdb_wrap_destructor(struct ltdb_wrap *w)
}
#if defined(_SAMBA_BUILD_) && (_SAMBA_BUILD_ <= 3)
-static void ltdb_log_fn(struct tdb_context *tdb, int level, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);
-static void ltdb_log_fn(struct tdb_context *tdb, int level, const char *fmt, ...)
+static void ltdb_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);
+static void ltdb_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const char *fmt, ...)
{
/* until we merge the tdb debug changes into samba3, we don't know
how serious the error is, and we can't go via the ldb loggin code */
@@ -147,7 +147,9 @@ struct tdb_context *ltdb_wrap_open(TALLOC_CTX *mem_ctx,
return NULL;
}
- w->tdb = tdb_open_ex(path, hash_size, tdb_flags, open_flags, mode, log_ctx_p, NULL);
+ w->tdb = tdb_open_ex(path, hash_size, tdb_flags, open_flags, mode,
+ (const struct tdb_logging_context *)log_ctx_p,
+ NULL);
if (w->tdb == NULL) {
talloc_free(w);
return NULL;