Changeset 657 for trunk/server/lib/tdb/common

Timestamp:

Nov 8, 2011, 7:01:01 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba Server 3.5: Correct previous commit

Location:

trunk/server/lib/tdb/common

Files:

• tdb_private.h (modified) (1 diff)
• transaction.c (modified) (7 diffs)

trunk/server/lib/tdb/common/tdb_private.h

@@ -38 +38 @@
 #include "tdb.h"
 
-#define TDB_TRACE 1
+/* #define TDB_TRACE 1 */
 #ifndef HAVE_GETPAGESIZE
 #define getpagesize() 0x2000

trunk/server/lib/tdb/common/transaction.c

@@ -1020 +1020 @@
 
         tdb_trace(tdb, "tdb_transaction_commit");
-        tdb_trace(tdb, "@todo: tdb_transaction_error");
         if (tdb->transaction->transaction_error) {
                 tdb->ecode = TDB_ERR_IO;
@@ -1028 +1027 @@
         }
 
-        tdb_trace(tdb, "@todo: tdb_transaction_nesting");
         if (tdb->transaction->nesting != 0) {
                 tdb->transaction->nesting--;
@@ -1034 +1032 @@
         }
 
-        tdb_trace(tdb, "@todo: tdb_null_transaction");
         /* check for a null transaction */
         if (tdb->transaction->blocks == NULL) {
@@ -1041 +1038 @@
         }
 
-        tdb_trace(tdb, "@todo: tdb_transaction_prepare");
         if (!tdb->transaction->prepared) {
                 int ret = _tdb_transaction_prepare_commit(tdb);
@@ -1049 +1045 @@
 
         methods = tdb->transaction->io_methods;
-
-        tdb_trace(tdb, "@todo: tdb_transaction perform all the writes");
 
         /* perform all the writes */
@@ -1086 +1080 @@
         tdb->transaction->num_blocks = 0;
 
-        tdb_trace(tdb, "@todo: tdb_transaction ensure the new data is on disk");
         /* ensure the new data is on disk */
         if (transaction_sync(tdb, 0, tdb->map_size) == -1) {
@@ -1104 +1097 @@
            mtime changes when a transaction completes */
 #ifdef HAVE_UTIME
-    tdb_trace(tdb, "@todo: tdb_transaction utime");
         utime(tdb->name, NULL);
 #endif
 
-    tdb_trace(tdb, "@todo: tdb_transaction need repack");
         need_repack = tdb->transaction->need_repack;
 
         /* use a transaction cancel to free memory and remove the
            transaction locks */
-    tdb_trace(tdb, "@todo: tdb_transaction cancel");
         _tdb_transaction_cancel(tdb);
 
         if (need_repack) {
-            tdb_trace(tdb, "@todo: tdb_transaction repack");
                 return tdb_repack(tdb);
         }