ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-04 17:14:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: backport - Silence some valgrind uninit warnings.

Browse Source 
Change-Id: Ie26d7bd08a3a4d4ceb833093a9117f1ebaca6cb0
This commit is contained in:
Howard Chu 2015-11-20 09:47:56 +00:00 committed by Leo Yuriev
parent 90fdef7a6a
commit 2154b585c6
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mdb.c
View File

@ -7790,6 +7790,8 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst)
m3 = &m2->mc_xcursor->mx_cursor; m3 = &m2->mc_xcursor->mx_cursor;
else else
m3 = m2; m3 = m2;
if (!(m3->mc_flags & C_INITIALIZED) || m3->mc_top < csrc->mc_top)
continue;
if (m3 != cdst && if (m3 != cdst &&
m3->mc_pg[csrc->mc_top] == mpd && m3->mc_pg[csrc->mc_top] == mpd &&
m3->mc_ki[csrc->mc_top] >= cdst->mc_ki[csrc->mc_top]) { m3->mc_ki[csrc->mc_top] >= cdst->mc_ki[csrc->mc_top]) {
@ -7812,6 +7814,8 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst)
else else
m3 = m2; m3 = m2;
if (m3 == csrc) continue; if (m3 == csrc) continue;
if (!(m3->mc_flags & C_INITIALIZED) || m3->mc_top < csrc->mc_top)
continue;
if (m3->mc_pg[csrc->mc_top] == mps) { if (m3->mc_pg[csrc->mc_top] == mps) {
if (!m3->mc_ki[csrc->mc_top]) { if (!m3->mc_ki[csrc->mc_top]) {
m3->mc_pg[csrc->mc_top] = cdst->mc_pg[cdst->mc_top]; m3->mc_pg[csrc->mc_top] = cdst->mc_pg[cdst->mc_top];
@ -8112,7 +8116,8 @@ mdb_rebalance(MDB_cursor *mc)
m3 = &m2->mc_xcursor->mx_cursor; m3 = &m2->mc_xcursor->mx_cursor;
else else
m3 = m2; m3 = m2;
if (m3->mc_snum < mc->mc_snum) continue; if (!(m3->mc_flags & C_INITIALIZED) || (m3->mc_snum < mc->mc_snum))
continue;
if (m3->mc_pg[0] == mp) { if (m3->mc_pg[0] == mp) {
m3->mc_snum = 0; m3->mc_snum = 0;
m3->mc_top = 0; m3->mc_top = 0;
@ -8148,6 +8153,8 @@ mdb_rebalance(MDB_cursor *mc)
else else
m3 = m2; m3 = m2;
if (m3 == mc) continue; if (m3 == mc) continue;
if (!(m3->mc_flags & C_INITIALIZED))
continue;
if (m3->mc_pg[0] == mp) { if (m3->mc_pg[0] == mp) {
for (i=0; i<mc->mc_db->md_depth; i++) { for (i=0; i<mc->mc_db->md_depth; i++) {
m3->mc_pg[i] = m3->mc_pg[i+1]; m3->mc_pg[i] = m3->mc_pg[i+1];