ITS#7402 tweak prev commit, use hex for txn IDs

diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c
index 89d6e4967e40e747f553d8b680b2b41e9576f777..41e9d786feab1b206379b241918c2400736dad76 100644 (file)
--- 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 0a680032c037455d648da06d83b4a038da6dcf89..7dc77c2833f9b665c9fddc975e7303370d9aed9b 100644 (file)
--- 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 017ba960d0bcf44b8cbd08a11186fafdefbcf476..b086b8f26761b4dd72f106d13a71eef6bdc2d752 100644 (file)
--- 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, &ltid, 
                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 6b8c6ba6be214f05fcc06b3ca1f7a989395a1e6e..2ef1cc1cedae5d8e656896c139fbf5a0b8ebf867 100644 (file)
--- 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 c0dd650df94d8124095c7e9ba76e7c6fcd07b730..c199bf0c7f745c3fb6e94f3f8f069fe08a30befa 100644 (file)
--- 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 88b561d9b7baa8a750652af671eb0a1259694f34..2d9f780a08eede00db4b7e24ff8462a725198b61 100644 (file)
--- 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 );
        }