summaryrefslogtreecommitdiff
path: root/lib/tdb2
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2012-02-08 12:15:04 -0800
committerJeremy Allison <jra@samba.org>2012-02-08 22:55:08 +0100
commit4cf9923b09954a0605fb006e7d90d2fbff4d0a6b (patch)
treedb3a565cb81343772481c2df78dc4d29203fe315 /lib/tdb2
parent24ed8c59244de695e370055fa3a1af418029d8b9 (diff)
downloadsamba-4cf9923b09954a0605fb006e7d90d2fbff4d0a6b.tar.gz
samba-4cf9923b09954a0605fb006e7d90d2fbff4d0a6b.tar.bz2
samba-4cf9923b09954a0605fb006e7d90d2fbff4d0a6b.zip
Fix shadow variable name warning.
Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Wed Feb 8 22:55:08 CET 2012 on sn-devel-104
Diffstat (limited to 'lib/tdb2')
-rw-r--r--lib/tdb2/transaction.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/tdb2/transaction.c b/lib/tdb2/transaction.c
index dd94510c02..dbdaf32cef 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);
}