Changeset 140 for trunk/src/helpers/wphandle.c

Timestamp:

Feb 9, 2002, 6:48:12 PM (24 years ago)

Author:

umoeller

Message:

V0.9.18, plus a bunch of fixes already.

File:

• trunk/src/helpers/wphandle.c (modified) (8 diffs)

trunk/src/helpers/wphandle.c

@@ -260 +260 @@
 /*
  *@@ wphRebuildNodeHashTable:
+ *      builds all the complex cache trees in the
+ *      given handles buffer.
+ *
+ *      If (fQuitOnErrors == TRUE), we'll fail as
+ *      soon as an invalid handle is found. Otherwise
+ *      we will try to continue if the error is not fatal.
  *
  *      Returns:
@@ -269 +275 @@
  *      --  ERROR_WPH_CORRUPT_HANDLES_DATA
  *
+ *      --  ERROR_WPH_DRIV_TREEINSERT_FAILED: duplicate DRIV node
+ *          (non-fatal)
+ *
  *@@added V0.9.16 (2001-10-02) [umoeller]
- */
-
-APIRET wphRebuildNodeHashTable(HHANDLES hHandles)
+ *@@changted V0.9.17 (2002-02-05) [umoeller]: added fQuitOnErrors
+ */
+
+APIRET wphRebuildNodeHashTable(HHANDLES hHandles,
+                               BOOL fQuitOnErrors)
 {
     APIRET arc = NO_ERROR;
@@ -322 +333 @@
                                    (TREE*)pLastDriveTreeNode,
                                    treeCompareStrings))
-                        arc = ERROR_WPH_DRIV_TREEINSERT_FAILED;
+                        if (fQuitOnErrors)
+                            arc = ERROR_WPH_DRIV_TREEINSERT_FAILED;
                 }
 
@@ -355 +367 @@
                         PNODETREENODE pParent;
                         if (!(pParent = pHandlesBuf->NodeHashTable[pNode->usParentHandle]))
+                        {
                             // this parent handle is invalid:
-                            arc = ERROR_WPH_INVALID_PARENT_HANDLE;
+                            if (fQuitOnErrors)
+                                arc = ERROR_WPH_INVALID_PARENT_HANDLE;
+                        }
                         else
                         {
@@ -372 +387 @@
                         }
                         else
-                            arc = ERROR_WPH_NODE_BEFORE_DRIV;
-
-                    if (!arc)
+                            if (fQuitOnErrors)
+                                arc = ERROR_WPH_NODE_BEFORE_DRIV;
+
+                    if (ppTree && pcChildren)
                         if (!treeInsert(ppTree,
                                         pcChildren,
                                         (TREE*)pNew,
                                         treeCompareStrings))
+                        {
                             // store PNODE in hash table
                             pHandlesBuf->NodeHashTable[pNode->usHandle] = pNew;
+                            // do not free
+                            pNew = NULL;
+                        }
                         else
                             ;
@@ -387 +407 @@
                             // arc = ERROR_WPH_NODE_TREEINSERT_FAILED;
 
-                    if (arc)
+                    if (pNew)
                         free(pNew);
 
@@ -641 +661 @@
         // rebuild cache
         if (!pHandlesBuf->fCacheValid)
-            arc = wphRebuildNodeHashTable(hHandles);
+            arc = wphRebuildNodeHashTable(hHandles,
+                                          TRUE);        // fail on errors
 
         if (!arc)
@@ -922 +943 @@
         {
             if (!pHandlesBuf->fCacheValid)
-                arc = wphRebuildNodeHashTable(hHandles);
+                arc = wphRebuildNodeHashTable(hHandles,
+                                              TRUE);        // fail on errors
 
             if (!arc)