Changeset 4a23cb6 in mainline

Timestamp:

2008-06-17T21:32:04Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a3124c

Parents:

9f491d7

Message:

Fix an off-by-one bug in avltree1 test and also declare an unused static
function as used. These two bugs were breaking building by gcc 4.3.1.

File:

• kernel/test/avltree/avltree1.c (modified) (6 diffs)

kernel/test/avltree/avltree1.c

@@ -49 +49 @@
 static int test_tree_balance(avltree_node_t *node);
 static avltree_node_t *test_tree_parents(avltree_node_t *node);
-static void print_tree_structure_flat (avltree_node_t *node, int level);
+static void print_tree_structure_flat (avltree_node_t *node, int level)
+    __attribute__ ((used));
 static avltree_node_t *alloc_avltree_node(void);
 
@@ -62 +63 @@
                 tmp = test_tree_parents(node->lft);
                 if (tmp != node) {
-                        printf("Bad parent pointer key: %" PRIu64 ", address: %p\n",
-                            tmp->key, node->lft);
+                        printf("Bad parent pointer key: %" PRIu64
+                            ", address: %p\n", tmp->key, node->lft);
                 }
         }
@@ -69 +70 @@
                 tmp = test_tree_parents(node->rgt);
                 if (tmp != node) {
-                        printf("Bad parent pointer key: %" PRIu64 ", address: %p\n",
+                        printf("Bad parent pointer key: %" PRIu64
+                            ", address: %p\n",
                             tmp->key,node->rgt);
                 }
@@ -95 +97 @@
  * tree. 
  */
-static void print_tree_structure_flat(avltree_node_t *node, int level)
+static void
+print_tree_structure_flat(avltree_node_t *node, int level)
 {
         /*
@@ -131 +134 @@
                 avltree_nodes[i].par = &avltree_nodes[i + 1];
         }
+        avltree_nodes[i].par = NULL;
         
         /*
@@ -170 +174 @@
                 avltree_nodes[i].key = i * 3;
         
-        avltree_nodes[i].par = NULL;
         first_free_node = &avltree_nodes[0];
 }