[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-test-1392-g874425c
Jeremy Allison
jra at samba.org
Wed Jan 16 01:21:26 GMT 2008
The branch, v3-2-test has been updated
via 874425c8f680fb2f737b46a3177b239e69302af5 (commit)
from 5467db388355a4769e48fed7eb80920d1820f727 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 874425c8f680fb2f737b46a3177b239e69302af5
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jan 15 17:20:50 2008 -0800
Port from ctdb:
minor fix to transaction_write_existing: tridge.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/lib/tdb/common/transaction.c | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/tdb/common/transaction.c b/source/lib/tdb/common/transaction.c
index 0ecfb9b..ea0e3a9 100644
--- a/source/lib/tdb/common/transaction.c
+++ b/source/lib/tdb/common/transaction.c
@@ -316,25 +316,15 @@ static int transaction_write_existing(struct tdb_context *tdb, tdb_off_t off,
return 0;
}
- /* 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;
- }
+ if (blk == tdb->transaction->num_blocks-1 &&
+ off + len > tdb->transaction->last_block_size) {
+ len = tdb->transaction->last_block_size - off;
}
- return 0;
+ /* overwrite part of an existing block */
+ memcpy(tdb->transaction->blocks[blk] + off, buf, len);
-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;
+ return 0;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list