From ab61a57e0177ff50a22a8feea38abbf02edfd5da Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 14 Sep 2011 07:12:13 +0930 Subject: tdb2: Hand error code to logging function. Since we've deprecated tdb_error() function (and it didn't work right from inside the logging function anyway, since we didn't set tdb->ecode yet) we need to hand it to the log function. (Imported from CCAN commit 6e3d9e8a66bf8b45150500f176452ee8e9ee9927) Signed-off-by: Rusty Russell --- lib/tdb2/tools/tdb2torture.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib/tdb2/tools/tdb2torture.c') diff --git a/lib/tdb2/tools/tdb2torture.c b/lib/tdb2/tools/tdb2torture.c index f6a7a5064a..c2a4eaa0fb 100644 --- a/lib/tdb2/tools/tdb2torture.c +++ b/lib/tdb2/tools/tdb2torture.c @@ -42,10 +42,14 @@ static int count_pipe; static union tdb_attribute log_attr; static union tdb_attribute seed_attr; -static void tdb_log(struct tdb_context *tdb, enum tdb_log_level level, - const char *message, void *data) +static void tdb_log(struct tdb_context *tdb, + enum tdb_log_level level, + enum TDB_ERROR ecode, + const char *message, + void *data) { - fputs(message, stdout); + printf("tdb:%s:%s:%s\n", + tdb_name(tdb), tdb_errorstr(ecode), message); fflush(stdout); #if 0 { -- cgit