Changes in kernel/generic/src/adt/btree.c [e98f1c3e:63e27ef] in mainline

File:

• kernel/generic/src/adt/btree.c (modified) (9 diffs)

kernel/generic/src/adt/btree.c

@@ -49 +49 @@
 #include <adt/btree.h>
 #include <adt/list.h>
+#include <assert.h>
 #include <mm/slab.h>
-#include <debug.h>
 #include <panic.h>
 #include <print.h>
@@ -500 +500 @@
         size_t j;
         
-        ASSERT(median);
-        ASSERT(node->keys == BTREE_MAX_KEYS);
+        assert(median);
+        assert(node->keys == BTREE_MAX_KEYS);
         
         /*
@@ -625 +625 @@
         btree_node_t *lnode;
         
-        ASSERT(value);
+        assert(value);
         
         lnode = leaf_node;
@@ -725 +725 @@
         size_t i;
         
-        ASSERT(!ROOT_NODE(node));
+        assert(!ROOT_NODE(node));
         
         idx = find_key_by_subtree(node->parent, node, false);
@@ -837 +837 @@
                 
                 idx = find_key_by_subtree(parent, rnode, true);
-                ASSERT((int) idx != -1);
+                assert((int) idx != -1);
                 slab_free(btree_node_slab, rnode);
                 _btree_remove(t, parent->key[idx], parent);
@@ -951 +951 @@
 btree_node_t *btree_leaf_node_left_neighbour(btree_t *t, btree_node_t *node)
 {
-        ASSERT(LEAF_NODE(node));
+        assert(LEAF_NODE(node));
         
         if (node->leaf_link.prev != &t->leaf_list.head)
@@ -970 +970 @@
 btree_node_t *btree_leaf_node_right_neighbour(btree_t *t, btree_node_t *node)
 {
-        ASSERT(LEAF_NODE(node));
+        assert(LEAF_NODE(node));
         
         if (node->leaf_link.next != &t->leaf_list.head)
@@ -1002 +1002 @@
                 
                 hlp = list_first(&list);
-                ASSERT(hlp != NULL);
+                assert(hlp != NULL);
                 node = list_get_instance(hlp, btree_node_t, bfs_link);
                 list_remove(hlp);
                 
-                ASSERT(node);
+                assert(node);
                 
                 if (node->depth != depth) {
@@ -1032 +1032 @@
         printf("Printing list of leaves:\n");
         list_foreach(t->leaf_list, leaf_link, btree_node_t, node) {
-                ASSERT(node);
+                assert(node);
                 
                 printf("(");