Changeset 7d307e7 in mainline

Timestamp:

2007-02-05T12:26:39Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

52c79ac

Parents:

15819e37

Message:

fix signed/unsigned comparison

File:

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

kernel/generic/src/adt/btree.c

@@ -138 +138 @@
 void btree_destroy_subtree(btree_node_t *root)
 {
-        int i;
+        count_t i;
 
         if (root->keys) {
@@ -270 +270 @@
         
         if (node->keys > FILL_FACTOR) {
-                int i;
+                count_t i;
 
                 /*
@@ -336 +336 @@
                 } else {
                         void *val;
-                        int i;
+                        count_t i;
                 
                         /*
@@ -443 +443 @@
 void node_insert_key_and_lsubtree(btree_node_t *node, btree_key_t key, void *value, btree_node_t *lsubtree)
 {
-        int i;
+        count_t i;
 
         for (i = 0; i < node->keys; i++) {
                 if (key < node->key[i]) {
-                        int j;
+                        count_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)
 {
-        int i;
+        count_t i;
 
         for (i = 0; i < node->keys; i++) {
                 if (key < node->key[i]) {
-                        int j;
+                        count_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)
 {
-        int i, j;
+        count_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)
 {
-        int i, j;
+        count_t i, j;
         
         for (i = 0; i < node->keys; i++) {
@@ -577 +577 @@
 {
         btree_node_t *rnode;
-        int i, j;
+        count_t i, j;
 
         ASSERT(median);
@@ -604 +604 @@
          * If this is an index node, do not copy the median.
          */
-        i = (int) INDEX_NODE(node);
+        i = (count_t) INDEX_NODE(node);
         for (i += MEDIAN_HIGH_INDEX(node), j = 0; i < node->keys; i++, j++) {
                 rnode->key[j] = node->key[i];
@@ -639 +639 @@
         index_t idx;
         btree_node_t *rnode;
-        int i;
+        count_t i;
 
         ASSERT(!ROOT_NODE(node));
@@ -688 +688 @@
 index_t find_key_by_subtree(btree_node_t *node, btree_node_t *subtree, bool right)
 {
-        int i;
+        count_t i;
         
         for (i = 0; i < node->keys + 1; i++) {
@@ -941 +941 @@
 void btree_print(btree_t *t)
 {
-        int i, depth = t->root->depth;
+        count_t i;
+        int depth = t->root->depth;
         link_t head, *cur;