diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:32:13 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:32:13 +0930 |
| commit | e613effeae7c9373c9e635fc708ec2ce29661d4c (patch) | |
| tree | d8cdb019f54302de6aa813a62a34e036cf9c7faf /lib/tdb2/test/run-tdb1-incompatible.c | |
| parent | 50484d4bede6b59706457e44a32cbe2d3e9c28d2 (diff) | |
| download | samba-e613effeae7c9373c9e635fc708ec2ce29661d4c.tar.gz samba-e613effeae7c9373c9e635fc708ec2ce29661d4c.tar.bz2 samba-e613effeae7c9373c9e635fc708ec2ce29661d4c.zip | |
tdb2: make TDB1 code use tdb2's TDB_ERROR and tdb_logerr()
To do this, we make sure that the first few fields of tdb1_context and
tdb_context are the same.
This sweep also fixes up a few paths where we weren't setting
tdb->ecode before our old logging function.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit 919937354a331bb964564a11b5a5b80403ff8db9)
Diffstat (limited to 'lib/tdb2/test/run-tdb1-incompatible.c')
| -rw-r--r-- | lib/tdb2/test/run-tdb1-incompatible.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/tdb2/test/run-tdb1-incompatible.c b/lib/tdb2/test/run-tdb1-incompatible.c index 5a4a61af33..13ba810169 100644 --- a/lib/tdb2/test/run-tdb1-incompatible.c +++ b/lib/tdb2/test/run-tdb1-incompatible.c @@ -8,10 +8,11 @@ static unsigned int tdb1_dumb_hash(TDB1_DATA *key) return key->dsize; } -static void log_fn(struct tdb1_context *tdb, enum tdb1_debug_level level, const char *fmt, ...) +static void log_fn(struct tdb1_context *tdb, enum tdb_log_level level, + enum TDB_ERROR ecode, const char *message, void *priv) { - unsigned int *count = tdb->log.log_private; - if (strstr(fmt, "hash")) + unsigned int *count = priv; + if (strstr(message, "hash")) (*count)++; } |