The branch, master has been updated
via 4cf9923 Fix shadow variable name warning.
from 24ed8c5 regshell: Fix a counter that can actually be non-zero.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4cf9923b09954a0605fb006e7d90d2fbff4d0a6b
Author: Jeremy Allison <j...@samba.org>
Date: Wed Feb 8 12:15:04 2012 -0800
Fix shadow variable name warning.
Autobuild-User: Jeremy Allison <j...@samba.org>
Autobuild-Date: Wed Feb 8 22:55:08 CET 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/tdb2/transaction.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb2/transaction.c b/lib/tdb2/transaction.c
index dd94510..dbdaf32 100644
--- a/lib/tdb2/transaction.c
+++ b/lib/tdb2/transaction.c
@@ -795,22 +795,22 @@ static struct tdb_recovery_record *alloc_recovery(struct
tdb_context *tdb,
offset += off;
while (off < length) {
- tdb_len_t len;
+ tdb_len_t len1;
unsigned int samelen;
- len = different(tdb->tdb2.transaction->blocks[i] + off,
+ len1 = different(tdb->tdb2.transaction->blocks[i] + off,
buffer + off, length - off,
- sizeof(offset) + sizeof(len) + 1,
+ sizeof(offset) + sizeof(len1) + 1,
&samelen);
memcpy(p, &offset, sizeof(offset));
- memcpy(p + sizeof(offset), &len, sizeof(len));
- tdb_convert(tdb, p, sizeof(offset) + sizeof(len));
- p += sizeof(offset) + sizeof(len);
- memcpy(p, buffer + off, len);
- p += len;
- off += len + samelen;
- offset += len + samelen;
+ memcpy(p + sizeof(offset), &len1, sizeof(len1));
+ tdb_convert(tdb, p, sizeof(offset) + sizeof(len1));
+ p += sizeof(offset) + sizeof(len1);
+ memcpy(p, buffer + off, len1);
+ p += len1;
+ off += len1 + samelen;
+ offset += len1 + samelen;
}
tdb_access_release(tdb, buffer);
}
--
Samba Shared Repository
