Changeset 98000fb in mainline for kernel/generic/src/adt/btree.c

Timestamp:

2009-06-03T19:34:45Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

301ff30

Parents:

69e68e3

Message:

remove redundant index_t and count_t types (which were always quite ambiguous and not actually needed)

File:

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

kernel/generic/src/adt/btree.c

@@ -64 +64 @@
 static btree_node_t *node_split(btree_node_t *node, btree_key_t key, void *value, btree_node_t *rsubtree, btree_key_t *median);
 static btree_node_t *node_combine(btree_node_t *node);
-static index_t find_key_by_subtree(btree_node_t *node, btree_node_t *subtree, bool right);
-static void rotate_from_right(btree_node_t *lnode, btree_node_t *rnode, index_t idx);
-static void rotate_from_left(btree_node_t *lnode, btree_node_t *rnode, index_t idx);
+static size_t find_key_by_subtree(btree_node_t *node, btree_node_t *subtree, bool right);
+static void rotate_from_right(btree_node_t *lnode, btree_node_t *rnode, size_t idx);
+static void rotate_from_left(btree_node_t *lnode, btree_node_t *rnode, size_t idx);
 static bool try_insert_by_rotation_to_left(btree_node_t *node, btree_key_t key, void *value, btree_node_t *rsubtree);
 static bool try_insert_by_rotation_to_right(btree_node_t *node, btree_key_t key, void *value, btree_node_t *rsubtree);
@@ -138 +138 @@
 void btree_destroy_subtree(btree_node_t *root)
 {
-        count_t i;
+        size_t i;
 
         if (root->keys) {
@@ -270 +270 @@
         
         if (node->keys > FILL_FACTOR) {
-                count_t i;
+                size_t i;
 
                 /*
@@ -286 +286 @@
                 
         } else {
-                index_t idx;
+                size_t idx;
                 btree_node_t *rnode, *parent;
 
@@ -336 +336 @@
                 } else {
                         void *val;
-                        count_t i;
+                        size_t i;
                 
                         /*
@@ -443 +443 @@
 void node_insert_key_and_lsubtree(btree_node_t *node, btree_key_t key, void *value, btree_node_t *lsubtree)
 {
-        count_t i;
+        size_t i;
 
         for (i = 0; i < node->keys; i++) {
                 if (key < node->key[i]) {
-                        count_t j;
+                        size_t j;
                 
                         for (j = node->keys; j > i; j--) {
@@ -479 +479 @@
 void node_insert_key_and_rsubtree(btree_node_t *node, btree_key_t key, void *value, btree_node_t *rsubtree)
 {
-        count_t i;
+        size_t i;
 
         for (i = 0; i < node->keys; i++) {
                 if (key < node->key[i]) {
-                        count_t j;
+                        size_t j;
                 
                         for (j = node->keys; j > i; j--) {
@@ -511 +511 @@
 void node_remove_key_and_lsubtree(btree_node_t *node, btree_key_t key)
 {
-        count_t i, j;
+        size_t i, j;
         
         for (i = 0; i < node->keys; i++) {
@@ -539 +539 @@
 void node_remove_key_and_rsubtree(btree_node_t *node, btree_key_t key)
 {
-        count_t i, j;
+        size_t i, j;
         
         for (i = 0; i < node->keys; i++) {
@@ -577 +577 @@
 {
         btree_node_t *rnode;
-        count_t i, j;
+        size_t i, j;
 
         ASSERT(median);
@@ -604 +604 @@
          * If this is an index node, do not copy the median.
          */
-        i = (count_t) INDEX_NODE(node);
+        i = (size_t) INDEX_NODE(node);
         for (i += MEDIAN_HIGH_INDEX(node), j = 0; i < node->keys; i++, j++) {
                 rnode->key[j] = node->key[i];
@@ -637 +637 @@
 btree_node_t *node_combine(btree_node_t *node)
 {
-        index_t idx;
+        size_t idx;
         btree_node_t *rnode;
-        count_t i;
+        size_t i;
 
         ASSERT(!ROOT_NODE(node));
@@ -686 +686 @@
  * @return Index of the key associated with the subtree.
  */ 
-index_t find_key_by_subtree(btree_node_t *node, btree_node_t *subtree, bool right)
-{
-        count_t i;
+size_t find_key_by_subtree(btree_node_t *node, btree_node_t *subtree, bool right)
+{
+        size_t i;
         
         for (i = 0; i < node->keys + 1; i++) {
@@ -707 +707 @@
  * @param idx Index of the parent node key that is taking part in the rotation.
  */
-void rotate_from_left(btree_node_t *lnode, btree_node_t *rnode, index_t idx)
+void rotate_from_left(btree_node_t *lnode, btree_node_t *rnode, size_t idx)
 {
         btree_key_t key;
@@ -744 +744 @@
  * @param idx Index of the parent node key that is taking part in the rotation.
  */
-void rotate_from_right(btree_node_t *lnode, btree_node_t *rnode, index_t idx)
+void rotate_from_right(btree_node_t *lnode, btree_node_t *rnode, size_t idx)
 {
         btree_key_t key;
@@ -787 +787 @@
 bool try_insert_by_rotation_to_left(btree_node_t *node, btree_key_t inskey, void *insvalue, btree_node_t *rsubtree)
 {
-        index_t idx;
+        size_t idx;
         btree_node_t *lnode;
 
@@ -834 +834 @@
 bool try_insert_by_rotation_to_right(btree_node_t *node, btree_key_t inskey, void *insvalue, btree_node_t *rsubtree)
 {
-        index_t idx;
+        size_t idx;
         btree_node_t *rnode;
 
@@ -873 +873 @@
 bool try_rotation_from_left(btree_node_t *rnode)
 {
-        index_t idx;
+        size_t idx;
         btree_node_t *lnode;
 
@@ -908 +908 @@
 bool try_rotation_from_right(btree_node_t *lnode)
 {
-        index_t idx;
+        size_t idx;
         btree_node_t *rnode;
 
@@ -941 +941 @@
 void btree_print(btree_t *t)
 {
-        count_t i;
+        size_t i;
         int depth = t->root->depth;
         link_t head, *cur;