From 46a406db90076a69941402c93301cb79c3500a6e Mon Sep 17 00:00:00 2001
From: "mcmullen%netscape.com"
 <mcmullen%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 14 Jan 1999 23:21:06 +0000
Subject: [PATCH] Added all the nucache files to the memory module project (as
 a group) so that NU_CACHE can be turned on with a flick of the wrist, made
 the modular memory library build with the NU_CACHE flag turned on, fixed
 build warnings and errors.  The NU_CACHE flag is still OFF, because the
 database code doesn't exist for Macintosh or Unix :-(

git-svn-id: svn://10.0.0.236/trunk@17778 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/lib/xp/xp_stub.c                     |  12 +++---
 mozilla/network/cache/nu/src/nsCachePref.cpp |  41 +++----------------
 mozilla/network/macbuild/network.mcp         | Bin 124575 -> 145935 bytes
 mozilla/network/main/mkautocf.c              |   1 +
 mozilla/network/main/mkgeturl.c              |   2 +-
 mozilla/network/main/mkstream.c              |   2 +-
 mozilla/network/module/nsHttpURLFactory.cpp  |   1 +
 mozilla/network/module/nsHttpUrl.cpp         |   3 +-
 mozilla/network/module/nsIRelatedLinks.h     |   1 +
 mozilla/network/module/nsNetFactory.cpp      |   1 +
 mozilla/network/protocol/about/mkabout.c     |   6 +--
 mozilla/network/protocol/http/mkaccess.c     |   8 ++--
 mozilla/network/protocol/http/mkhttp.c       |  12 +++---
 13 files changed, 31 insertions(+), 59 deletions(-)

