diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
| commit | 5209a846a9157e649fcdcb561f7eaf19c8c0e465 (patch) | |
| tree | b0a7e52b5646c8eec182dbc391e7934b6804488c /source4/lib/tdb_wrap.c | |
| parent | 625359b2e266105022309df8985720108ecd6f67 (diff) | |
| parent | 2ee8d29d22bcb1c350ab59d71b0aee548489bc9c (diff) | |
| download | samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.gz samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.bz2 samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
Diffstat (limited to 'source4/lib/tdb_wrap.c')
| -rw-r--r-- | source4/lib/tdb_wrap.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source4/lib/tdb_wrap.c b/source4/lib/tdb_wrap.c index 37095dff2c..da27803b06 100644 --- a/source4/lib/tdb_wrap.c +++ b/source4/lib/tdb_wrap.c @@ -20,8 +20,8 @@ */ #include "includes.h" -#include "lib/tdb/include/tdb.h" -#include "lib/util/dlinklist.h" +#include "../tdb/include/tdb.h" +#include "../lib/util/dlinklist.h" #include "tdb_wrap.h" #include "tdb.h" @@ -46,7 +46,7 @@ static void tdb_wrap_log(TDB_CONTEXT *tdb, enum tdb_debug_level level, { va_list ap; char *ptr = NULL; - int debug_level; + int dl; va_start(ap, format); vasprintf(&ptr, format, ap); @@ -54,24 +54,24 @@ static void tdb_wrap_log(TDB_CONTEXT *tdb, enum tdb_debug_level level, switch (level) { case TDB_DEBUG_FATAL: - debug_level = 0; + dl = 0; break; case TDB_DEBUG_ERROR: - debug_level = 1; + dl = 1; break; case TDB_DEBUG_WARNING: - debug_level = 2; + dl = 2; break; case TDB_DEBUG_TRACE: - debug_level = 5; + dl = 5; break; default: - debug_level = 0; + dl = 0; } if (ptr != NULL) { const char *name = tdb_name(tdb); - DEBUG(debug_level, ("tdb(%s): %s", name ? name : "unnamed", ptr)); + DEBUG(dl, ("tdb(%s): %s", name ? name : "unnamed", ptr)); free(ptr); } } |