------------------------------------------------------------ revno: 760 revision-id:[EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge.stable timestamp: Tue 2008-01-15 15:28:07 +1100 message: minor fix to transaction_write_existing modified: lib/tdb/common/transaction.c transaction.c-20070220022425-m1wibgjq7n5hahs6-11 === modified file 'lib/tdb/common/transaction.c' --- a/lib/tdb/common/transaction.c 2008-01-14 04:11:10 +0000 +++ b/lib/tdb/common/transaction.c 2008-01-15 04:28:07 +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; }