diff --git a/mozilla/lib/xp/xp_stub.c b/mozilla/lib/xp/xp_stub.c
index 37cf00c6f5d..ca269225db0 100644
--- a/mozilla/lib/xp/xp_stub.c
+++ b/mozilla/lib/xp/xp_stub.c
@@ -72,12 +72,12 @@ XP_GetBuiltinString(int16 i)
 
 	if
 	(
-		((ret = mcom_include_merrors_i_strings (i))) ||
-		((ret = mcom_include_secerr_i_strings  (i))) ||
-		((ret = mcom_include_sec_dialog_strings(i))) ||
-		((ret = mcom_include_sslerr_i_strings  (i))) ||
-		((ret = mcom_include_xp_error_i_strings(i))) ||
-		((ret = mcom_include_xp_msg_i_strings  (i)))
+		((ret = mcom_include_merrors_i_strings (i)) != 0) ||
+		((ret = mcom_include_secerr_i_strings  (i)) != 0) ||
+		((ret = mcom_include_sec_dialog_strings(i)) != 0) ||
+		((ret = mcom_include_sslerr_i_strings  (i)) != 0) ||
+		((ret = mcom_include_xp_error_i_strings(i)) != 0) ||
+		((ret = mcom_include_xp_msg_i_strings  (i)) != 0)
 	)
 	{
 		return ret;
diff --git a/mozilla/network/cache/nu/src/nsCachePref.cpp b/mozilla/network/cache/nu/src/nsCachePref.cpp
index 858ff19eeb1..61b94ce94f3 100644
--- a/mozilla/network/cache/nu/src/nsCachePref.cpp
+++ b/mozilla/network/cache/nu/src/nsCachePref.cpp
@@ -113,50 +113,19 @@ nsCachePref::SetupPrefs(const char* i_Pref)
 
     if (bSetupAll || !PL_strcmp(i_Pref,CACHE_DIR_PREF)) 
     {
-#ifdef XP_MAC
-		tempPref = CPrefs::GetCachePath();
-		if (tempPref)
-		{
-			if (m_DiskCacheFolder)
-				delete m_DiskCacheFolder;
+	    if (PREF_OK == PREF_CopyPathPref(CACHE_DIR_PREF,&tempPref))
+        {
+            PR_ASSERT(tempPref);
+            delete [] m_DiskCacheFolder;
 			m_DiskCacheFolder =  new char[PL_strlen(tempPref)+2];
-		
 	        if (!m_DiskCacheFolder)
 	        {
 	            if (tempPref)
 	                PR_Free(tempPref);
 	            return;
 	        }
-	        /* Changing the mac path to unix because nspr converts 
-	           it the other way round and cant deal with it being a mac path */
-	        m_DiskCacheFolder[0]='/';
-	        m_DiskCacheFolder[1]='\0';
-	        PL_strcat(m_DiskCacheFolder, tempPref);
-	        char *tempPref2 = m_DiskCacheFolder+1;
-		    while (*tempPref2)
-		    {
-		    	if (*tempPref2 == ':')
-		    		*tempPref2 = '/';
-    			tempPref2++;
-    		}
-		     
-	   }
-#else
-	    if (PREF_OK == PREF_CopyCharPref(CACHE_DIR_PREF,&tempPref))
-        {
-            PR_ASSERT(tempPref);
-            if (m_DiskCacheFolder)
-                delete m_DiskCacheFolder;
-            m_DiskCacheFolder = new char[PL_strlen(tempPref)+1];
-            if (!m_DiskCacheFolder)
-            {
-                if (tempPref)
-                    PR_Free(tempPref);
-                return;
-            }
             PL_strcpy(m_DiskCacheFolder, tempPref);
-        }
-#endif
+	    }
         else //TODO set to temp folder
         {
 #if defined(MODULAR_NETLIB) && defined(XP_PC)
diff --git a/mozilla/network/macbuild/network.mcp b/mozilla/network/macbuild/network.mcp
index 6c0bedfc8ee0fbdf9039bbd3e397556fd5ef28fc..9cf18d49b2641d301f4296065b353590e4e137a6 100644
GIT binary patch
delta 3852
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

delta 1898
zcmbuAYiv|S6vyYxb|2lnw6wMD?LK-T(540Z0s>W%KB-usPzaC^4Jrr;3D61^fvDXG
zk|+UP2Usm2uO>D?cx1#Y#6Xdzp+$(%Y6zkQKQt(b1%n7pO#RQ!wke6<JexC*-#Ig9
zX3m}24<2|9Ty+PRH#Dqfj5!#iJVrNq8QpX<=KUD#wbQ|5sxuhlV;BpxFct*l=qn+X
zgCfF7cNu>RwlHIJzGbW)O!etL<H}42nKM=&k{juaQ<k_#ldSP<Nq|*;ZS;{mo^;&7
z>3i{Zs$aIH9^#SuQc;_pWFBxG9~`{Vp$3l>pG=wO<>DYEhzmXKqh`Q12|5{CBeH{;
zR3WAYtxzTURnTha9O!e<nb7B<wc^$f0TBtB*oGFh>Lp$jUbSGoizPlZe2fl@hvrrT
zhFoYKG+%Uv=FtX`nq5x2#8JOL1&(#lp%Ht0qS9X>c3Wk_2qcNCXuso66UmnoMXePQ
z6GC@mqZi8c`PG!RA2Eh>7uvg-Q_^J@i7qPj5#f-b_=y~=N*wcN32ByztJ&#dFe^ih
zzU&dn=MDLf<>2m5|9T%A+$U-J00|nO39y~9iH`stlR7c7?AyiEO!DH?K1cMUX_O)R
z+YOg&Eomow1!-cytWN7kFbLgaNwFG<6s1|!!kAnr3a4zdH>HxpE3;07xpOaa?TOC!
z(>Ujc7%}ianq$O;8S~}-s_`D_?Y>EJ|D4)|(s8jLpF^dclEAkZ(QlG@o+@(0;*%4_
zl9PE#om&z3ZyoquG#{#FY%+1G$7lCGO^?Yg9!m)h(RZbd;zxUQ(lVrFlALw+3$JL8
zdZoMYK1Xy97iMmUyw)8c(VN>UUADpHkrFq_Pp;icwC}H_mOyl2Ii*MH7ue@6QA2?T
zpSg2x!`c;*%8;F%$tRe0>9e#pC==~Oto<u{#{$Ysh}0+BM;0NODyeewgP%i@nfWq&
zeY+{#)BFE>rYh4xOS_`Wi+DkRUEidx;F|SK>u_K1sJz64-t3AVE8;s{xtWYP!*+Qw
z@8ZpD%IA!Yy0fOKQC)BKS;r+4qv=)f^#CKd`6K$H!B;)W1GqI*v8HKt!;{=viN3#a
z-HMfrABGPvLm%=0t1M`2)`rKOFqCUU`yY(C49#1{gIB~jjs1-=b8d_~vKN4>YYVYY
zAh28e50-+fs|@KJK-;7JP25ket~bOAqbSq<-ObZsQ11f7DngMI4<Nv6Vwin-2K6#M
zVDD{k>_Ulk9>r7IKNY9Q)tdpazC+>Fyx<VHdPgAEO%!@#4)z{+Eo16%SeJVJI&^@@
zX&7cH3XW4DQ%_Xa1U_5y?q5*1X<qgxxO%i8lLt{0>UlbGnp{0JkSp8lyHogXYG$n&
zBa*G&thn@G`NPQ`!OcE63?+L64{n41P_jpGKjx1o+gOx^6)cSfpgq`XLF0?Dr5UHN
zE&h^@JTW?)Y@_5?@R#*~OJ|3ZZJhcE{1xpVx-pz=qs0barg_!A=nK>MPQO2lzD}-T
z&V_xIw)@Z9j#8dY%>lJqoit;|XK>h{9W1Oio-`vI0)HdU$D!6qGtT`EzESg8?WlFm
we2;J%9G|n2+3JnaIr9yuc{XcqyHK|^Mh`y2^D`D7fk98|yZ1WU_!DI8U+N#E)&Kwi

diff --git a/mozilla/network/main/mkautocf.c b/mozilla/network/main/mkautocf.c
index f02ebe637e1..f4729cf165e 100644
--- a/mozilla/network/main/mkautocf.c
+++ b/mozilla/network/main/mkautocf.c
@@ -55,6 +55,7 @@
 #include "jsapi.h"
 #include "jscompat.h"
 #include "jspubtd.h"
+#include "jsautocf.h"
 
 /* for XP_GetString() */
 #include "xpgetstr.h"
diff --git a/mozilla/network/main/mkgeturl.c b/mozilla/network/main/mkgeturl.c
index 47e06ae45e1..26da1e0b278 100644
--- a/mozilla/network/main/mkgeturl.c
+++ b/mozilla/network/main/mkgeturl.c
@@ -2982,7 +2982,7 @@ redo_load_switch:   /* come here on file/ftp retry */
 							 this_entry->proxy_conf,
 							 &this_entry->proxy_addr,
 							 &this_entry->socks_host,
-							 &this_entry->socks_port))
+							 &this_entry->socks_port)) != 0
 		&& this_entry->proxy_addr
 		)
 	  {
diff --git a/mozilla/network/main/mkstream.c b/mozilla/network/main/mkstream.c
index a2db4e9c228..aa6f278eda0 100644
--- a/mozilla/network/main/mkstream.c
+++ b/mozilla/network/main/mkstream.c
@@ -607,7 +607,7 @@ NET_DumpDecoders()
     net_ConverterStruct * cs_ptr;
     XP_List *list_ptr = net_decoder_list[FO_PRESENT];
 
-    while((cs_ptr = XP_ListNextObject(list_ptr)))
+    while((cs_ptr = XP_ListNextObject(list_ptr)) != 0)
     {
         char *msg = PR_smprintf("in: %s  out: %d\n",cs_ptr->encoding_in, cs_ptr->format_out);
 
diff --git a/mozilla/network/module/nsHttpURLFactory.cpp b/mozilla/network/module/nsHttpURLFactory.cpp
index 92f60215698..09b4555f704 100644
--- a/mozilla/network/module/nsHttpURLFactory.cpp
+++ b/mozilla/network/module/nsHttpURLFactory.cpp
@@ -19,6 +19,7 @@
 #include "nsIProtocolURLFactory.h"
 #include "nsHttpUrl.h"
 #include "nsINetService.h"
+#include "nsNetThread.h"
 #include "nsIServiceManager.h"
 #include "nsString.h"
 
diff --git a/mozilla/network/module/nsHttpUrl.cpp b/mozilla/network/module/nsHttpUrl.cpp
index 635a12b6227..07e645b5e39 100644
--- a/mozilla/network/module/nsHttpUrl.cpp
+++ b/mozilla/network/module/nsHttpUrl.cpp
@@ -30,8 +30,7 @@
 #include "prmem.h"
 #include "plstr.h"
 #include "nsCRT.h"
-
-MWContext *new_stub_context(URL_Struct *URL_s);
+#include "nsStubContext.h"
 
 static NS_DEFINE_IID(kIOutputStreamIID,  NS_IOUTPUTSTREAM_IID);
 static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
diff --git a/mozilla/network/module/nsIRelatedLinks.h b/mozilla/network/module/nsIRelatedLinks.h
index 8bcb2fc2766..c7004d0d898 100644
--- a/mozilla/network/module/nsIRelatedLinks.h
+++ b/mozilla/network/module/nsIRelatedLinks.h
@@ -68,6 +68,7 @@ public:
 
 };
 
+extern "C" void RL_Init();
 extern "C" nsIRelatedLinks * NS_NewRelatedLinks(); 
 
 #endif
diff --git a/mozilla/network/module/nsNetFactory.cpp b/mozilla/network/module/nsNetFactory.cpp
index 166b73a432a..659dd69e680 100644
--- a/mozilla/network/module/nsNetFactory.cpp
+++ b/mozilla/network/module/nsNetFactory.cpp
@@ -21,6 +21,7 @@
 #include "nsISupports.h"
 #include "nsINetService.h"
 #include "nsNetService.h"
+#include "nsRepository.h"
 
 /* This implementation of the network service factory is presently
  * only taking advantage of the service retrieval benefit that the
diff --git a/mozilla/network/protocol/about/mkabout.c b/mozilla/network/protocol/about/mkabout.c
index 26a1256772e..c01346c7011 100644
--- a/mozilla/network/protocol/about/mkabout.c
+++ b/mozilla/network/protocol/about/mkabout.c
@@ -79,7 +79,7 @@ static PRHashTable *net_AboutTable = NULL;
 PRIVATE PRIntn net_AboutComparator(const void *v1, const void *v2)
 {
     char *idx = NULL;
-    if (idx = PL_strchr((char *) v1, '?')) {
+    if ((idx = PL_strchr((char *) v1, '?')) != 0) {
         int len = (int)(idx - (char *) v1);
         return PL_strncasecmp((char *) v1, (char *) v2, len) == 0;
     } else {
@@ -101,7 +101,7 @@ PRIVATE PLHashNumber net_HashAbout(const void *key)
 PRIVATE PRBool net_DoRegisteredAbout(const char *which, ActiveEntry *entry)
 {
     NET_AboutCB cb;
-    if (cb = (NET_AboutCB) PL_HashTableLookup(net_AboutTable, which)) {
+    if ((cb = (NET_AboutCB) PL_HashTableLookup(net_AboutTable, which))!= 0) {
         return cb(which, entry->format_out, entry->URL_s, entry->window_id);
     }
     return PR_FALSE;
@@ -138,7 +138,7 @@ net_OutputURLDocInfo(MWContext *ctxt, char *which, char **data, int32 *length)
 	char buf[64];
 	char *tmp=0;
 	char *escaped;
-	char *sec_msg, *il_msg;
+	char *il_msg;
 
 	NET_FindURLInCache(URL_s, ctxt);
 
diff --git a/mozilla/network/protocol/http/mkaccess.c b/mozilla/network/protocol/http/mkaccess.c
index acc225b6238..dc8b14a619a 100644
--- a/mozilla/network/protocol/http/mkaccess.c
+++ b/mozilla/network/protocol/http/mkaccess.c
@@ -216,7 +216,7 @@ net_CheckForAuthorization(char * address, Bool exact_match)
     * http://uname:pwd@host.com, so make sure we don't compare an address
     * passed in with one with an auth struct->path until we remove/reduce the 
     * address passed in. */
-    if( (afterProto=PL_strstr(address, "://")) ) {
+    if( (afterProto=PL_strstr(address, "://")) != 0 ) {
     afterProto=afterProto+3;
     tmp=*afterProto;
     *afterProto='\0';
@@ -224,7 +224,7 @@ net_CheckForAuthorization(char * address, Bool exact_match)
     *afterProto=tmp;
 
     /* temporarily truncate after first slash, if any. */
-    if( (fSlash=PL_strchr(afterProto, '/')) )
+    if( (fSlash=PL_strchr(afterProto, '/')) != 0)
       *fSlash='\0';
     atSign=PL_strchr(afterProto, '@');
     if(fSlash)
@@ -915,8 +915,8 @@ NET_AskForAuthString(MWContext *context,
         prev_auth->password = password;
 		prev_auth->path = 0;
        /* Don't save username/password info in the auth struct path. */
-        if( (atSign=PL_strchr(new_address, '@')) ) {
-          if( (host=PL_strstr(new_address, "://")) ) {
+        if( (atSign=PL_strchr(new_address, '@')) != 0) {
+          if( (host=PL_strstr(new_address, "://")) != 0) {
             char tmp;
             host+=3;
             tmp=*host;
diff --git a/mozilla/network/protocol/http/mkhttp.c b/mozilla/network/protocol/http/mkhttp.c
index 66ad120c911..fa758df8d72 100644
--- a/mozilla/network/protocol/http/mkhttp.c
+++ b/mozilla/network/protocol/http/mkhttp.c
@@ -88,7 +88,7 @@ extern int XP_PROGRESS_TRYAGAIN;
 extern int XP_PROGRESS_WAIT_REPLY;
 extern int XP_HR_TRANSFER_INTERRUPTED;
 extern int XP_TRANSFER_INTERRUPTED;
-extern int XP_ERRNO_EIO;      
+extern int XP_ERRNO_EIO;
 
 #ifdef TRUST_LABELS
 extern void ProcessCookiesAndTrustLabels( ActiveEntry *ce );
@@ -1264,9 +1264,9 @@ net_build_http_request (URL_Struct * URL_s,
                         char *atSign=NULL;            
                         char *path=NULL;
 
-                        if( (path=PL_strchr(colon+3, '/')) )
+                        if( (path=PL_strchr(colon+3, '/')) != 0)
                             *path='\0';
-                        if( (atSign=PL_strchr(colon, '@')) ) {
+                        if( (atSign=PL_strchr(colon, '@')) != 0) {
                             /* We found a username and/or a password, don't let it through */
                             char temp;
                             if(path)
@@ -1467,7 +1467,7 @@ net_build_http_request (URL_Struct * URL_s,
             /* Figure out which kind of proxy we're using: PAC or straight proxy. 
              * DON'T FREE tempURL!!!
              */
-            if ( (tempURL = net_GetPACUrl()) && (*tempURL) )
+            if ( (tempURL = net_GetPACUrl()) != NULL && (*tempURL) )
                 proxyServer = NET_ParseURL(tempURL, 
                                   GET_HOST_PART 
                                 | GET_PATH_PART
@@ -2545,7 +2545,7 @@ net_setup_http_stream(ActiveEntry * ce) {
         /* Figure out which kind of proxy we're using: PAC or straight proxy. 
          * DON'T FREE tempURL!!!
          */
-        if ( (tempURL = net_GetPACUrl()) && (*tempURL) )
+        if ( (tempURL = net_GetPACUrl()) != NULL && (*tempURL) )
             proxyServer = NET_ParseURL(tempURL, GET_HOST_PART | GET_PATH_PART | GET_USERNAME_PART | GET_PASSWORD_PART);
         else
             proxyServer = cd->proxy_server;
@@ -3788,7 +3788,7 @@ HTTP_ReadPrefs(void)
     NET_SetSendRefererHeader(b);
 }
 
-MODULE_PRIVATE int PR_CALLBACK HTTP_PrefChangedFunc(const char *pref, void *data)
+static int PR_CALLBACK HTTP_PrefChangedFunc(const char *pref, void *data)
 {
         HTTP_ReadPrefs();
         return TRUE;