Changeset 1db44ea in mainline for kernel/generic/src/adt/btree.c

Timestamp:

2011-09-25T18:46:45Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

36cb22f

Parents:

dcc44ca1 (diff), f9d8c3a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

kernel/generic/src/adt/btree.c

@@ -38 +38 @@
  *
  * The B+tree has the following properties:
- * @li it is a ballanced 3-4-5 tree (i.e. BTREE_M = 5)
+ * @li it is a balanced 3-4-5 tree (i.e. BTREE_M = 5)
  * @li values (i.e. pointers to values) are stored only in leaves
  * @li leaves are linked in a list
  *
- * Be carefull when using these trees. They need to allocate
+ * Be careful when using these trees. They need to allocate
  * and deallocate memory for their index nodes and as such
  * can sleep.
@@ -146 +146 @@
  * also makes use of this feature.
  *
- * @param node     B-tree node into wich the new key is to be inserted.
+ * @param node     B-tree node into which the new key is to be inserted.
  * @param key      The key to be inserted.
  * @param value    Pointer to value to be inserted.
@@ -270 +270 @@
  * This feature is used during insert by right rotation.
  *
- * @param node     B-tree node into wich the new key is to be inserted.
+ * @param node     B-tree node into which the new key is to be inserted.
  * @param key      The key to be inserted.
  * @param value    Pointer to value to be inserted.
@@ -463 +463 @@
         if (rnode->keys < BTREE_MAX_KEYS) {
                 /*
-                 * The rotaion can be done. The right sibling has free space.
+                 * The rotation can be done. The right sibling has free space.
                  */
                 node_insert_key_and_rsubtree(node, inskey, insvalue, rsubtree);
@@ -484 +484 @@
  * the median will be copied there.
  *
- * @param node     B-tree node wich is going to be split.
+ * @param node     B-tree node which is going to be split.
  * @param key      The key to be inserted.
  * @param value    Pointer to the value to be inserted.
@@ -562 +562 @@
         if (node->keys < BTREE_MAX_KEYS) {
                 /*
-                 * Node conatins enough space, the key can be stored immediately.
+                 * Node contains enough space, the key can be stored immediately.
                  */
                 node_insert_key_and_rsubtree(node, key, value, rsubtree);
@@ -806 +806 @@
                 
                 /*
-                 * The key can be immediatelly removed.
+                 * The key can be immediately removed.
                  *
                  * Note that the right subtree is removed because when