Changeset 3555 for trunk/kStuff/include/k/kAVLTmpl/kAVLGet.h

Timestamp:

Aug 26, 2007, 12:43:27 PM (18 years ago)

Author:

bird

Message:

Merging in kAvl enhancements, doing some config simplications and made them inlineable.

File:

• trunk/kStuff/include/k/kAVLTmpl/kAVLGet.h (modified) (1 diff)

trunk/kStuff/include/k/kAVLTmpl/kAVLGet.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
- * kAVLGet - get routine for AVL trees.
- *
- * Copyright (c) 1999-2002 knut st. osmundsen (bird@anduin.net)
- *
- * GPL
+ * kAVLTmpl - Templated AVL Trees, Get a Node.
  */
 
-#ifndef _kAVLGet_h_
-#define _kAVLGet_h_
+/*
+ * Copyright (c) 1999-2007 knut st. osmundsen <bird-src-spam@anduin.net>
+ *
+ * This file is part of kStuff.
+ *
+ * kStuff is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * kStuff is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with kStuff; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
 
 
 /**
  * Gets a node from the tree (does not remove it!)
+ *
  * @returns   Pointer to the node holding the given key.
  * @param     ppTree  Pointer to the AVL-tree root node pointer.
  * @param     Key     Key value of the node which is to be found.
- * @sketch
- * @status    completely implemented.
- * @author    knut st. osmundsen
  */
-PKAVLNODECORE KLIBCALL KAVL_FN(Get)(PPKAVLNODECORE ppTree, KAVLKEY Key)
+KAVL_DECL(KAVLNODECORE *) KAVL_FN(Get)(KAVLTREEPTR *ppTree, KAVLKEY Key)
 {
-    KLOGENTRY2("PKAVLNODECORE","PPKAVLNODECORE ppTree, KAVLKEY Key", ppTree, Key);
-    #ifndef AVL_CMP
-    register PKAVLNODECORE   pNode = *ppTree;
+    KAVLNODECORE *pNode;
+    if (*ppTree == KAVL_NULL)
+        return NULL;
 
-    while (pNode != NULL && AVL_NE(pNode->Key, Key))
+    pNode = KAVL_GET_POINTER(ppTree);
+    while (KAVL_NE(pNode->Key, Key))
     {
-        if (AVL_G(pNode->Key, Key))
-            pNode = pNode->pLeft;
+        if (KAVL_G(pNode->Key, Key))
+        {
+            if (pNode->pLeft == KAVL_NULL)
+                return NULL;
+            pNode = KAVL_GET_POINTER(&pNode->pLeft);
+        }
         else
-            pNode = pNode->pRight;
+        {
+            if (pNode->pRight == KAVL_NULL)
+                return NULL;
+            pNode = KAVL_GET_POINTER(&pNode->pRight);
+        }
     }
-
-    #else
-
-    register int            iDiff;
-    register PKAVLNODECORE   pNode = *ppTree;
-
-    while (pNode != NULL && (iDiff = AVL_CMP(pNode->Key, Key)) != 0)
-    {
-        if (iDiff > 0)
-            pNode = pNode->pLeft;
-        else
-            pNode = pNode->pRight;
-    }
-
-    #endif
-
-    KLOGEXIT(pNode);
     return pNode;
 }
 
-
-#endif