Changeset b3f8fb7 in mainline for kernel/generic/include/adt/btree.h

Timestamp:

2007-01-28T13:25:49Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8e8c1a5

Parents:

1ba41c5

Message:

huge type system cleanup
remove cyclical type dependencies across multiple header files
many minor coding style fixes

File:

• kernel/generic/include/adt/btree.h (modified) (4 diffs)

kernel/generic/include/adt/btree.h

@@ -37 +37 @@
 
 #include <arch/types.h>
-#include <typedefs.h>
 #include <adt/list.h>
 
@@ -46 +45 @@
 
 /** B-tree node structure. */
-struct btree_node {
+typedef struct btree_node {
         /** Number of keys. */
         count_t keys;
@@ -66 +65 @@
          * There is room for storing a subtree pointer for the extra key.
          */
-        btree_node_t *subtree[BTREE_M + 1];
+        struct btree_node *subtree[BTREE_M + 1];
 
         /** Pointer to parent node. Root node has NULL parent. */
-        btree_node_t *parent;
+        struct btree_node *parent;
 
         /** Link connecting leaf-level nodes. Defined only when this node is a leaf. */
@@ -77 +76 @@
         link_t bfs_link;
         int depth;
-};
+} btree_node_t;
 
 /** B-tree structure. */
-struct btree {
+typedef struct {
         btree_node_t *root;     /**< B-tree root node pointer. */
         link_t leaf_head;       /**< Leaf-level list head. */
-};
+} btree_t;
 
 extern void btree_init(void);