Changeset 54 for trunk/src/helpers/tree.c

Timestamp:

Apr 4, 2001, 4:39:06 PM (24 years ago)

Author:

umoeller

Message:

Misc changes.

File:

• trunk/src/helpers/tree.c (modified) (6 diffs)

trunk/src/helpers/tree.c

@@ -91 +91 @@
  *         The order of nodes in the tree is determined by calling a
  *         node comparison function provided by the caller
- *         (which you must write). This takes two TREE pointers and
- *         must return:
- *
- +           0: tree1 == tree2
- +          -1: tree1 < tree2
- +          +1: tree1 > tree2
+ *         (which you must write). This must be declared as:
+ *
+ +              int TREEENTRY fnMyCompareNodes(TREE *t1, TREE *t2);
+ *
+ *         It obviously receives two TREE pointers, which it must
+ *         compare and return:
+ *
+ +               0: tree1 == tree2
+ +              -1: tree1 < tree2
+ +              +1: tree1 > tree2
  *
  *      -- The "ID" functions (e.g. treeInsertID) do not require
@@ -197 +201 @@
  */
 
-int fnCompareIDs(unsigned long id1, unsigned long id2)
+int TREEENTRY fnCompareIDs(unsigned long id1, unsigned long id2)
 {
     if (id1 < id2)
@@ -259 +263 @@
                  BOOL fAllowDuplicates)   // in: whether duplicates with the same ID are allowed
 {
-    TREE
-       *current,
-       *parent;
-    int
-        last_comp = 0;
+    TREE    *current,
+            *parent;
+    int     last_comp = 0;
 
     // find where node belongs
@@ -276 +278 @@
             case -1: current = current->left;  break;
             case  1: current = current->right; break;
-            default: if (fAllowDuplicates)
-                         current = current->left;
-                     else
-                         return TREE_DUPLICATE;
-
+            default:
+                if (fAllowDuplicates)
+                    current = current->left;
+                else
+                    return TREE_DUPLICATE;
         }
     }
@@ -691 +693 @@
  *@@ treeFindEQID:
  *      finds a node with ID exactly matching that provided.
+ *      Returns NULL if not found.
  */
 
@@ -698 +701 @@
     TREE
        *current = *root,
-       *found;
-
-    found = NULL;
+       *found = NULL;
+
     while (current != TREE_NULL)
         switch (fnCompareIDs(current->id, id))