From 5e920bb96458c6cdd4a999009ba239b7961987bc Mon Sep 17 00:00:00 2001
From: "gagan%netscape.com"
 <gagan%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 7 Oct 1998 00:29:52 +0000
Subject: [PATCH] Removed some asserts.

git-svn-id: svn://10.0.0.236/trunk@12129 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/network/cache/mkcache.c               | 5 +++--
 mozilla/network/cache/nu/src/nsCachePref.cpp  | 2 +-
 mozilla/network/cache/nu/src/nsDiskModule.cpp | 9 +++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/mozilla/network/cache/mkcache.c b/mozilla/network/cache/mkcache.c
index 11158970bf6..3893dc9087a 100644
--- a/mozilla/network/cache/mkcache.c
+++ b/mozilla/network/cache/mkcache.c
@@ -2337,7 +2337,7 @@ NET_ChangeCacheFileLock(URL_Struct *URL_s, XP_Bool set)
 #ifdef NU_CACHE
 {
     PR_ASSERT(0); /* Shouldn't be getting called */
-    return FALSE;
+    return TRUE;
 }
 #else
 {
@@ -3283,7 +3283,8 @@ NET_CleanupCacheDirectory(char * dir_name, const char * prefix)
 	int i;
 	int number_in_remove_list=0;
 #ifdef NU_CACHE 
-    PR_ASSERT(0); /* Shouldn't be getting called */
+    /* PR_ASSERT(0);  Shouldn't be getting called */
+    return 0;
 #endif 
 #ifdef XP_MAC
 
diff --git a/mozilla/network/cache/nu/src/nsCachePref.cpp b/mozilla/network/cache/nu/src/nsCachePref.cpp
index e888ac4c145..ffc0b7d7c82 100644
--- a/mozilla/network/cache/nu/src/nsCachePref.cpp
+++ b/mozilla/network/cache/nu/src/nsCachePref.cpp
@@ -141,7 +141,7 @@ nsCachePref::BkgSleepTime(void)
 
 const char* nsCachePref::DiskCacheDBFilename(void)
 {
-    return "fat.db";
+    return "nufat.db";
 }
 
 nsCachePref* nsCachePref::GetInstance()
diff --git a/mozilla/network/cache/nu/src/nsDiskModule.cpp b/mozilla/network/cache/nu/src/nsDiskModule.cpp
index db7a45e28bf..1a7da624159 100644
--- a/mozilla/network/cache/nu/src/nsDiskModule.cpp
+++ b/mozilla/network/cache/nu/src/nsDiskModule.cpp
@@ -63,6 +63,7 @@ static PRCList g_RecentlyUsedList;
 
 static char* g_FullFilename=0;
 const static int MAX_FILENAME_LEN = 512;
+const static int MAX_OBJECTS_IN_RECENTLY_USED_LIST = 20; // change later TODO.
 
 // Every time we cleanup we cleanup to 75% of the max available size. 
 // This should ideally change to a more const number than a percentage. 
@@ -162,7 +163,7 @@ PRBool nsDiskModule::Contains(nsCacheObject* io_pObject) const
     nsCacheObject* pTemp = GetObject(io_pObject->Address());
     if (pTemp)
     {
-        PR_ASSERT(io_pObject == pTemp); 
+        //PR_ASSERT(io_pObject == pTemp); 
         // until I do a copyFrom function
         return PR_TRUE;
     }
@@ -193,7 +194,11 @@ void nsDiskModule::GarbageCollect(void)
     MonitorLocker ml(this);
     ReduceSizeTo((PRUint32)(CLEANUP_FACTOR*m_Size));
     // TODO
+
     // if the recentlyusedlist has grown too big, trim some objects from there as well
+    //if (MAX_OBJECTS_IN_RECENTLY_USED_LIST <= PR_CLIST(g_RecentlyUsedList)
+	{
+	}
 }
 
 nsCacheObject* nsDiskModule::GetObject(const PRUint32 i_index) const
@@ -296,7 +301,7 @@ PRBool nsDiskModule::InitDB(void)
         0};       /* byte order */
 
     m_pDB = dbopen(
-        nsCachePref::GetInstance()->DiskCacheDBFilename(), 
+        FullFilename(nsCachePref::GetInstance()->DiskCacheDBFilename()), 
         O_RDWR | O_CREAT, 
         0600, 
         DB_HASH,