diff options
Diffstat (limited to 'src/common/db.c')
| -rw-r--r-- | src/common/db.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/common/db.c b/src/common/db.c index 999deea48..54834af81 100644 --- a/src/common/db.c +++ b/src/common/db.c @@ -1538,9 +1538,8 @@ static unsigned int db_obj_vgetall(DBMap* self, DBData **buf, unsigned int max, // Match in the order: current node, left tree, right tree node = db->ht[i]; while (node) { - parent = node->parent; - if (!(node->deleted)) - { + + if (!(node->deleted)) { va_list argscopy; va_copy(argscopy, args); if (match(node->key, node->data, argscopy) == 0) { @@ -1550,14 +1549,17 @@ static unsigned int db_obj_vgetall(DBMap* self, DBData **buf, unsigned int max, } va_end(argscopy); } + if (node->left) { node = node->left; continue; } + if (node->right) { node = node->right; continue; } + while (node) { parent = node->parent; if (parent && parent->right && parent->left == node) { @@ -1566,6 +1568,7 @@ static unsigned int db_obj_vgetall(DBMap* self, DBData **buf, unsigned int max, } node = parent; } + } } db_free_unlock(db); @@ -1923,9 +1926,7 @@ static int db_obj_vforeach(DBMap* self, DBApply func, va_list args) // Apply func in the order: current node, left node, right node node = db->ht[i]; while (node) { - parent = node->parent; - if (!(node->deleted)) - { + if (!(node->deleted)) { va_list argscopy; va_copy(argscopy, args); sum += func(node->key, &node->data, argscopy); |