Changeset 3555 for trunk/kStuff/include/k/kAVLTmpl/kAVLDoWithAll.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/kAVLDoWithAll.h (modified) (5 diffs)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
- * kAVLDoWithAll - Do with all nodes routine for AVL trees.
- *
- * Copyright (c) 1999-2002 knut st. osmundsen (bird@anduin.net)
- *
- * GPL
+ * kAVLTmpl - Templated AVL Trees, The Callback Iterator.
  */
 
-#ifndef _kAVLDoWithAll_h_
-#define _kAVLDoWithAll_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
+ *
+ */
 
 
 /**
  * Iterates tru all nodes in the given tree.
- * @returns   0 on success. Return from callback on failiure.
- * @param     ppTree   Pointer to the AVL-tree root node pointer.
- * @param     fFromLeft    TRUE:  Left to right.
- *                         FALSE: Right to left.
+ *
+ * @returns   0 on success. Return from callback on failure.
+ * @param     ppTree       Pointer to the AVL-tree root node pointer.
+ * @param     fFromLeft    K_TRUE:  Left to right.
+ *                         K_FALSE: Right to left.
  * @param     pfnCallBack  Pointer to callback function.
- * @param     pvParam      Userparameter passed on to the callback function.
- * @status    completely implemented.
- * @author    knut st. osmundsen
+ * @param     pvUser       User parameter passed on to the callback function.
  */
-unsigned KLIBCALL KAVL_FN(DoWithAll)(PPKAVLNODECORE ppTree, int fFromLeft, PKAVLCALLBACK pfnCallBack, void * pvParam)
+KAVL_DECL(int) KAVL_FN(DoWithAll)(KAVLTREEPTR *ppTree, KBOOL fFromLeft, KAVL_TYPE(PFN,CALLBACK) pfnCallBack, void *pvUser)
 {
-    KLOGENTRY4("unsigned","PPKAVLNODECORE ppTree, int fFromLeft, PKAVLCALLBACK pfnCallBack, void * pvParam", ppTree, fFromLeft, pfnCallBack, pvParam);
-    KAVLSTACK2       AVLStack;
-    PKAVLNODECORE    pNode;
-    unsigned        rc;
+    KAVL_INT(STACK2)   AVLStack;
+    KAVLNODECORE       *pNode;
+    unsigned            rc;
 
-    if (*ppTree == NULL)
+    if (*ppTree == KAVL_NULL)
         return 0;
 
     AVLStack.cEntries = 1;
     AVLStack.achFlags[0] = 0;
-    AVLStack.aEntries[0] = *ppTree;
+    AVLStack.aEntries[0] = KAVL_GET_POINTER(ppTree);
 
     if (fFromLeft)
@@ -47 +58 @@
             if (!AVLStack.achFlags[AVLStack.cEntries - 1]++)
             {
-                if (pNode->pLeft != NULL)
+                if (pNode->pLeft != KAVL_NULL)
                 {
                     AVLStack.achFlags[AVLStack.cEntries] = 0; /* 0 first, 1 last */
-                    AVLStack.aEntries[AVLStack.cEntries++] = pNode->pLeft;
+                    AVLStack.aEntries[AVLStack.cEntries++] = KAVL_GET_POINTER(&pNode->pLeft);
                     continue;
                 }
@@ -56 +67 @@
 
             /* center */
-            rc = pfnCallBack(pNode, pvParam);
-            if (rc != 0)
-            {
-                KLOGEXIT(rc);
+            rc = pfnCallBack(pNode, pvUser);
+            if (rc)
                 return rc;
-            }
 
             /* right */
             AVLStack.cEntries--;
-            if (pNode->pRight != NULL)
+            if (pNode->pRight != KAVL_NULL)
             {
                 AVLStack.achFlags[AVLStack.cEntries] = 0;
-                AVLStack.aEntries[AVLStack.cEntries++] = pNode->pRight;
+                AVLStack.aEntries[AVLStack.cEntries++] = KAVL_GET_POINTER(&pNode->pRight);
             }
         } /* while */
@@ -82 +90 @@
             if (!AVLStack.achFlags[AVLStack.cEntries - 1]++)
             {
-                if (pNode->pRight != NULL)
+                if (pNode->pRight != KAVL_NULL)
                 {
                     AVLStack.achFlags[AVLStack.cEntries] = 0;  /* 0 first, 1 last */
-                    AVLStack.aEntries[AVLStack.cEntries++] = pNode->pRight;
+                    AVLStack.aEntries[AVLStack.cEntries++] = KAVL_GET_POINTER(&pNode->pRight);
                     continue;
                 }
@@ -91 +99 @@
 
             /* center */
-            rc = pfnCallBack(pNode, pvParam);
-            if (rc != 0)
-            {
-                KLOGEXIT(rc);
+            rc = pfnCallBack(pNode, pvUser);
+            if (rc)
                 return rc;
-            }
 
             /* left */
             AVLStack.cEntries--;
-            if (pNode->pLeft != NULL)
+            if (pNode->pLeft != KAVL_NULL)
             {
                 AVLStack.achFlags[AVLStack.cEntries] = 0;
-                AVLStack.aEntries[AVLStack.cEntries++] = pNode->pLeft;
+                AVLStack.aEntries[AVLStack.cEntries++] = KAVL_GET_POINTER(&pNode->pLeft);
             }
         } /* while */
     }
 
-    KLOGEXIT(0);
     return 0;
 }
 
-
-#endif
-