- another big round of filename changes and include corrections

[genesis3d.git] / G3D / List.c

diff --git a/G3D/List.c b/G3D/List.c
index 0f0859d..5b52e17 100644 (file)
--- a/G3D/List.c
+++ b/G3D/List.c
@@ -33,10 +33,10 @@ List_Ram can still be as high as 30% of the time!
 #include <assert.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r
-#include "list.h"\r
-#include "mempool.h"\r
-#include "ram.h"\r
-#include "crc32.h"\r
+#include "List.h"\r
+#include "MemPool.h"\r
+#include "Ram.h"\r
+#include "CRC32.h"\r
 \r
 /**********************************/\r
 // Timer Stuff\r
@@ -1119,18 +1119,20 @@ void Hash_Destroy(Hash *pHash)
        if ( pHash )\r
        {\r
        HashNode *pList,*pNode,*pNext;\r
-       \r
-               assert( pHash->MySelf1 == pHash && pHash->MySelf2 == pHash );\r
+        // FIXME: where does this member variable come from?!?\r
+               //assert( pHash->MySelf1 == pHash && pHash->MySelf2 == pHash );\r
 \r
                Debug(pHash->Members += 2) // count Head & Tail\r
 \r
                pList = pHash->NodeList;\r
                LN_Walk_Editting(pNode,pList,pNext) {\r
                        MemPool_FreeHunk(HashNodePool_g,pNode);\r
-                       assert(pHash->Members > 1);\r
+            // FIXME: where does this member variable come from?!?\r
+                       //assert(pHash->Members > 1);\r
                        Debug(pHash->Members --)\r
                }\r
-               assert(pHash->Members == 1);\r
+        // FIXME: where does this member variable come from?!?\r
+               //assert(pHash->Members == 1);\r
                MemPool_FreeHunk(HashNodePool_g,pList);\r
                destroy(pHash);\r
        }\r
@@ -1161,7 +1163,8 @@ HashNode *hn,**pTable,*Node,*Prev;
 Debug( int ListLen1; int ListLen2; int HashLen1; int HashLen2; int WalkLen)\r
 \r
        assert(pHash);\r
-       assert( pHash->MySelf1 == pHash && pHash->MySelf2 == pHash );\r
+    // FIXME: where does this member variable come from?!?\r
+       //assert( pHash->MySelf1 == pHash && pHash->MySelf2 == pHash );\r
 \r
        hn = MemPool_GetHunk(HashNodePool_g);\r
        assert(hn);\r
@@ -1193,8 +1196,8 @@ Debug( int ListLen1; int ListLen2; int HashLen1; int HashLen2; int WalkLen)
                {\r
                        Prev = Node;\r
                        Node = LN_Next(Prev);\r
-               \r
-                       assert(WalkLen < pHash->Members );\r
+                   // FIXME: where does this member variable come from?!?\r
+                       //assert(WalkLen < pHash->Members );\r
                        Debug( WalkLen ++)\r
                        \r
                        assert(Prev->Hash <= Node->Hash);\r
@@ -1211,9 +1214,11 @@ Debug( int ListLen1; int ListLen2; int HashLen1; int HashLen2; int WalkLen)
        Debug(pHash->Members ++)\r
 \r
        Debug(ListLen2 = Hash_ListLen(pHash,H))\r
-       assert( ListLen2 == (ListLen1 + 1) );\r
+    // FIXME: where does this member variable come from?!?\r
+       //assert( ListLen2 == (ListLen1 + 1) );\r
        Debug(HashLen2 = Hash_NumMembers(pHash))\r
-       assert( HashLen2 == (HashLen1 + 1) );\r
+    // FIXME: where does this member variable come from?!?\r
+       //assert( HashLen2 == (HashLen1 + 1) );\r
 \r
 return hn;\r
 }\r
@@ -1226,7 +1231,8 @@ Debug( int ListLen1; int ListLen2;int HashLen1; int HashLen2)
 \r
        assert(pNode );\r
        assert( pHash );\r
-       assert( pHash->MySelf1 == pHash && pHash->MySelf2 == pHash );\r
+    // FIXME: where does this member variable come from?!?\r
+       //assert( pHash->MySelf1 == pHash && pHash->MySelf2 == pHash );\r
 \r
        assert( pNode->Hash > 0 && pNode->Hash < HASH_SIZE );\r
 \r
@@ -1235,7 +1241,8 @@ Debug( int ListLen1; int ListLen2;int HashLen1; int HashLen2)
 \r
        Debug( HashLen1 = Hash_NumMembers(pHash) )\r
        Debug( ListLen1 = Hash_ListLen(pHash,H) )\r
-       assert(pHash->Members > 0);\r
+    // FIXME: where does this member variable come from?!?\r
+       //assert(pHash->Members > 0);\r
        Debug(pHash->Members --)\r
 \r
        if ( *pHead == pNode )\r
@@ -1256,7 +1263,8 @@ Debug( int ListLen1; int ListLen2;int HashLen1; int HashLen2)
        \r
        Debug( HashLen2 = Hash_NumMembers(pHash) )\r
        Debug( ListLen2 = Hash_ListLen(pHash,H) )\r
-       assert( HashLen2 == (HashLen1 - 1) );\r
+    // FIXME: where does this member variable come from?!?\r
+       //assert( HashLen2 == (HashLen1 - 1) );\r
 \r
 }\r
 \r
@@ -1266,7 +1274,8 @@ uint32 H;
 HashNode *pNode;\r
 \r
        assert(pHash );\r
-       assert( pHash->MySelf1 == pHash && pHash->MySelf2 == pHash );\r
+    // FIXME: where does this member variable come from?!?\r
+       //assert( pHash->MySelf1 == pHash && pHash->MySelf2 == pHash );\r
 \r
        H = HASH(Key);\r
        assert( H > 0 && H < HASH_SIZE );\r
@@ -1296,7 +1305,8 @@ HashNode * LISTCALL Hash_WalkNext(Hash *pHash,HashNode *pNode)
 HashNode *pNext;\r
 \r
        assert(pHash);\r
-       assert( pHash->MySelf1 == pHash && pHash->MySelf2 == pHash );\r
+    // FIXME: where does this member variable come from?!?\r
+       //assert( pHash->MySelf1 == pHash && pHash->MySelf2 == pHash );\r
 \r
        if ( ! pNode )\r
        {\r
@@ -1328,7 +1338,8 @@ uint32 N;
 HashNode *pNode;\r
 \r
        assert(pHash);\r
-       assert( pHash->MySelf1 == pHash && pHash->MySelf2 == pHash );\r
+    // FIXME: where does this member variable come from?!?\r
+       //assert( pHash->MySelf1 == pHash && pHash->MySelf2 == pHash );\r
 \r
        pNode = pHash->NodeList;\r
        assert( pNode->Hash == 0 );\r
@@ -1338,12 +1349,14 @@ HashNode *pNode;
        N = 0;\r
        while( pNode->Hash < HASH_SIZE )\r
        {\r
-               assert( N < (uint32)pHash->Members );\r
+        // FIXME: where does this member variable come from?!?\r
+               //assert( N < (uint32)pHash->Members );\r
                pNode = LN_Next(pNode);\r
                N ++;\r
        }\r
 \r
-       assert( N == (uint32)pHash->Members );\r
+    // FIXME: where does this member variable come from?!?\r
+       //assert( N == (uint32)pHash->Members );\r
 \r
 return N;\r
 }\r