From b555730139df4191fc48e2a3d106b4c2e80d6759 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sat, 20 Oct 2012 09:34:13 -0700 Subject: [PATCH] ITS#7402 tweak prev commit, use hex for txn IDs --- servers/slapd/back-bdb/add.c | 4 ++-- servers/slapd/back-bdb/config.c | 2 +- servers/slapd/back-bdb/delete.c | 4 ++-- servers/slapd/back-bdb/modify.c | 4 ++-- servers/slapd/back-bdb/modrdn.c | 4 ++-- servers/slapd/back-bdb/tools.c | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c index 89d6e4967e..41e9d786fe 100644 --- a/servers/slapd/back-bdb/add.c +++ b/servers/slapd/back-bdb/add.c @@ -159,7 +159,7 @@ retry: /* transaction retry */ rs->sr_text = "internal error"; goto return_results; } - Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_add) ": txn1 id: %u\n", + Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_add) ": txn1 id: %x\n", ltid->id(ltid), 0, 0 ); opinfo.boi_oe.oe_key = bdb; @@ -378,7 +378,7 @@ retry: /* transaction retry */ rs->sr_text = "internal error"; goto return_results; } - Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_add) ": txn2 id: %u\n", + Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_add) ": txn2 id: %x\n", lt2->id(lt2), 0, 0 ); /* dn2id index */ diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c index 0a680032c0..7dc77c2833 100644 --- a/servers/slapd/back-bdb/config.c +++ b/servers/slapd/back-bdb/config.c @@ -241,7 +241,7 @@ bdb_online_index( void *ctx, void *arg ) rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &txn, bdb->bi_db_opflags ); if ( rc ) break; - Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_online_index) ": txn id: %u\n", + Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_online_index) ": txn id: %x\n", txn->id(txn), 0, 0 ); if ( getnext ) { getnext = 0; diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c index 017ba960d0..b086b8f267 100644 --- a/servers/slapd/back-bdb/delete.c +++ b/servers/slapd/back-bdb/delete.c @@ -143,7 +143,7 @@ retry: /* transaction retry */ /* begin transaction */ rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, NULL, <id, bdb->bi_db_opflags ); - Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_delete) ": txn1 id: %u\n", + Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_delete) ": txn1 id: %x\n", ltid->id(ltid), 0, 0 ); rs->sr_text = NULL; if( rs->sr_err != 0 ) { @@ -370,7 +370,7 @@ retry: /* transaction retry */ rs->sr_text = "internal error"; goto return_results; } - Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_delete) ": txn2 id: %u\n", + Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_delete) ": txn2 id: %x\n", lt2->id(lt2), 0, 0 ); BDB_LOG_PRINTF( bdb->bi_dbenv, lt2, "slapd Starting delete %s(%d)", diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c index 6b8c6ba6be..2ef1cc1ced 100644 --- a/servers/slapd/back-bdb/modify.c +++ b/servers/slapd/back-bdb/modify.c @@ -514,7 +514,7 @@ retry: /* transaction retry */ rs->sr_text = "internal error"; goto return_results; } - Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modify) ": txn1 id: %u\n", + Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modify) ": txn1 id: %x\n", ltid->id(ltid), 0, 0 ); opinfo.boi_oe.oe_key = bdb; @@ -635,7 +635,7 @@ retry: /* transaction retry */ rs->sr_text = "internal error"; goto return_results; } - Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modify) ": txn2 id: %u\n", + Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modify) ": txn2 id: %x\n", lt2->id(lt2), 0, 0 ); /* Modify the entry */ dummy = *e; diff --git a/servers/slapd/back-bdb/modrdn.c b/servers/slapd/back-bdb/modrdn.c index c0dd650df9..c199bf0c7f 100644 --- a/servers/slapd/back-bdb/modrdn.c +++ b/servers/slapd/back-bdb/modrdn.c @@ -162,7 +162,7 @@ retry: /* transaction retry */ rs->sr_text = "internal error"; goto return_results; } - Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modrdn) ": txn1 id: %u\n", + Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modrdn) ": txn1 id: %x\n", ltid->id(ltid), 0, 0 ); opinfo.boi_oe.oe_key = bdb; @@ -603,7 +603,7 @@ retry: /* transaction retry */ rs->sr_text = "internal error"; goto return_results; } - Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modrdn) ": txn2 id: %u\n", + Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modrdn) ": txn2 id: %x\n", lt2->id(lt2), 0, 0 ); /* delete old DN */ diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c index 88b561d9b7..2d9f780a08 100644 --- a/servers/slapd/back-bdb/tools.c +++ b/servers/slapd/back-bdb/tools.c @@ -672,7 +672,7 @@ ID bdb_tool_entry_put( text->bv_val, 0, 0 ); return NOID; } - Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_tool_entry_put) ": txn id: %u\n", + Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_tool_entry_put) ": txn id: %x\n", tid->id(tid), 0, 0 ); } @@ -841,7 +841,7 @@ int bdb_tool_entry_reindex( db_strerror(rc), rc, 0 ); goto done; } - Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_tool_entry_reindex) ": txn id: %u\n", + Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_tool_entry_reindex) ": txn id: %x\n", tid->id(tid), 0, 0 ); } @@ -933,7 +933,7 @@ ID bdb_tool_entry_modify( text->bv_val, 0, 0 ); return NOID; } - Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_tool_entry_modify) ": txn id: %u\n", + Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_tool_entry_modify) ": txn id: %x\n", tid->id(tid), 0, 0 ); } -- 2.39.5