diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:12:13 +0930 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:12:13 +0930 |
commit | ab61a57e0177ff50a22a8feea38abbf02edfd5da (patch) | |
tree | fed80e291b6f924d76019914ae9dc65c5f742207 /lib/tdb2/tools/tdb2tool.c | |
parent | fb37849abda31b77a05718a316f52ed3fb0a8acd (diff) | |
download | samba-ab61a57e0177ff50a22a8feea38abbf02edfd5da.tar.gz samba-ab61a57e0177ff50a22a8feea38abbf02edfd5da.tar.bz2 samba-ab61a57e0177ff50a22a8feea38abbf02edfd5da.zip |
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 <rusty@rustcorp.com.au>
Diffstat (limited to 'lib/tdb2/tools/tdb2tool.c')
-rw-r--r-- | lib/tdb2/tools/tdb2tool.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/tdb2/tools/tdb2tool.c b/lib/tdb2/tools/tdb2tool.c index cd301c80b7..9b3554de6c 100644 --- a/lib/tdb2/tools/tdb2tool.c +++ b/lib/tdb2/tools/tdb2tool.c @@ -126,10 +126,14 @@ static double _end_timer(void) (tp2.tv_usec - tp1.tv_usec)*1.0e-6); } -static void tdb_log(struct tdb_context *tdb, enum tdb_log_level level, - const char *message, void *priv) +static void tdb_log(struct tdb_context *tdb, + enum tdb_log_level level, + enum TDB_ERROR ecode, + const char *message, + void *data) { - fputs(message, stderr); + fprintf(stderr, "tdb:%s:%s:%s\n", + tdb_name(tdb), tdb_errorstr(ecode), message); } /* a tdb tool for manipulating a tdb database */ |