diff options
| author | Volker Lendecke <vl@sernet.de> | 2007-11-07 19:06:30 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-11-09 15:10:14 +0100 |
| commit | 95b9e23095a51615bc51abb55adcd6330b57b66e (patch) | |
| tree | ff9f09001471568f8d859269e71529dd3af9d07d /source3 | |
| parent | 515eef851fa88e69f839f0c31cb9f258d3fe36d5 (diff) | |
| download | samba-95b9e23095a51615bc51abb55adcd6330b57b66e.tar.gz samba-95b9e23095a51615bc51abb55adcd6330b57b66e.tar.bz2 samba-95b9e23095a51615bc51abb55adcd6330b57b66e.zip | |
Fix dbwrap debug output
(This used to be commit 9f9c933c16abacb2d0aa7bc7faa5b1ddac61b0e5)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/dbwrap_ctdb.c | 5 | ||||
| -rw-r--r-- | source3/lib/dbwrap_tdb.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c index c5cb8d0aad..90d0b260c5 100644 --- a/source3/lib/dbwrap_ctdb.c +++ b/source3/lib/dbwrap_ctdb.c @@ -86,7 +86,8 @@ static int db_ctdb_record_destr(struct db_record* data) data->private_data, struct db_ctdb_rec); DEBUG(10, (DEBUGLEVEL > 10 - ? "Unlocking db %u key %s\n" : "Unlocking db %u key %20s\n", + ? "Unlocking db %u key %s\n" + : "Unlocking db %u key %.20s\n", (int)crec->ctdb_ctx->db_id, hex_encode(data, (unsigned char *)data->key.dptr, data->key.dsize))); @@ -141,7 +142,7 @@ again: char *keystr = hex_encode(result, key.dptr, key.dsize); DEBUG(10, (DEBUGLEVEL > 10 ? "Locking db %u key %s\n" - : "Locking db %u key %20s\n", + : "Locking db %u key %.20s\n", (int)crec->ctdb_ctx->db_id, keystr)); TALLOC_FREE(keystr); } diff --git a/source3/lib/dbwrap_tdb.c b/source3/lib/dbwrap_tdb.c index 24462d6789..593a8ac1d6 100644 --- a/source3/lib/dbwrap_tdb.c +++ b/source3/lib/dbwrap_tdb.c @@ -32,7 +32,7 @@ static int db_tdb_record_destr(struct db_record* data) talloc_get_type_abort(data->private_data, struct db_tdb_ctx); DEBUG(10, (DEBUGLEVEL > 10 - ? "Unlocking key %s\n" : "Unlocking key %20s\n", + ? "Unlocking key %s\n" : "Unlocking key %.20s\n", hex_encode(data, (unsigned char *)data->key.dptr, data->key.dsize))); @@ -71,10 +71,10 @@ static struct db_record *db_tdb_fetch_locked(struct db_context *db, result->store = db_tdb_store; result->delete_rec = db_tdb_delete; - if (DEBUGLEVEL > 10) { + if (DEBUGLEVEL >= 10) { char *keystr = hex_encode(NULL, key.dptr, key.dsize); DEBUG(10, (DEBUGLEVEL > 10 - ? "Locking key %s\n" : "Locking key %20s\n", + ? "Locking key %s\n" : "Locking key %.20s\n", keystr)); TALLOC_FREE(keystr); } |