From b9a3a759965a1f2bd7fc980dc49192b57ad16080 Mon Sep 17 00:00:00 2001
From: "gagan%netscape.com" <gagan%netscape.com>
Date: Tue, 29 Sep 1998 21:18:53 +0000
Subject: [PATCH] Inlined pref accessor/modifiers.

---
 network/cache/nu/public/nsCachePref.h | 52 +++++++++++++++++++++++++++
 network/cache/nu/src/makefile.win     |  2 +-
 network/cache/nu/src/nsCachePref.cpp  | 40 ---------------------
 network/cache/nu/src/nsDiskModule.cpp |  6 ++--
 4 files changed, 57 insertions(+), 43 deletions(-)

diff --git a/network/cache/nu/public/nsCachePref.h b/network/cache/nu/public/nsCachePref.h
index 9e3f9b6de46d..c9f3d022218b 100644
--- a/network/cache/nu/public/nsCachePref.h
+++ b/network/cache/nu/public/nsCachePref.h
@@ -29,6 +29,7 @@
 
 //#include "nsISupports.h"
 #include "prtypes.h"
+#include "prlog.h"
 
 class nsCachePref //: public nsISupports
 {
@@ -91,5 +92,56 @@ private:
     PRUint32                m_BkgSleepTime;
 };
 
+inline
+PRUint32 nsCachePref::DiskCacheSize()
+{
+    return m_DiskCacheSize;
+}
+
+inline
+void nsCachePref::DiskCacheSize(const PRUint32 i_Size)
+{
+    m_DiskCacheSize = i_Size;
+}
+
+inline
+PRBool nsCachePref::DiskCacheSSL(void)
+{
+    return m_bDiskCacheSSL;
+}
+
+inline
+void nsCachePref::DiskCacheSSL(PRBool bSet)
+{
+    m_bDiskCacheSSL = bSet;
+}
+
+inline
+const char* 
+nsCachePref::DiskCacheFolder(void)
+{
+    PR_ASSERT(m_DiskCacheFolder);
+    return m_DiskCacheFolder;
+}
+
+inline
+PRUint32 nsCachePref::MemCacheSize()
+{
+    return m_MemCacheSize;
+}
+
+inline
+void nsCachePref::MemCacheSize(const PRUint32 i_Size)
+{
+    m_MemCacheSize = i_Size;
+}
+
+inline
+PRBool nsCachePref::RevalidateInBkg(void)
+{
+    return m_bRevalidateInBkg;
+}
+
+
 #endif // nsCachePref_h__
 
diff --git a/network/cache/nu/src/makefile.win b/network/cache/nu/src/makefile.win
index 5c3475612dad..dff877174f03 100644
--- a/network/cache/nu/src/makefile.win
+++ b/network/cache/nu/src/makefile.win
@@ -33,7 +33,7 @@ LLIBS =				 \
 	$(DIST)\lib\libplc21.lib \
 	$(DIST)\lib\dbm32.lib    \
  	$(DIST)\lib\xpcom32.lib  \
-    $(DIST)\lib\libpref.lib  \
+        $(DIST)\lib\libpref.lib  \
 	$(NULL)
 
 MISCDEP = $(LLIBS)
diff --git a/network/cache/nu/src/nsCachePref.cpp b/network/cache/nu/src/nsCachePref.cpp
index e745e761586f..f1a319c6a2a2 100644
--- a/network/cache/nu/src/nsCachePref.cpp
+++ b/network/cache/nu/src/nsCachePref.cpp
@@ -137,57 +137,17 @@ nsCachePref::BkgSleepTime(void)
     return BKG_THREAD_SLEEP; 
 }
 
-PRUint32 nsCachePref::DiskCacheSize()
-{
-    return m_DiskCacheSize;
-}
-
-void nsCachePref::DiskCacheSize(const PRUint32 i_Size)
-{
-    m_DiskCacheSize = i_Size;
-}
-
-PRBool nsCachePref::DiskCacheSSL(void)
-{
-    return m_bDiskCacheSSL;
-}
-
-void nsCachePref::DiskCacheSSL(PRBool bSet)
-{
-    m_bDiskCacheSSL = bSet;
-}
-
 const char* nsCachePref::DiskCacheDBFilename(void)
 {
     return "fat.db";
 }
 
-const char* nsCachePref::DiskCacheFolder(void)
-{
-    return "";
-}
-
 nsCachePref* nsCachePref::GetInstance()
 {
     PR_ASSERT(nsCacheManager::GetInstance()->GetPrefs());
     return nsCacheManager::GetInstance()->GetPrefs();
 }
 
-PRUint32 nsCachePref::MemCacheSize()
-{
-    return m_MemCacheSize;
-}
-
-void nsCachePref::MemCacheSize(const PRUint32 i_Size)
-{
-    m_MemCacheSize = i_Size;
-}
-
-PRBool nsCachePref::RevalidateInBkg(void)
-{
-    return m_bRevalidateInBkg;
-}
-
 /*
 nsrefcnt nsCachePref::AddRef(void)
 {
diff --git a/network/cache/nu/src/nsDiskModule.cpp b/network/cache/nu/src/nsDiskModule.cpp
index 25cfbf2b191a..882fb3ff9cfb 100644
--- a/network/cache/nu/src/nsDiskModule.cpp
+++ b/network/cache/nu/src/nsDiskModule.cpp
@@ -27,8 +27,9 @@
 #include "prmem.h"
 #include "plstr.h"
 #include "prlog.h"
-#include "prclist.h"
-#include "prio.h"
+#include "prclist.h" 
+#include "prio.h" 
+#include "prsystem.h" // Directory Separator 
 
 #include "nsDiskModule.h"
 #include "nsCacheObject.h"
@@ -444,6 +445,7 @@ char* FullFilename(const char* i_Filename)
             return 0;
     }
     PL_strcpy(g_FullFilename, nsCachePref::GetInstance()->DiskCacheFolder());
+    PL_strcat(g_FullFilename, (const char*)PR_GetDirectorySepartor()); //spelling check later as nspr fixes it. 
     PL_strcat(g_FullFilename, i_Filename);
     return g_FullFilename;
 }