Rev 689: merge from ctdb in http://samba.org/~tridge/3_0-ctdb

[tridge]

------------------------------------------------------------
revno: 689
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: s3-ctdb-tridge
timestamp: Thu 2008-01-17 17:07:06 +1100
message:
  merge from ctdb
modified:
  source/lib/tdb/common/transaction.c 
transaction.c-20070416112700-wu1jh7in2kvfbr2w-24
=== modified file 'source/lib/tdb/common/transaction.c'
--- a/source/lib/tdb/common/transaction.c       2008-01-15 02:31:13 +0000
+++ b/source/lib/tdb/common/transaction.c       2008-01-17 06:07:06 +0000
@@ -316,25 +316,15 @@
                return 0;
        }
 
+       if (blk == tdb->transaction->num_blocks-1 &&
+           off + len > tdb->transaction->last_block_size) {
+               len = tdb->transaction->last_block_size - off;
+       }
+
        /* overwrite part of an existing block */
-       if (buf == NULL) {
-               memset(tdb->transaction->blocks[blk] + off, 0, len);
-       } else {
-               memcpy(tdb->transaction->blocks[blk] + off, buf, len);
-       }
-       if (blk == tdb->transaction->num_blocks-1) {
-               if (len + off > tdb->transaction->last_block_size) {
-                       tdb->transaction->last_block_size = len + off;
-               }
-       }
+       memcpy(tdb->transaction->blocks[blk] + off, buf, len);
 
        return 0;
-
-fail:
-       TDB_LOG((tdb, TDB_DEBUG_FATAL, "transaction_write: failed at off=%d 
len=%d\n", 
-                (blk*tdb->transaction->block_size) + off, len));
-       tdb->transaction->transaction_error = 1;
-       return -1;
 }