Merge pull request #646 from sanpeqf/fixup-radix

fixup radix: fixed radix iterators arithmetic issue

Author: pixclk

src/radix.c

@@ -402,15 +402,16 @@ bfdev_radix_root_next(bfdev_radix_root_t *root, uintptr_t *offsetp)
         node = parents[level].node;
         index = parents[level].index;
 
+        count = radix_depth_shift(level - 1);
+        *offsetp &= ~((uintptr_t)RADIX_ARY_MASK << count);
+
         while (++index < BFDEV_RADIX_ARY) {
             if (!node->child[index])
                 continue;
 
-            count = radix_depth_shift(level - 1);
-            *offsetp &= ~((uintptr_t)RADIX_ARY_MASK << count);
             *offsetp |= (uintptr_t)index << count;
-
             node = node->child[index];
+
             goto downward;
         }
     }
@@ -457,15 +458,16 @@ bfdev_radix_root_prev(bfdev_radix_root_t *root, uintptr_t *offsetp)
         node = parents[level].node;
         index = parents[level].index;
 
+        count = radix_depth_shift(level - 1);
+        *offsetp &= ~((uintptr_t)RADIX_ARY_MASK << count);
+
         while (index--) {
             if (!node->child[index])
                 continue;
 
-            count = radix_depth_shift(level - 1);
-            *offsetp &= ~((uintptr_t)RADIX_ARY_MASK << count);
             *offsetp |= (uintptr_t)index << count;
-
             node = node->child[index];
+
             goto downward;
         }
     }

src/rbtree.c

@@ -542,8 +542,7 @@ bfdev_rb_replace(bfdev_rb_root_t *root, bfdev_rb_node_t *oldn,
 }
 
 export bfdev_rb_node_t *
-bfdev_rb_find(const bfdev_rb_root_t *root, void *key,
-              bfdev_rb_find_t find)
+bfdev_rb_find(const bfdev_rb_root_t *root, void *key, bfdev_rb_find_t find)
 {
     bfdev_rb_node_t *node;
     long retval;