ITS#7589 Cleanup unneeded vars in prev patch

vmware
Howard Chu 11 years ago
parent 310b656a2e
commit 400e21370b
  1. 15
      libraries/liblmdb/mdb.c

@ -7487,7 +7487,7 @@ mdb_page_split(MDB_cursor *mc, MDB_val *newkey, MDB_val *newdata, pgno_t newpgno
mc->mc_pg[mc->mc_top] = rp; mc->mc_pg[mc->mc_top] = rp;
} }
} else { } else {
unsigned int psize, nsize, tsize; unsigned int psize, nsize;
int k; int k;
/* Maximum free space in an empty page */ /* Maximum free space in an empty page */
pmax = env->me_psize - PAGEHDRSZ; pmax = env->me_psize - PAGEHDRSZ;
@ -7541,24 +7541,23 @@ mdb_page_split(MDB_cursor *mc, MDB_val *newkey, MDB_val *newdata, pgno_t newpgno
} }
for (; i!=k; i+=j) { for (; i!=k; i+=j) {
if (i == newindx) { if (i == newindx) {
tsize = nsize; psize += nsize;
node = NULL; node = NULL;
} else { } else {
node = (MDB_node *)((char *)mp + copy->mp_ptrs[i]); node = (MDB_node *)((char *)mp + copy->mp_ptrs[i]);
tsize = NODESIZE + NODEKSZ(node) + sizeof(indx_t); psize = NODESIZE + NODEKSZ(node) + sizeof(indx_t);
if (IS_LEAF(mp)) { if (IS_LEAF(mp)) {
if (F_ISSET(node->mn_flags, F_BIGDATA)) if (F_ISSET(node->mn_flags, F_BIGDATA))
tsize += sizeof(pgno_t); psize += sizeof(pgno_t);
else else
tsize += NODEDSZ(node); psize += NODEDSZ(node);
} }
tsize += tsize & 1; psize += psize & 1;
} }
if (psize + tsize > pmax) { if (psize > pmax) {
split_indx = i + (j<0); split_indx = i + (j<0);
break; break;
} }
psize += tsize;
} }
/* special case: when the new node was on the last /* special case: when the new node was on the last
* slot we may not have tripped the break inside the loop. * slot we may not have tripped the break inside the loop.

Loading…
Cancel
Save