This commit was manufactured by cvs2svn to create branch 'CVS'.

git-svn-id: svn://10.0.0.236/branches/CVS@50735 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/htmlparser/src/nsAVLTree.cpp

@@ -0,0 +1,617 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsAVLTree.h"
+ 
+
+enum eLean      {eLeft,eNeutral,eRight};
+
+struct NS_COM nsAVLNode {
+public:
+
+  nsAVLNode(void* aValue) {
+    mLeft=0;
+    mRight=0;
+    mSkew=eNeutral;
+    mValue=aValue;
+  }
+
+  nsAVLNode*  mLeft;
+  nsAVLNode*  mRight;
+  eLean       mSkew;
+  void*       mValue;
+};
+
+
+/************************************************************
+  Now begin the tree class. Don't forget that the comparison
+  between nodes must occur via the comparitor function, 
+  otherwise all you're testing is pointer addresses.
+ ************************************************************/
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+nsAVLTree::nsAVLTree(nsAVLNodeComparitor& aComparitor, 
+                     nsAVLNodeFunctor* aDeallocator) :
+  mComparitor(aComparitor), mDeallocator(aDeallocator) {
+  mRoot=0;
+  mCount=0;
+}
+
+
+static void 
+avlDeleteTree(nsAVLNode* aNode){
+  if (aNode) {
+    avlDeleteTree(aNode->mLeft);
+    avlDeleteTree(aNode->mRight);
+    delete aNode;
+  }
+}
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+nsAVLTree::~nsAVLTree(){
+  if (mDeallocator) {
+    ForEachDepthFirst(*mDeallocator);
+  }
+  avlDeleteTree(mRoot);
+}
+
+
+class CDoesntExist: public nsAVLNodeFunctor {
+public:
+  CDoesntExist(const nsAVLTree& anotherTree) : mOtherTree(anotherTree) {
+  }
+  virtual void* operator()(void* anItem) {
+    void* result=mOtherTree.FindItem(anItem);
+    if(result)
+      return nsnull;
+    return anItem;
+  }
+protected:
+  const nsAVLTree& mOtherTree;
+};
+
+/**
+ * This method compares two trees (members by identity).
+ * @update	gess12/27/98
+ * @param   tree to compare against
+ * @return  true if they are identical (contain same stuff).
+ */
+PRBool nsAVLTree::operator==(const nsAVLTree& aCopy) const{
+  CDoesntExist functor(aCopy);
+  void* theItem=FirstThat(functor);
+  PRBool result=PRBool(!theItem);
+  return result;
+}
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateRight(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mRight;
+  if(ptr2->mSkew==eRight) {
+    aRootNode->mRight=ptr2->mLeft;
+    ptr2->mLeft=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mLeft;
+    ptr2->mLeft=ptr3->mRight;
+    ptr3->mRight=ptr2;
+    aRootNode->mRight=ptr3->mLeft;
+    ptr3->mLeft=aRootNode;
+    if(ptr3->mSkew==eLeft)
+      ptr2->mSkew=eRight;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eRight)
+      aRootNode->mSkew=eLeft;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateLeft(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mLeft;
+  if(ptr2->mSkew==eLeft) {
+    aRootNode->mLeft=ptr2->mRight;
+    ptr2->mRight=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mRight;
+    ptr2->mRight=ptr3->mLeft;
+    ptr3->mLeft=ptr2;
+    aRootNode->mLeft=ptr3->mRight;
+    ptr3->mRight=aRootNode;
+    if(ptr3->mSkew==eRight)
+      ptr2->mSkew=eLeft;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eLeft)
+      aRootNode->mSkew=eRight;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlInsert(nsAVLNode*& aRootNode, nsAVLNode* aNewNode, 
+          nsAVLNodeComparitor& aComparitor) {
+  eAVLStatus result=eAVL_unknown;
+  
+  if(!aRootNode) {
+    aRootNode = aNewNode;
+    return eAVL_ok;
+  }
+  
+  if(aNewNode==aRootNode->mValue) {
+    return eAVL_duplicate;
+  }
+
+  PRInt32 theCompareResult=aComparitor(aRootNode->mValue,aNewNode->mValue);
+  if(0 < theCompareResult) { //if(anItem<aRootNode->mValue)
+    result=avlInsert(aRootNode->mLeft,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          avlRotateLeft(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eRight:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eLeft;
+          break;
+      } //switch
+    }//if
+  } //if
+  else { 
+    result=avlInsert(aRootNode->mRight,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eRight:
+          avlRotateRight(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eRight;
+          break;
+      } //switch
+    }
+  } //if
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceLeft(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      ptr2=aRootNode->mLeft;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eRight) {
+        aRootNode->mLeft=ptr2->mRight;
+        ptr2->mRight=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eLeft;
+          ptr2->mSkew=eRight;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mRight;
+        balnc3=ptr3->mSkew;
+        ptr2->mRight=ptr3->mLeft;
+        ptr3->mLeft=ptr2;
+        aRootNode->mLeft=ptr3->mRight;
+        ptr3->mRight=aRootNode;
+        if(balnc3==eRight) {
+          ptr2->mSkew=eLeft;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eLeft) {
+          aRootNode->mSkew=eRight;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eRight:
+      aRootNode->mSkew=eNeutral;
+      break;
+    
+    case eNeutral:
+      aRootNode->mSkew=eLeft;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceRight(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      aRootNode->mSkew=eNeutral;
+      break;
+
+    case eRight:
+      ptr2=aRootNode->mRight;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eLeft) {
+        aRootNode->mRight=ptr2->mLeft;
+        ptr2->mLeft=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eRight;
+          ptr2->mSkew=eLeft;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mLeft;
+        balnc3=ptr3->mSkew;
+        ptr2->mLeft=ptr3->mRight;
+        ptr3->mRight=ptr2;
+        aRootNode->mRight=ptr3->mLeft;
+        ptr3->mLeft=aRootNode;
+        if(balnc3==eLeft) {
+          ptr2->mSkew=eRight;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eRight) {
+          aRootNode->mSkew=eLeft;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eNeutral:
+      aRootNode->mSkew=eRight;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemoveChildren(nsAVLNode*& aRootNode,nsAVLNode*& anotherNode, PRBool& delOk){
+  eAVLStatus result=eAVL_ok;
+  
+  if(!anotherNode->mRight){
+    aRootNode->mValue=anotherNode->mValue; //swap
+    anotherNode=anotherNode->mLeft;
+    delOk=PR_TRUE;
+  }
+  else{
+    avlRemoveChildren(aRootNode,anotherNode->mRight,delOk);
+    if(delOk)
+      avlBalanceLeft(anotherNode,delOk);
+  }
+
+  return result;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemove(nsAVLNode*& aRootNode, void* anItem, PRBool& delOk,
+          nsAVLNodeComparitor& aComparitor){
+  eAVLStatus result=eAVL_ok;
+
+  if(!aRootNode)
+    delOk=PR_FALSE;
+  else {
+    PRInt32 cmp=aComparitor(anItem,aRootNode->mValue);
+    if(cmp<0){
+      avlRemove(aRootNode->mLeft,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceRight(aRootNode,delOk);
+    }
+    else if(cmp>0){
+      avlRemove(aRootNode->mRight,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceLeft(aRootNode,delOk);
+    }
+    else{ //they match...
+      nsAVLNode* temp=aRootNode;
+      if(!aRootNode->mRight) {
+        aRootNode=aRootNode->mLeft;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else if(!aRootNode->mLeft) {
+        aRootNode=aRootNode->mRight;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else {
+        avlRemoveChildren(aRootNode,aRootNode->mLeft,delOk);
+        if(delOk)
+          avlBalanceRight(aRootNode,delOk);
+      }
+    }
+  }
+
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+eAVLStatus 
+nsAVLTree::AddItem(void* anItem){
+  eAVLStatus result=eAVL_ok;
+
+  nsAVLNode* theNewNode=new nsAVLNode(anItem);
+  result=avlInsert(mRoot,theNewNode,mComparitor);
+  if(eAVL_duplicate!=result)
+    mCount++;
+  else {
+    delete theNewNode;
+  }
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+void* nsAVLTree::FindItem(void* aValue) const{
+  nsAVLNode* result=mRoot;
+  PRInt32 count=0;
+  while(result) {
+    count++;
+    PRInt32 cmp=mComparitor(aValue,result->mValue);
+    if(0==cmp) {
+      //we matched...
+      break;
+    }
+    else if(0>cmp){
+      //theNode was greater...
+      result=result->mLeft;
+    }
+    else {
+      //aValue is greater...
+      result=result->mRight;
+    }
+  }
+  if(result) {
+    return result->mValue;
+  }
+  return nsnull;
+}
+
+
+/**
+ * 
+ * @update	gess12/30/98
+ * @param 
+ * @return
+ */
+eAVLStatus 
+nsAVLTree::RemoveItem(void* aValue){
+  PRBool delOk=PR_TRUE;
+  eAVLStatus result=avlRemove(mRoot,aValue,delOk,mComparitor);
+  if(eAVL_ok==result)
+    mCount--;
+  return result;
+} 
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEachDepthFirst(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor){
+  if(aNode) {
+    avlForEachDepthFirst(aNode->mLeft,aFunctor);
+    avlForEachDepthFirst(aNode->mRight,aFunctor);
+    aFunctor(aNode->mValue);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEachDepthFirst(mRoot,aFunctor);
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEach(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  if(aNode) {
+    avlForEach(aNode->mLeft,aFunctor);
+    aFunctor(aNode->mValue);
+    avlForEach(aNode->mRight,aFunctor);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEach(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEach(mRoot,aFunctor);
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void* 
+avlFirstThat(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  void* result=nsnull;
+  if(aNode) {
+    result = avlFirstThat(aNode->mLeft,aFunctor);
+    if (result) {
+      return result;
+    }
+    result = aFunctor(aNode->mValue);
+    if (result) {
+      return result;
+    }
+    result = avlFirstThat(aNode->mRight,aFunctor);
+  }
+  return result;
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void* 
+nsAVLTree::FirstThat(nsAVLNodeFunctor& aFunctor) const{
+  return ::avlFirstThat(mRoot,aFunctor);
+}
+

mozilla/htmlparser/src/nsAVLTree.h

@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsAVLTree_h___
+#define nsAVLTree_h___
+
+
+#include "nscore.h"
+
+
+enum eAVLStatus {eAVL_unknown,eAVL_ok,eAVL_fail,eAVL_duplicate};
+
+
+struct nsAVLNode;
+
+/**
+ * 
+ * @update	gess12/26/98
+ * @param anObject1 is the first object to be compared
+ * @param anObject2 is the second object to be compared
+ * @return -1,0,1 if object1 is less, equal, greater than object2
+ */
+class NS_COM nsAVLNodeComparitor {
+public:
+  virtual PRInt32 operator()(void* anItem1,void* anItem2)=0;
+}; 
+
+class NS_COM nsAVLNodeFunctor {
+public:
+  virtual void* operator()(void* anItem)=0;
+};
+
+class NS_COM nsAVLTree {
+public:
+              nsAVLTree(nsAVLNodeComparitor& aComparitor, nsAVLNodeFunctor* aDeallocator);
+              ~nsAVLTree(void);
+
+  PRBool      operator==(const nsAVLTree& aOther) const;
+  PRInt32     GetCount(void) const {return mCount;}
+
+              //main functions...
+  eAVLStatus  AddItem(void* anItem);
+  eAVLStatus  RemoveItem(void* anItem);
+  void*       FindItem(void* anItem) const;
+  void        ForEach(nsAVLNodeFunctor& aFunctor) const;
+  void        ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const;
+  void*       FirstThat(nsAVLNodeFunctor& aFunctor) const;
+
+protected: 
+
+  nsAVLNode*  mRoot;
+  PRInt32     mCount;
+  nsAVLNodeComparitor&  mComparitor;
+  nsAVLNodeFunctor*     mDeallocator;
+};
+
+
+#endif /* nsAVLTree_h___ */
+

mozilla/netwerk/cache/public/MANIFEST

@@ -1,6 +0,0 @@
-nsICachedNetData.idl
-nsINetDataCache.idl
-nsINetDataCacheManager.idl
-nsINetDataCacheRecord.idl
-nsINetDataDiskCache.idl
-nsIStreamAsFile.idl

mozilla/netwerk/cache/public/Makefile.in

@@ -1,56 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-MODULE		= nkcache
-XPIDL_MODULE	= necko_cache
-
-include $(DEPTH)/config/autoconf.mk
-
-XPIDLSRCS	= \
-		nsICachedNetData.idl          \
-	        nsINetDataCacheManager.idl    \
-		nsINetDataCache.idl           \
-		nsINetDataCacheRecord.idl     \
-	        nsINetDataDiskCache.idl       \
-		nsIStreamAsFile.idl           \
-		$(NULL)
-
-
-ifdef MOZ_NEW_CACHE
-XPIDLSRCS	+= \
-		nsICache.idl		      \
-		nsICacheEntryDescriptor.idl   \
-		nsICacheListener.idl	      \
-		nsICacheService.idl           \
-		nsICacheSession.idl           \
-		nsICacheVisitor.idl           \
-	        $(NULL)
-endif
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/netwerk/cache/public/Makefile.win

@@ -1,51 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-MODULE = necko
-XPIDL_MODULE = necko_cache
-
-DEPTH = ..\..\..
-include <$(DEPTH)/config/config.mak>
-
-
-EXPORTS =                   \
-        $(NULL)
-
-XPIDLSRCS =                             \
-        .\nsICachedNetData.idl          \
-        .\nsINetDataCacheManager.idl    \
-        .\nsINetDataCache.idl           \
-        .\nsINetDataCacheRecord.idl     \
-        .\nsINetDataDiskCache.idl       \
-        .\nsIStreamAsFile.idl           \
-!ifdef MOZ_NEW_CACHE
-	.\nsICache.idl		        \
-	.\nsICacheEntryDescriptor.idl   \
-	.\nsICacheListener.idl		\
-	.\nsICacheService.idl		\
-	.\nsICacheSession.idl           \
-	.\nsICacheVisitor.idl           \
-!endif
-        $(NULL)
-
-include <$(DEPTH)/config/rules.mak>
-
-

mozilla/netwerk/cache/public/nsICache.idl

@@ -1,158 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsICache.idl, released February 23, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan <gordon@netscape.com>
- *    Patrick Beard <beard@netscape.com>
- *    Darin Fisher <darin@netscape.com>
- */
-
-#include "nsISupports.idl"
-
-typedef long nsCacheStoragePolicy;
-typedef long nsCacheAccessMode;
-
-/**
- * nsICache is a namespace for various cache constants.  It does not represent
- * an actual object.
- */
-[scriptable, uuid(ec1c0063-197d-44bb-84ba-7525d50fc937)]
-interface nsICache
-{
-    /**
-     * Access Modes
-     *
-     *
-     * Mode Requested | Not Cached          | Cached
-     * ------------------------------------------------------------------------
-     * READ           | KEY_NOT_FOUND       | NS_OK
-     *                | Mode = NONE         | Mode = READ
-     *                | No Descriptor       | Descriptor
-     * ------------------------------------------------------------------------
-     * WRITE          | NS_OK               | NS_OK            (Cache service
-     *                | Mode = WRITE        | Mode = WRITE      dooms existing
-     *                | Descriptor          | Descriptor        cache entry)
-     * ------------------------------------------------------------------------
-     * READ_WRITE     | NS_OK               | NS_OK
-     * (1st req.)     | Mode = WRITE        | Mode = READ_WRITE
-     *                | Descriptor          | Descriptor
-     * ------------------------------------------------------------------------
-     * READ_WRITE     | N/A                 | NS_OK
-     * (Nth req.)     |                     | Mode = READ
-     *                |                     | Descriptor
-     * ------------------------------------------------------------------------
-     *
-     *
-     * Access Requested:
-     *
-     * READ	       - I only want to READ, if there isn't an entry just fail
-     * WRITE       - I have something new I want to write into the cache, make
-     *               me a new entry and doom the old one, if any.
-     * READ_WRITE  - I want to READ, but I'm willing to update an existing
-     *               entry if necessary, or create a new one if none exists.
-     *
-     *
-     * Access Granted:
-     *
-     * NONE        - No descriptor is provided. You get zilch. Nada. Nothing.
-     * READ		   - You can READ from this descriptor.
-     * WRITE	   - You must WRITE to this descriptor because the cache entry
-     *               was just created for you.
-     * READ_WRITE  - You can READ the descriptor to determine if it's valid,
-     *               you may WRITE if it needs updating.
-     *
-     *
-     * Comments:
-     *
-     * If you think that you might need to modify cached data or meta data,
-     * then you must open a cache entry requesting WRITE access.  Only one
-     * cache entry descriptor, per cache entry, will be granted WRITE access.
-     * 
-     * Usually, you will request READ_WRITE access in order to first test the
-     * meta data and informational fields to determine if a write (ie. going
-     * to the net) may actually be necessary.  If you determine that it is 
-     * not, then you would mark the cache entry as valid (using MarkValid) and
-     * then simply read the data from the cache.
-     *
-     * A descriptor granted WRITE access has exclusive access to the cache
-     * entry up to the point at which it marks it as valid.  Once the cache
-     * entry has been "validated", other descriptors with READ access may be
-     * opened to the cache entry.
-     *
-     * If you make a request for READ_WRITE access to a cache entry, the cache
-     * service will downgrade your access to READ if there is already a
-     * cache entry descriptor open with WRITE access.
-     *
-     * If you make a request for only WRITE access to a cache entry and another
-     * descriptor with WRITE access is currently open, then the existing cache
-     * entry will be 'doomed', and you will be given a descriptor (with WRITE
-     * access only) to a new cache entry.
-     *
-     */
-    const nsCacheAccessMode ACCESS_NONE       = 0;
-    const nsCacheAccessMode ACCESS_READ       = 1;
-    const nsCacheAccessMode ACCESS_WRITE      = 2;
-    const nsCacheAccessMode ACCESS_READ_WRITE = 3;
-
-    /**
-     * Storage Policy
-     *
-     * The storage policy of a cache entry determines the device(s) to which
-     * it belongs.  See nsICacheSession and nsICacheEntryDescriptor for more
-     * details.
-     *
-     * STORE_ANYWHERE        - Allows the cache entry to be stored in any device.
-     *                         The cache service decides which cache device to use
-     *                         based on "some resource management calculation."
-     * STORE_IN_MEMORY       - Requires the cache entry to reside in non-persistent
-     *                         storage (ie. typically in system RAM).
-     * STORE_ON_DISK         - Requires the cache entry to reside in persistent
-     *                         storage (ie. typically on a system's hard disk).
-     * STORE_ON_DISK_AS_DISK - Requires the cache entry to reside in persistent
-     *                         storage, and in a specific file.
-     */
-    const nsCacheStoragePolicy STORE_ANYWHERE        = 0;
-    const nsCacheStoragePolicy STORE_IN_MEMORY       = 1;
-    const nsCacheStoragePolicy STORE_ON_DISK         = 2;
-    const nsCacheStoragePolicy STORE_ON_DISK_AS_FILE = 3;
-
-    /**
-     * All entries for a cache session are stored as streams of data or
-     * as objects.  These constant my be used to specify the type of entries
-     * when calling nsICacheService::CreateSession().
-     */
-    const long NOT_STREAM_BASED = 0;
-    const long STREAM_BASED     = 1;
-};
-
-
-%{C++
-
-/**
- * Cache specific nsresult error codes
- */
-#define NS_ERROR_CACHE_KEY_NOT_FOUND        NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 60)
-#define NS_ERROR_CACHE_DATA_IS_STREAM       NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 61)
-#define NS_ERROR_CACHE_DATA_IS_NOT_STREAM   NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 62)
-#define NS_ERROR_CACHE_WAIT_FOR_VALIDATION  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 63)
-#define NS_ERROR_CACHE_ENTRY_DOOMED         NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 64)
-#define NS_ERROR_CACHE_READ_ACCESS_DENIED   NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 65)
-#define NS_ERROR_CACHE_WRITE_ACCESS_DENIED  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 66)
-
-%}

mozilla/netwerk/cache/public/nsICacheEntryDescriptor.idl

@@ -1,137 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsICacheEntryDescriptor.idl, released
- * February 10, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan <gordon@netscape.com>
- *    Patrick Beard   <beard@netscape.com>
- *    Darin Fisher    <darin@netscape.com>
- */
-
-#include "nsICacheVisitor.idl"
-#include "nsICache.idl"
-
-interface nsISimpleEnumerator;
-interface nsICacheListener;
-interface nsITransport;
-interface nsIFile;
-interface nsICacheMetaDataVisitor;
-
-
-[scriptable, uuid(49c1a11d-f5d2-4f09-8262-551e64908ada)]
-interface nsICacheEntryDescriptor : nsICacheEntryInfo
-{
-    /**
-     * Set the time at which the cache entry should be considered invalid (in
-     * seconds since the Epoch).
-     */
-    void setExpirationTime(in PRUint32 expirationTime);
-
-    /**
-     * Set the cache entry data size.  This will fail if the cache entry
-     * IS stream based.
-     */
-    void setDataSize(in unsigned long size);
-
-    /**
-     * Get a transport to the cache data.  This will fail if the cache entry
-     * IS NOT stream based.
-     */
-    readonly attribute nsITransport transport;
-
-    /**
-     * Get/set the cache data element.  This will fail if the cache entry
-     * IS stream based.  The cache entry holds a strong reference to this
-     * object.  The object will be released when the cache entry is destroyed.
-     */
-    attribute nsISupports cacheElement;
-     
-    /**
-     * Get the access granted to this descriptor.  See nsICache.idl for the
-     * definitions of the access modes and a thorough description of their
-     * corresponding meanings.
-     */
-    readonly attribute nsCacheAccessMode accessGranted;
-    
-    /**
-     * Get/set the storage policy of the cache entry.  See nsICache.idl for
-     * the definitions of the storage policies.
-     */
-    attribute nsCacheStoragePolicy storagePolicy;
-
-    /**
-     * Get the disk file associated with the cache entry.
-     */
-    readonly attribute nsIFile file;
-
-    /**
-     * Get/set security info on the cache entry for this descriptor.  This fails
-     * if the storage policy is not STORE_IN_MEMORY.
-     */
-    attribute nsISupports securityInfo;
-    
-    /**
-     * Doom the cache entry this descriptor references in order to slate it for 
-     * removal.  Once doomed a cache entry cannot be undoomed.
-     *
-     * A descriptor with WRITE access can doom the cache entry and choose to
-     * fail pending requests.  This means that pending requests will not get
-     * a cache descriptor.  This is meant as a tool for clients that wish to
-     * instruct pending requests to skip the cache.
-     */
-    void doom();
-    void doomAndFailPendingRequests(in nsresult status);
-    
-    /**
-     * A writer must validate this cache object before any readers are given
-     * a descriptor to the object.
-     */
-    void markValid();
-
-    /**
-     *  Explicitly close the descriptor (optional).
-     */
-    
-    void close();
-
-    /**
-     * Methods for accessing meta data.  Meta data is a table of key/value
-     * string pairs.  The strings do not have to conform to any particular
-     * charset, but they must be null terminated.
-     */
-    string getMetaDataElement(in string key);
-    void   setMetaDataElement(in string key, in string value);
-    
-    /**
-     * Visitor will be called with key/value pair for each meta data element.
-     */
-    void   visitMetaData(in nsICacheMetaDataVisitor  visitor);
-};
-
-
-
-[scriptable, uuid(22f9a49c-3cf8-4c23-8006-54efb11ac562)]
-interface nsICacheMetaDataVisitor : nsISupports
-{
-    /**
-     * Called for each key/value pair in the meta data for a cache entry
-     */
-    boolean visitMetaDataElement(in string  key,
-                                 in string  value);
-};

mozilla/netwerk/cache/public/nsICacheListener.idl

@@ -1,44 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsICacheListener.idl, released January 19, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan <gordon@netscape.com>
- *    Patrick Beard   <beard@netscape.com>
- *    Darin Fisher    <darin@netscape.com>
- */
-
-
-#include "nsISupports.idl"
-#include "nsICache.idl"
-
-
-interface nsICacheEntryDescriptor;
-
-[scriptable, uuid(638c3848-778b-4851-8ff3-9400f65b8773)]
-interface nsICacheListener : nsISupports
-{
-    /**
-     * Called when the requested access (or appropriate subset) is
-     * acquired.  The status parameter equals NS_OK on success.
-     * See nsICacheService.idl for accessGranted values.
-     */
-    void onCacheEntryAvailable(in nsICacheEntryDescriptor descriptor,
-                               in nsCacheAccessMode       accessGranted,
-                               in nsresult                status);
-};

mozilla/netwerk/cache/public/nsICacheService.idl

@@ -1,80 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsICacheService.idl, released February 10, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan <gordon@netscape.com>
- *    Patrick Beard   <beard@netscape.com>
- *    Darin Fisher    <darin@netscape.com>
- */
-
-#include "nsISupports.idl"
-#include "nsICache.idl"
-
-interface nsISimpleEnumerator;
-interface nsICacheListener;
-interface nsICacheSession;
-interface nsICacheVisitor;
-
-[scriptable, uuid(0ebec4c7-742f-4f27-8e7b-7c8a0cc76348)]
-interface nsICacheService : nsISupports
-{
-    /**
-     * Initialize the cache service.
-     */
-    void init();
-
-    /**
-     * Shutdown the cache service.
-     */
-    void shutdown();
-
-    /**
-     * Create a cache session
-     *
-     * A cache session represents a client's access into the cache.  The cache
-     * session is not "owned" by the cache service.  Hence, it is possible to
-     * create duplicate cache sessions.  Entries created by a cache session
-     * are invisible to other cache sessions, unless the cache sessions are
-     * equivalent.
-     *
-     * @param clientID - Specifies the name of the client using the cache.
-     * @param storagePolicy - Limits the storage policy for all entries
-     *   accessed via the returned session.  As a result, devices excluded
-     *   by the storage policy will not be searched when opening entries
-     *   from the returned session.
-     * @param streamBased - Indicates whether or not the data being cached
-     *   can be represented as a stream.  The storagePolicy must be 
-     *   consistent with the value of this field.  For example, a non-stream-
-     *   based cache entry can only have a storage policy of STORE_IN_MEMORY.
-     * @return new cache session.
-     */
-    nsICacheSession createSession(in string                 clientID,
-                                  in nsCacheStoragePolicy   storagePolicy,
-                                  in boolean                streamBased);
-
-    /**
-     * Visit entries stored in the cache.  Used to implement about:cache.
-     */
-    void visitEntries(in nsICacheVisitor visitor);
-
-    /**
-     * Evicts all entries in all devices implied by the storage policy.
-     */
-    void evictEntries(in nsCacheStoragePolicy  storagePolicy);
-};

mozilla/netwerk/cache/public/nsICacheSession.idl

@@ -1,71 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsICacheSession.idl, released February 23, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan <gordon@netscape.com>
- *    Patrick Beard   <beard@netscape.com>
- *    Darin Fisher    <darin@netscape.com>
- */
-
-#include "nsISupports.idl"
-#include "nsICache.idl"
-
-interface nsICacheEntryDescriptor;
-interface nsICacheListener;
-
-[scriptable, uuid(b4b419ad-28b7-4d25-9988-20fa98505a19)]
-interface nsICacheSession : nsISupports
-{
-    /**
-     * Expired entries will be doomed or evicted if this attribute is set to
-     * true.  If false, expired entries will be returned (useful for offline-
-     * mode and clients, such as HTTP, that can update the valid lifetime of
-     * cached content).  This attribute defaults to true.
-     */
-    attribute PRBool doomEntriesIfExpired;
-
-    /**
-     * A cache session can only give out one descriptor with WRITE access
-     * to a given cache entry at a time.  Until the client calls MarkValid on
-     * its descriptor, other attempts to open the same cache entry will block.
-     */
-
-    /**
-     * Synchronous cache access.  This returns a unique descriptor each
-     * time it is called, even if the same key is specified.  When
-     * called by multiple threads for write access, only one writable
-     * descriptor will be granted.
-     */
-    nsICacheEntryDescriptor openCacheEntry(in string            key,
-                                           in nsCacheAccessMode accessRequested);
-
-    /**
-     * Asynchronous cache access. Does not block the calling thread.
-     * Instead, the listener will be notified when the descriptor is
-     * available.
-     */
-    void asyncOpenCacheEntry(in string            key,
-                             in nsCacheAccessMode accessRequested,
-                             in nsICacheListener  listener);
-
-    /**
-     * Evict all entries for this session's clientID according to its storagePolicy.
-     */
-    void evictEntries();
-};

mozilla/netwerk/cache/public/nsICacheVisitor.idl

@@ -1,137 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsICacheVisitor.idl, released February 23, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan <gordon@netscape.com>
- *    Patrick Beard   <beard@netscape.com>
- *    Darin Fisher    <darin@netscape.com>
- */
-
-#include "nsISupports.idl"
-
-/* XXX we should define device and entry info as well (stats, etc) */
-
-interface nsICacheDeviceInfo;
-interface nsICacheEntryInfo;
-
-
-[scriptable, uuid(f8c08c4b-d778-49d1-a59b-866fdc500d95)]
-interface nsICacheVisitor : nsISupports
-{
-    /**
-     * Called to provide information about a cache device.
-     *
-     * @param deviceID - specifies the device being visited.
-     * @param deviceInfo - specifies information about this device.
-     *
-     * @return true to start visiting all entries for this device.
-     * @return false to advance to the next device.
-     */
-    boolean visitDevice(in string               deviceID,
-                        in nsICacheDeviceInfo   deviceInfo);
-
-    /**
-     * Called to provide information about a cache entry.
-     *
-     * @param deviceID - specifies the device being visited.
-     * @param entryInfo - specifies information about this entry.
-     * 
-     * @return true to visit the next entry on the current device, or if the
-     *   end of the device has been reached, advance to the next device.
-     * @return false to advance to the next device.
-     */
-    boolean visitEntry(in string                deviceID,
-                       in nsICacheEntryInfo     entryInfo);
-};
-
-
-[scriptable, uuid(31d1c294-1dd2-11b2-be3a-c79230dca297)]
-interface nsICacheDeviceInfo : nsISupports
-{
-    /**
-     * Get a human readable description of the cache device.
-     */
-    readonly attribute string  description;
-    
-    /**
-     * Get a usage report, statistics, miscellaneous data about
-     * the cache device.
-     */
-    readonly attribute string  usageReport;
-    
-    /**
-     * Get the number of stored cache entries.
-     */
-    readonly attribute unsigned long  entryCount;
-    
-    /**
-     * Get the total size of the stored cache entries.
-     */
-    readonly attribute unsigned long  totalSize;
-
-    /**
-     * Get the upper limit of the size of the data the cache can store.
-     */
-    readonly attribute unsigned long  maximumSize;
-};
-
-
-[scriptable, uuid(72c64022-1dd2-11b2-b3a5-b8b859e0a1b2)]
-interface nsICacheEntryInfo : nsISupports
-{
-    /**
-     * Get the client id associated with this cache entry.
-     */
-    readonly attribute string  clientID;
-
-    /**
-     * Get the key identifying the cache entry.
-     */
-    readonly attribute string  key;
-    
-    /**
-     * Get the number of times the cache entry has been opened.
-     */
-    readonly attribute long  fetchCount;
-
-    /**
-     * Get the last time the cache entry was opened (in seconds since the Epoch).
-     */
-    readonly attribute PRUint32  lastFetched;
-
-    /**
-     * Get the last time the cache entry was modified (in seconds since the Epoch).
-     */
-    readonly attribute PRUint32  lastModified;
-
-    /**
-     * Get the expiration time of the cache entry (in seconds since the Epoch).
-     */
-    readonly attribute PRUint32  expirationTime;
-
-    /**
-     * Get the cache entry data size.
-     */
-    readonly attribute unsigned long  dataSize;
-
-    /**
-     * Find out whether or not the cache entry is stream based.
-     */
-    boolean  isStreamBased();
-};

mozilla/netwerk/cache/public/nsICachedNetData.idl

@@ -1,240 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsrootidl.idl"
-#include "nsISupports.idl"
-
-
-interface nsIURI;
-interface nsIObserver;
-interface nsIChannel;
-interface nsINetDataCache;
-interface nsINetDataCacheRecord;
-interface nsILoadGroup;
-interface nsIStreamListener;
-
-/**
- * The nsICachedNetData interface represents a single entry in a database that
- * caches data retrieved from the network. This interface is implemented by the
- * cache manager on top of the low-level nsINetDataCacheRecord and
- * nsINetDataCache interfaces that are implemented by the database.
- *
- * Each cache record may contain both content and metadata.  The content may
- * be, for example, GIF image data or HTML, and it is accessed through
- * nsIChannel's streaming API.  The opaque metadata, which may contain HTTP
- * headers among other things, is stored as a byte array.  Each entry in the
- * cache is indexed by two different keys: a record id number and a key created
- * by combining the URI with a "secondary key", e.g. HTTP post data.
- *
- * @See nsINetDataCacheRecord
- * @See nsINetDataCache
- * @See nsINetDataDiskCache
- * @See nsINetDataCacheManager
- */
-[scriptable, uuid(6aeb2a40-6d43-11d3-90c8-000064657374)]
-interface nsICachedNetData : nsISupports
-{
-    /**
-     * String form of the URI provided as an argument to the call to
-     * nsINetDataCacheManager::GetCachedNetData() that created this record.
-     */
-    readonly attribute string uriSpec;
-    
-    /**
-     * Getter for the opaque secondary database key provided as an argument to
-     * the call to nsINetDataCacheManager::GetCachedNetData() that created this
-     * record.
-     */
-    void getSecondaryKey(out unsigned long length,
-                         [retval, size_is(length)] out string secondaryKey);
-
-    /**
-     * This flag may be set by a protocol handler to indicate that it supports
-     * partial fetching of data.  In that case, the cache manager is permitted
-     * to truncate the entry's content to accommodate incoming data for other
-     * cache entries rather than deleting it wholesale.
-     */
-    attribute boolean allowPartial;
-    
-    /**
-     * This flag indicates that the write stream supplying content data for the
-     * cache did not complete normally and, therefore, the content may be
-     * truncated.
-     */
-    readonly attribute boolean partialFlag;
-
-    /**
-     * This flag can be set and cleared by a protocol handler as a form of
-     * self-notification, so as to avoid race conditions in which a protocol
-     * handler issues two identical network requests to fill the same cache
-     * entry.  The cache manager itself largely ignores this flag.
-     */
-    attribute boolean updateInProgress;
-
-    /**
-     * inUse is set if any existing channels are associated with this cache
-     * entry or if the updateInProgess flag is set.  This can be used to
-     * prevent writing to a cache entry by a protocol handler if it's being
-     * read or written elsewhere.
-     */
-    readonly attribute boolean inUse;
-
-    /**
-     * Date/time that the document was last stored on the origin server, as
-     * supplied by the protocol handler.  This value is used as input to the
-     * cache replacement policy, i.e. it is not used for validation.  If the
-     * protocol can't supply a last-modified time, this attribute should remain
-     * unset.  When unset, the value of this attribute is zero.
-     *
-     * FIXME: Should use nsIDateTime interface, once it's created
-     * instead of PRTime, for improved scriptability ? 
-     */
-    attribute PRTime lastModifiedTime;
-
-    /**
-     * Supplied by the protocol handler, the expirationTime attribute specifies
-     * the time until which the document is guaranteed fresh, i.e. the document
-     * does not have to be validated with the server and, therefore, any data
-     * in cache is definitely usable.  The value of this attribute serves as a
-     * hint to the cache replacement policy.  Only one of either staleTime or
-     * expirationTime may be set for a single cache record.  When unset, the
-     * value of this attribute is zero. 
-     */
-    attribute PRTime expirationTime;
-
-    /**
-     * Date/time supplied by the protocol handler, at which point the content
-     * is *likely* to be stale, i.e. the data in the cache may be out-of-date
-     * with respect to the data on the server.  This heuristic date does not
-     * necessarily correspond to the HTTP Expires header, as it does not
-     * determine when cached network data must be validated with the origin
-     * server, but only serves as a hint to the cache replacement policy.  Only
-     * one of either staleTime or expirationTime may be set for a single cache
-     * record.  When unset, the value of this attribute is zero.
-     */
-    attribute PRTime staleTime;
-
-    /**
-     * Date/time of last access of the data in this cache record, as determined
-     * by the cache manager.
-     */
-    readonly attribute PRTime lastAccessTime;
-
-    readonly attribute PRTime lastUpdateTime;
-
-    /**
-     * Number of times this record has been accessed since it was first stored.
-     */
-    readonly attribute PRUint16 numberAccesses;
-
-    /**
-     * Accessor methods for opaque meta-data which can be read and updated
-     * independently of the content data.
-     *
-     * The aTag argument can be used to accommodate multiple clients of the
-     * cache API, each of which wants to store its own private meta-data into
-     * the cache.  For example, there could be a "headers" tag that the HTTP
-     * protocol handler uses to store http response headers and a "image size"
-     * tag used to store the image dimensions of a GIF file.  The aData
-     * argument refers to an opaque blob of arbitrary bytes.
-     *
-     * IMPORTANT: If aData does not contain byte-oriented data, i.e. it's not a
-     *            string, the contents of aData must be byte-swapped by the,
-     *            caller, so as to make the cache files endian-independent.
-     */
-    void getAnnotation(in string aTag, 
-                       out PRUint32 aLength, [size_is(aLength), retval] out string aData);
-    void setAnnotation(in string aTag,
-                       in  PRUint32 aLength, [size_is(aLength)] in string aData);
-
-    /**
-     * As a getter, return the number of content bytes stored in the cache,
-     * i.e. via the nsIChannel streaming APIs.  This may be less than the
-     * complete content length if a partial cache fill occurred.  The cached
-     * content can be truncated by setting the value of this attribute.  The
-     * value of the attribute represents a logical, not a physical, length.  If
-     * compression has been used, the content may consume less storage than
-     * indicated by this attribute.
-     *
-     * When this attribute is set to zero the associated cache disk file, if
-     * any, should be deleted.
-     */
-    attribute PRUint32 storedContentLength;
-
-	/**
-	 * Length of stored content, which may be less than storage consumed if
-     * compression is used
-	 */
-	readonly attribute PRUint32 logicalLength;
-
-	/**
-	 * Opaque security info associated with the cache entry; it can't be serialized
-	 * to disk, so it'll only make sense with memory cache
-	 */
-	attribute nsISupports securityInfo;
-
-    /** 
-     * Notify any observers associated with this cache entry of the deletion
-     * request.  If all observers drop their reference to the cache entry,
-     * proceed to delete the underlying cache database record and associated
-     * content storage.
-     */
-    void delete();
-
-    /**
-     * Flush any changes in this entry's data to the cache database.  This
-     * method will automatically be called when the last reference to the cache
-     * is dropped, but it can also be called explicitly for a synchronous
-     * effect.
-     */
-    void commit();
-
-    /**
-     * Parent container cache for this entry.
-     */
-    readonly attribute nsINetDataCache cache;
-
-    /**
-     * Create a channel for reading or writing a stream of content into the
-     * entry.  It is expected that many of the nsIChannel methods return
-     * NS_NOT_IMPLEMENTED, including:
-     *
-     *    + GetURI()
-     *    + GetContentType()
-     *    + GetContentLength()
-     *
-     * Though nsIChannel provides for both async and synchronous I/O APIs, both
-     * may not be implemented.  Only AsyncRead() and OpenOutputStream() is
-     * required.  
-     */
-    nsIChannel newChannel(in nsILoadGroup aLoadGroup);
-
-    /**
-     * This method can be used by a caching protocol handler to store data in
-     * the cache by forking an asynchronous read stream so that it is
-     * simultaneously sent to a requester and written into the cache.  This
-     * method implicitly sets the updateInProgress flag, if it has not already
-     * been set.
-     */
-    nsIStreamListener interceptAsyncRead(in nsIStreamListener aOriginalListener,
-                                         in PRUint32 aStartOffset);
-};

mozilla/netwerk/cache/public/nsINetDataCache.idl

@@ -1,142 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-interface nsIURI;
-interface nsINetDataCacheRecord;
-interface nsISimpleEnumerator;
-
-/**
- * The nsINetDataCache defines the low-level API for a network-data
- * cache, used to cache the responses to network retrieval commands.
- * This interface, along with nsINetDataCacheRecord, is implemented by
- * the memory cache, the file cache and, optionally, by some extension
- * caches.  This interface is essentially a pseudo-private API for the
- * cache manager.  Other clients should never use this interface.
- *
- * Each cache entry may contain both content, e.g. GIF image data, and
- * associated metadata, e.g. HTTP headers.  Each entry is indexed by two
- * different keys: a record id number and a key created by combining the URI
- * with a "secondary key", e.g. HTTP post data.
- *
- * The nsINetDataCache interface is agnostic as to where the data is
- * stored and whether the storage is volatile or persistent.  The
- * memory cache, any disk caches and any extension caches must all
- * implement this interface.
- *
- */
-[scriptable, uuid(ccfc58c0-6dde-11d3-90c8-000064657374)]
-interface nsINetDataCache : nsISupports
-{
-	/**
-	 * Human-readable description of the cache module, e.g. "Disk Cache"
-	 */
-	readonly attribute wstring description;
-  
-    /**
-     * Returns true if cached data is available for the given opaque key,
-     * even if only partial data is stored.
-     */
-    boolean contains([size_is(length)] in string key, in PRUint32 length);
-
-    /**
-     * Fetch the cache entry record for the given opaque key.  If one does not
-     * exist, create a new, empty record.
-     */
-    nsINetDataCacheRecord getCachedNetData([size_is(length)] in string key,
-                                           in PRUint32 length);
-
-    /**
-     * Fetch the cache entry record for the given URI using the record ID as a key.
-     */
-    nsINetDataCacheRecord getCachedNetDataByID(in PRInt32 RecordID);
-
-	/**
-	 * False indicates that this cache is entirely bypassed.
-	 */
-    attribute boolean enabled;
-
-    /**
-     * Constants for flags attribute, below
-     */
-
-    // Used for extension caches, e.g. a CD-ROM cache
-    const long READ_ONLY          = 1 << 0;
-
-    // One of these bits must be set
-    const long MEMORY_CACHE       = 1 << 1;
-    const long FLAT_FILE_CACHE    = 1 << 2;
-    const long FILE_PER_URL_CACHE = 1 << 3;
-
-	/**
-	 * See constants defined above.
-	 */
-	readonly attribute PRUint32 flags;
-
-    /**
-     * Total number of URI entries stored in the cache.
-     */
-    readonly attribute PRUint32 numEntries;
-
-    /**
-     * Maximum number of URI entries that may be stored in the cache.
-     */
-    readonly attribute PRUint32 maxEntries;
-
-    /**
-     * Enumerate the URI entries stored in the cache.
-     */
-    nsISimpleEnumerator newCacheEntryIterator();
-
-	/**
-	 * Contains a reference to the next cache in search order.  For the memory
-	 * cache, this attribute always references the disk cache.  For the disk
-	 * cache, it contains a reference to the first extension cache.
-	 */
-    attribute nsINetDataCache nextCache;
-
-    /**
-     * An estimate of the amount of storage occupied by the cache, in kB.
-     * Actual use may be slightly higher than reported due to cache overhead
-     * and heap fragmentation (in the memory cache) or block quantization (in
-     * the disk cache).
-	 */
-    readonly attribute PRUint32 storageInUse;
-
-    /**
-     * Remove all entries from a writable cache.  This could be used, for
-     * example, after a guest ends a browser session.  This is equivalent to
-     * setting the cache's Capacity to zero, except that all cache entries,
-     * even those in active use, will be deleted.  Also, any global cache
-     * database files will be deleted.
-	 */
-    void removeAll();
-};
-
-%{ C++
-// ContractID prefix for Components that implement this interface
-#define NS_NETWORK_CACHE_CONTRACTID "@mozilla.org/network/cache;1"
-#define NS_NETWORK_MEMORY_CACHE_CONTRACTID NS_NETWORK_CACHE_CONTRACTID "?name=memory-cache"
-#define NS_NETWORK_FLAT_CACHE_CONTRACTID   NS_NETWORK_CACHE_CONTRACTID "?name=flat-cache"
-#define NS_NETWORK_FILE_CACHE_CONTRACTID   NS_NETWORK_CACHE_CONTRACTID "?name=file-cache"
-%}

mozilla/netwerk/cache/public/nsINetDataCacheManager.idl

@@ -1,169 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-#include "nsINetDataCache.idl"
-
-interface nsISimpleEnumerator;
-interface nsICachedNetData;
-interface nsINetDataDiskCache;
-interface nsIURI;
-
-/**
- * The network-response cache manager is partly responsible for the caching of
- * content and associated metadata that has been retrieved via the network.
- * (The remaining responsibility for caching lies with individual network
- * protocol handlers.)
- *
- * The cache manager supervises the actions of individual cache components,
- * such as the memory cache, the disk cache and any extension caches, e.g. a
- * read-only CD-ROM cache.
- *
- * @See nsINetDataCache
- * @See nsICachedNetData
- */
-[scriptable, uuid(71c8ab00-6d5c-11d3-90c8-000064657374)]
-interface nsINetDataCacheManager : nsISupports
-{
-    /**
-     * Flag for the GetCachedNetData() method: If set, the memory cache is
-     * neither searched nor will any data be stored into it.  This might be
-     * appropriate, for example, with images, because they have their own
-     * cache for storing *decoded* images.
-     */
-    const unsigned long BYPASS_MEMORY_CACHE       = 1 << 0;
-
-    /**
-     * Flag for the GetCachedNetData() method: If set, the disk cache
-     * is neither searched nor will any be data stored into it.
-     * However, read-only extension caches may be searched.  This
-     * might be used to avoid leaving persistent records of secure
-     * data.
-     */
-    const unsigned long BYPASS_PERSISTENT_CACHE   = 1 << 1;
-
-    /**
-     * Flag for the GetCachedNetData() method: If set, any stream
-     * content is stored in the cache as a single disk file.  Content
-     * will not be cached in the memory cache nor is it cached in a
-     * flat-file cache database.  This is used to implement the jar
-     * protocol handler and to provide the stream-as-file semantics
-     * required by the classic bowser plugin API.
-     */
-    const unsigned long CACHE_AS_FILE             = 1 << 2;
-
-	/**
-		These enum's are used for the ClearCache calls. 
-	*/
-	const unsigned long ALL_CACHES = 1;
-	const unsigned long MEM_CACHE = 1<<1;
-	const unsigned long FILE_CACHE = 1<<2;
-	const unsigned long FLAT_CACHE = 1<<3;
-    /**
-     * Fetch the cache entry record for the given URI.  If one does not exist,
-     * create a new, empty record.  The normal search order for caches is:
-     *   + Memory cache
-     *   + Disk cache
-     *   + File cache (stream-as-file cache)
-     *   + All extension caches
-     *
-     * When writing, data is typically stored in both the memory cache and the
-     * disk cache.  Both the search order and this write policy can be modified by
-     * setting one or more of the flag argument bits, as defined above.
-     *
-     * The optionally-NULL secondaryKey argument can be used, e.g. for form
-     * post data or for HTTP headers in the case of HTTP.
-     */
-    nsICachedNetData getCachedNetData(in string uri,
-                                      [size_is(secondaryKeyLength)] in string secondaryKey,
-                                      in PRUint32 secondaryKeyLength,
-                                      in PRUint32 flags);
-
-    /**
-     * Returns true if cached content is available for the given URI, even if
-     * only partial data is stored.  The flags argument behaves the same as for
-     * the GetCachedNetData() method, above.
-     */
-    boolean contains(in string uri,
-                     [size_is(secondaryKeyLength)] in string secondaryKey,
-                     in PRUint32 secondaryKeyLength,
-                     in PRUint32 flags);
-
-    /**
-     * Total number of unexpired URI entries stored in all caches.  This number
-     * does not take into account duplicate URIs, e.g. because the memory cache
-     * and the disk cache might each contain an entry for the same URI.
-     */
-    readonly attribute PRUint32 numEntries;
-
-    /**
-     * Enumerate the unexpired URI entries stored in all caches.  Some URIs may
-     * be enumerated more than once, e.g.  because the the memory cache and the
-     * disk cache might each contain an entry for the same URI.
-     */
-    nsISimpleEnumerator newCacheEntryIterator();
-
-    /*
-     * Enumerate all the loaded nsINetDataCache-implementing cache modules.
-     * The first module enumerated will be the memory cache, the second will be
-     * the disk cache, then the file cache, followed by all the extension
-     * caches, in search order. 
-     */
-    nsISimpleEnumerator newCacheModuleIterator();
-
-    /**
-     * Remove all entries from all writable caches.  This could be used, for
-     * example, after a guest ends a browser session.  This is equivalent to
-     * setting the DiskCacheCapacity to zero, except that all cache entries,
-     * even those in active use, will be deleted.  Also, any global cache
-     * database files will be deleted.
-     */
-    void removeAll();
-    
-    /**
-      *	Clears the specified cache
-      */
-    void clear( in PRUint32 aCacheToClear );
-
-    /**
-     * The disk cache is made up of the file cache (for stream-as-file
-     * requests) and a (possibly independent) persistent cache that handles all
-     * other cache requests.  This attribute sets/gets the combined capacity of
-     * these caches, measured in KBytes.  Setting the capacity lower than the
-     * current amount of space currently in use may cause cache entries to be
-     * evicted from the cache to accomodate the requested capacity.
-     */
-    attribute PRUint32 diskCacheCapacity;
-
-    /**
-     * This attribute sets/gets the capacity of the memory cache, measured in
-     * KBytes.  Setting the capacity lower than the current amount of space
-     * currently in use may cause cache entries to be evicted from the cache to
-     * accomodate the requested capacity.
-     */
-    attribute PRUint32 memCacheCapacity;
-};
-
-%{ C++
-// ContractID prefix for Components that implement this interface
-#define NS_NETWORK_CACHE_MANAGER_CONTRACTID NS_NETWORK_CACHE_CONTRACTID "?name=manager"
-%}

mozilla/netwerk/cache/public/nsINetDataCacheRecord.idl

@@ -1,131 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-#include "nsrootidl.idl"
-
-interface nsIFile;
-interface nsIChannel;
-interface nsINetDataCache;
-
-/**
- * The nsINetDataCacheRecord represents a single entry in a database that
- * caches data retrieved from the network. On top of this low-level interface
- * to the raw record data, the cache manager implements a higher-level record
- * interface, nsICachedNetData.  Each instance of nsINetDataCacheRecord is
- * (internally) associated with a parent database, an instance of the
- * nsINetDataCache interface.  This interface is essentially a pseudo-private
- * API for the cache manager.  Other clients should never use this interface.
- *
- * Each cache record may contain both content and metadata.  The content may
- * be, for example, GIF image data or HTML, and it is accessed through
- * nsIChannel's streaming API.  The opaque metadata, which may contain HTTP
- * headers among other things, is accessed as a contiguous byte array.  Each
- * entry in the cache is indexed by two different keys: a unique record id
- * number, generated by the cache, and an opaque string.  The latter contains
- * the URI and other secondary key information, e.g. HTTP form post key/value
- * pairs.
- *
- * The nsINetDataCacheRecord interface is agnostic as to where the data is
- * stored and whether the storage is volatile or persistent.  The memory cache,
- * the disk cache, a flat-file cache and any read-only extension caches must
- * all implement this interface.
- *
- * @See nsICachedNetData
- * @See nsINetDataCache
- * @See nsINetDataDiskCache
- * @See nsINetDataCacheManager
- */
-
-interface nsILoadGroup;
-
-[scriptable, uuid(fdcdd6a0-7461-11d3-90ca-0040056a906e)]
-interface nsINetDataCacheRecord : nsISupports
-{
-    /**
-     * As far as the nsINetDataCacheRecord implementation is concerned, the
-     * cache entry database key is an opaque blob, but it's intended to contain
-     * both the URI and any secondary keys, such as HTTP post data.
-     */
-    void getKey(out unsigned long length, [size_is(length), retval] out string key);
-
-    /**
-     * A persistent record number assigned by the cache which must be unique
-     * among all entries stored within the same cache.  The record ID serves as
-     * an alternate key to the cache record.  Providing that they satisfy the
-     * afforementioned uniqueness requirement, record IDs can be assigned any
-     * value by the database except that they may never be zero.
-     */
-    readonly attribute PRInt32 recordID;
-
-    /**
-     * Opaque data which can be updated for each cache entry independently of
-     * the content data.  This data is a combination of protocol-independent
-     * data provided by the cache manager and protocol-specific meta-data,
-     * e.g. HTTP headers.
-     */
-    void getMetaData(out PRUint32 length, [size_is(length), retval] out string metaData);
-    void setMetaData(in  PRUint32 length, [size_is(length)] in string data);
-
-    /**
-     * Number of content bytes stored in the cache, i.e. via the nsIChannel
-     * streaming APIs.  This may be less than the complete content length if a
-     * partial cache fill occurred.  Additionally, the cached content can be
-     * truncated by reducing the value of this attribute.  When this attribute
-     * is set to zero the associated cache disk file, if any, should be
-     * deleted.
-     */
-    attribute PRUint32 storedContentLength;
-
-	/**
-	 * Opaque security info associated with the cache entry; it can't be serialized
-	 * to disk, so it'll only make sense with memory cache
-	 */
-	attribute nsISupports securityInfo;
-
-    /** 
-     * Delete this cache entry and its associated content.
-     */
-    void delete();
-
-    /**
-     * Create a channel for reading or writing a stream of content into the
-     * entry.  However, many of the nsIChannel methods may return
-     * NS_NOT_IMPLEMENTED, including:
-     *
-     *    + GetURI()
-     *    + GetContentType()
-     *    + GetContentLength()
-     */
-    nsIChannel newChannel(in nsILoadGroup loadGroup);
-
-    /**
-     * If a cache is implemented such that it stores each URI's content in an
-     * individual disk file, this method will identify the file corresponding
-     * to this record.  This may be used to implement the "stream-as-file"
-     * semantics required by some plugins and by the 'jar:' protocol handler.
-     * However, not all cache implementations are *required* to store the data
-     * from each URI in an individual file, so it is acceptable for an
-     * implementation of this method to signal NS_NOT_IMPLEMENTED.
-     */
-    readonly attribute nsIFile file;
-};

mozilla/netwerk/cache/public/nsINetDataDiskCache.idl

@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsINetDataCache.idl"
-
-interface nsIFile;
-
-/**
- * A network-data disk cache is used to persistently cache the responses to
- * network retrieval commands.  Each cache entry may contain both content,
- * e.g. GIF image data, and associated metadata, e.g. HTTP headers.
- */
-[scriptable, uuid(6408e390-6f13-11d3-90c8-000064657374)]
-interface nsINetDataDiskCache : nsINetDataCache
-{
-	/**
-	 * This attribute must be set before calling any other methods of this
-	 * interface.
-	 */
-    attribute nsIFile diskCacheFolder;
-};
-

mozilla/netwerk/cache/public/nsIStreamAsFile.idl

@@ -1,106 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Scott Furman, fur@netscape.com
- */
-#include "nsrootidl.idl"
-#include "nsISupports.idl"
-
-interface nsIFile;
-interface nsIStreamAsFileObserver;
-
-/**
- * In addition to enhancing effective network response time via caching, the
- * cache manager serves a second purpose by providing the stream-as-file
- * service required by traditional browser plugins and the jar: protocol
- * handler.  The interface below provides a means for a client to determine the
- * filename associated with a stream and to detect modification/deletion of
- * that file.
- */
-[scriptable, uuid(0eedbbf0-92d9-11d3-90d3-0040056a906e)]
-interface nsIStreamAsFile : nsISupports
-{
-    /**
-     * Filename containing stream-as-file
-     */
-    readonly attribute nsIFile file;
-
-    /**
-     * Add an observer for this cache record.  When the cache wants to delete
-     * or truncate a record, so as to make space for another cache entry's
-     * content data, it will call <code>aObserver</code>'s Observe() method,
-     * passing the nsIStreamAsFile instance as the <code>aSubject</code>
-     * argument and an appropriate message.  If the observer does not wish to
-     * inhibit deletion/truncation, it should Release() any references it has to the
-     * cache record.
-     *
-     * @See nsIStreamAsFileObserver
-     */
-    void addObserver(in nsIStreamAsFileObserver aObserver);
-
-    /**
-     * Delete an observer that was added by the AddObserver() method.
-     */
-    void removeObserver(in nsIStreamAsFileObserver aObserver);
-};
-
-/**
- * This interface can be implemented by a client to receive notifications of
- * either modification or deletion of a file created by the cache manager using
- * the stream-as-file semantics.
- */
-[scriptable, uuid(a26e27c0-92da-11d3-90d3-0040056a906e)]
-interface nsIStreamAsFileObserver : nsISupports
-{
-    /**
-     * Flag bits for argument to observeStreamAsFile() method.
-     */
-    const long NOTIFY_AVAILABLE    = 1 << 0; // Stream-as-file now available for reading
-    const long NOTIFY_ERROR        = 1 << 1; // Error while loading stream / creating file
-    const long REQUEST_DELETION    = 1 << 2; // Cache manager wishes to delete/truncate file
-    const long INVALIDATE          = 1 << 3; // File is out-of-date
-
-    // Convenience value
-    const long MAKE_UNAVAILABLE    = REQUEST_DELETION | INVALIDATE;
-    
-    /**
-     * Receive either a notification or a request concerning a file that has
-     * been opened using stream-as-file.  The aMessage and aError arguments
-     * have varying values depending on the nature of the notification.
-     * aMessage is set to NOTIFY_AVAILABLE when a complete stream has been read
-     * and stored on disk in a file.  At that point, and no sooner, may the
-     * filename attribute of the associated nsIStreamAsFile be accessed via the
-     * associated nsIStreamAsFile interface.  If the aMessage argument is
-     * NOTIFY_ERROR, the aError argument contains the relevant error code.  If
-     * the aMessage argument is either REQUEST_DELETION or REQUEST_TRUNCATION,
-     * the callee should immediately Release() all references to the
-     * nsIStreamAsFile (and any references to its associated nsICachedNetData
-     * instances), unless it wishes to inhibit the requested file modification.
-     * If the aMessage argument is INVALIDATE, the cache manager is replacing
-     * the file with a more recent version.  If a client wants to continue
-     * using the (now out-of-date) file, it must delete it when it has finished,
-     * as the cache manager will effectively relinquished ownership of the
-     * file.
-     */
-    void observeStreamAsFile(in nsIStreamAsFile aStreamAsFile,
-                             in PRUint32 aMessage,
-                             in nsresult aError);
-};

mozilla/netwerk/cache/src/Makefile.in

@@ -1,70 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 2001 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= nkcache
-LIBRARY_NAME	= nkcache
-SHORT_LIBNAME	= nkcache
-IS_COMPONENT	= 1
-REQUIRES	= xpcom string necko pref
-
-EXPORTS		= \
-		nsCacheService.h \
-		$(NULL)
-
-CPPSRCS		= \
-	nsANSIFileStreams.cpp \
-	nsCache.cpp \
-	nsCacheEntry.cpp \
-	nsCacheEntryDescriptor.cpp \
-	nsCacheMetaData.cpp \
-	nsCacheModule.cpp \
-	nsCacheService.cpp \
-	nsCacheSession.cpp \
-	nsDiskCacheDevice.cpp \
-	nsDiskCacheEntry.cpp \
-	nsDiskCacheMap.cpp \
-	nsMemoryCacheDevice.cpp \
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
-
-EXTRA_LIBS	+= \
-		$(XPCOM_LIBS) \
-		$(NSPR_LIBS) \
-		$(NULL)
-
-#EXTRA_LIBS	= $(NSPR_LIBS)
-
-
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-#override NO_SHARED_LIB=1
-#override NO_STATIC_LIB=
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/netwerk/cache/src/makefile.win

@@ -1,68 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH = ..\..\..
-include <$(DEPTH)/config/config.mak>
-
-MODULE = nkcache
-DLLNAME=nkcache
-
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
-
-MAKE_OBJ_TYPE=DLL
-
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
-
-EXPORTS = \
-		nsCacheService.h    \
-		$(NULL)
-
-CPP_OBJS = \
-	.\$(OBJDIR)\nsCache.obj                         \
-	.\$(OBJDIR)\nsCacheEntry.obj			\
-	.\$(OBJDIR)\nsCacheEntryDescriptor.obj          \
-	.\$(OBJDIR)\nsCacheMetaData.obj			\
-	.\$(OBJDIR)\nsCacheModule.obj			\
-	.\$(OBJDIR)\nsCacheService.obj			\
-	.\$(OBJDIR)\nsCacheSession.obj			\
-	.\$(OBJDIR)\nsDiskCacheDevice.obj		\
-	.\$(OBJDIR)\nsDiskCacheEntry.obj		\
-	.\$(OBJDIR)\nsDiskCacheMap.obj			\
-	.\$(OBJDIR)\nsANSIFileStreams.obj		\
-	.\$(OBJDIR)\nsMemoryCacheDevice.obj		\
-	$(NULL)
-
-
-LLIBS	= \
-	$(LIBNSPR) \
-	$(DIST)\lib\xpcom.lib \
-	$(NULL)
-
-include <$(DEPTH)/config/rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
-
-
-clobber::
-        $(RM) $(DIST)\bin\components\$(DLLNAME).dll
-	$(RM) $(DIST)\lib\$(DLLNAME).lib 

mozilla/netwerk/cache/src/nsANSIFileStreams.cpp

@@ -1,388 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsANSIFileStreams.cpp, released March 23, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Patrick C. Beard <beard@netscape.com>
- */
-
-#include "nsANSIFileStreams.h"
-
-NS_IMPL_ISUPPORTS2(nsANSIInputStream, nsIInputStream, nsISeekableStream);
-
-nsANSIInputStream::nsANSIInputStream() : mFile(nsnull), mSize(0)
-{
-    NS_INIT_ISUPPORTS();
-}
-
-nsANSIInputStream::~nsANSIInputStream()
-{
-    Close();
-}
-
-nsresult nsANSIInputStream::Open(nsILocalFile* file)
-{
-    nsresult rv;
-    rv = file->OpenANSIFileDesc("rb", &mFile);
-    if (NS_FAILED(rv)) return rv;
-
-    if (::fseek(mFile, 0, SEEK_END) != 0) return NS_ERROR_FAILURE;
-    mSize = ::ftell(mFile);
-    ::fseek(mFile, 0, SEEK_SET);
-    rv = (ferror(mFile) ? NS_ERROR_FAILURE : NS_OK);
-    return rv;
-}
-
-NS_IMETHODIMP nsANSIInputStream::Close()
-{
-    if (mFile) {
-        ::fclose(mFile);
-        mFile = nsnull;
-        return NS_OK;
-    }
-    return NS_BASE_STREAM_CLOSED;
-}
-
-NS_IMETHODIMP nsANSIInputStream::Available(PRUint32 * result)
-{
-    if (mFile) {
-        *result = (mSize - ::ftell(mFile));
-        nsresult rv = (ferror(mFile) ? NS_ERROR_FAILURE : NS_OK);
-        return rv;
-    }
-    return NS_BASE_STREAM_CLOSED;
-}
-
-NS_IMETHODIMP nsANSIInputStream::Read(char * buf, PRUint32 count, PRUint32 *result)
-{
-    if (mFile) {
-        *result = ::fread(buf, 1, count, mFile);
-        nsresult rv = (ferror(mFile) ? NS_ERROR_FAILURE : NS_OK);
-        return rv;
-    }
-    return NS_BASE_STREAM_CLOSED;
-}
-
-NS_IMETHODIMP nsANSIInputStream::ReadSegments(nsWriteSegmentFun writer, void * closure, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsANSIInputStream::GetNonBlocking(PRBool *aNonBlocking)
-{
-    *aNonBlocking = PR_FALSE;
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsANSIInputStream::GetObserver(nsIInputStreamObserver * *aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsANSIInputStream::SetObserver(nsIInputStreamObserver * aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsANSIInputStream::Seek(PRInt32 whence, PRInt32 offset)
-{
-    if (mFile) {
-        ::fseek(mFile, offset, whence);
-        nsresult rv = (ferror(mFile) ? NS_ERROR_FAILURE : NS_OK);
-        return rv;
-    }
-    return NS_BASE_STREAM_CLOSED;
-}
-
-NS_IMETHODIMP nsANSIInputStream::Tell(PRUint32 * result)
-{
-    if (mFile) {
-        *result = ::ftell(mFile);
-        nsresult rv = (ferror(mFile) ? NS_ERROR_FAILURE : NS_OK);
-        return rv;
-    }
-    return NS_BASE_STREAM_CLOSED;
-}
-
-NS_IMPL_ISUPPORTS2(nsANSIOutputStream, nsIOutputStream, nsISeekableStream);
-
-nsANSIOutputStream::nsANSIOutputStream() : mFile(nsnull)
-{
-    NS_INIT_ISUPPORTS();
-}
-
-nsANSIOutputStream::~nsANSIOutputStream()
-{
-    Close();
-}
-
-nsresult nsANSIOutputStream::Open(nsILocalFile* file)
-{
-    nsresult rv = file->OpenANSIFileDesc("wb", &mFile);
-    return rv;
-}
-
-NS_IMETHODIMP nsANSIOutputStream::Close()
-{
-    if (mFile) {
-        ::fclose(mFile);
-        mFile = nsnull;
-        return NS_OK;
-    }
-    return NS_BASE_STREAM_CLOSED;
-}
-
-NS_IMETHODIMP nsANSIOutputStream::Flush()
-{
-    if (mFile) {
-        ::fflush(mFile);
-        nsresult rv = (ferror(mFile) ? NS_ERROR_FAILURE : NS_OK);
-        return rv;
-    }
-    return NS_BASE_STREAM_CLOSED;
-}
-
-NS_IMETHODIMP nsANSIOutputStream::Write(const char *buffer, PRUint32 count, PRUint32 *result)
-{
-    if (mFile) {
-        *result = ::fwrite(buffer, 1, count, mFile);
-        nsresult rv = (ferror(mFile) ? NS_ERROR_FAILURE : NS_OK);
-        return rv;
-    }
-    return NS_BASE_STREAM_CLOSED;
-}
-
-NS_IMETHODIMP nsANSIOutputStream::WriteFrom(nsIInputStream *input, PRUint32 count, PRUint32 *actualCount)
-{
-    nsresult rv;
-    char buffer[BUFSIZ];
-    PRUint32 totalCount = count;
-    *actualCount = 0;
-    while (totalCount > 0) {
-        count = (totalCount < BUFSIZ ? totalCount : BUFSIZ);
-        rv = input->Read(buffer, count, &count);
-        if (NS_FAILED(rv)) break;
-        rv = Write(buffer, count, &count);
-        if (NS_FAILED(rv)) break;
-        totalCount -= count;
-        *actualCount += count;
-    }
-    return rv;
-}
-
-NS_IMETHODIMP nsANSIOutputStream::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsANSIOutputStream::GetNonBlocking(PRBool *aNonBlocking)
-{
-    *aNonBlocking = PR_FALSE;
-    return NS_OK;
-}
-NS_IMETHODIMP nsANSIOutputStream::SetNonBlocking(PRBool aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsANSIOutputStream::GetObserver(nsIOutputStreamObserver * *aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP nsANSIOutputStream::SetObserver(nsIOutputStreamObserver * aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsANSIOutputStream::Seek(PRInt32 whence, PRInt32 offset)
-{
-    if (mFile) {
-        ::fseek(mFile, offset, whence);
-        nsresult rv = (ferror(mFile) ? NS_ERROR_FAILURE : NS_OK);
-        return rv;
-    }
-    return NS_BASE_STREAM_CLOSED;
-}
-
-NS_IMETHODIMP nsANSIOutputStream::Tell(PRUint32 * result)
-{
-    if (mFile) {
-        *result = ::ftell(mFile);
-        nsresult rv = (ferror(mFile) ? NS_ERROR_FAILURE : NS_OK);
-        return rv;
-    }
-    return NS_BASE_STREAM_CLOSED;
-}
-
-///////
-
-NS_IMPL_ISUPPORTS3(nsANSIFileStream, nsIInputStream, nsIOutputStream, nsISeekableStream);
-
-nsANSIFileStream::nsANSIFileStream() : mFile(nsnull), mSize(0)
-{
-    NS_INIT_ISUPPORTS();
-}
-
-nsANSIFileStream::~nsANSIFileStream()
-{
-    Close();
-}
-
-nsresult nsANSIFileStream::Open(nsILocalFile* file)
-{
-    nsresult rv;
-    rv = file->OpenANSIFileDesc("rb+", &mFile);
-    if (NS_FAILED(rv)) {
-        rv = rv = file->OpenANSIFileDesc("wb+", &mFile);
-        if (NS_FAILED(rv)) return rv;
-    }
-    
-    // compute size of file.
-    if (::fseek(mFile, 0, SEEK_END) != 0) return NS_ERROR_FAILURE;
-    mSize = ::ftell(mFile);
-    ::fseek(mFile, 0, SEEK_SET);
-    rv = (ferror(mFile) ? NS_ERROR_FAILURE : NS_OK);
-    return rv;
-}
-
-NS_IMETHODIMP nsANSIFileStream::Close()
-{
-    if (mFile) {
-        ::fclose(mFile);
-        mFile = nsnull;
-        return NS_OK;
-    }
-    return NS_BASE_STREAM_CLOSED;
-}
-
-NS_IMETHODIMP nsANSIFileStream::Available(PRUint32 * result)
-{
-    if (mFile) {
-        *result = (mSize - ::ftell(mFile));
-        nsresult rv = (ferror(mFile) ? NS_ERROR_FAILURE : NS_OK);
-        return rv;
-    }
-    return NS_BASE_STREAM_CLOSED;
-}
-
-NS_IMETHODIMP nsANSIFileStream::Read(char * buf, PRUint32 count, PRUint32 *result)
-{
-    if (mFile) {
-        *result = ::fread(buf, 1, count, mFile);
-        nsresult rv = (ferror(mFile) ? NS_ERROR_FAILURE : NS_OK);
-        return rv;
-    }
-    return NS_BASE_STREAM_CLOSED;
-}
-
-NS_IMETHODIMP nsANSIFileStream::ReadSegments(nsWriteSegmentFun writer, void * closure, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsANSIFileStream::GetNonBlocking(PRBool *aNonBlocking)
-{
-    *aNonBlocking = PR_FALSE;
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsANSIFileStream::GetObserver(nsIInputStreamObserver * *aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsANSIFileStream::SetObserver(nsIInputStreamObserver * aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsANSIFileStream::Flush()
-{
-    if (mFile) {
-        ::fflush(mFile);
-        nsresult rv = (ferror(mFile) ? NS_ERROR_FAILURE : NS_OK);
-        return rv;
-    }
-    return NS_BASE_STREAM_CLOSED;
-}
-
-NS_IMETHODIMP nsANSIFileStream::Write(const char *buffer, PRUint32 count, PRUint32 *result)
-{
-    if (mFile) {
-        *result = ::fwrite(buffer, 1, count, mFile);
-        nsresult rv = (ferror(mFile) ? NS_ERROR_FAILURE : NS_OK);
-        return rv;
-    }
-    return NS_BASE_STREAM_CLOSED;
-}
-
-NS_IMETHODIMP nsANSIFileStream::WriteFrom(nsIInputStream *input, PRUint32 count, PRUint32 *actualCount)
-{
-    char buffer[BUFSIZ];
-    PRUint32 totalCount = count;
-    *actualCount = 0;
-    while (totalCount > 0) {
-        count = (totalCount < BUFSIZ ? totalCount : BUFSIZ);
-        nsresult rv = input->Read(buffer, count, &count);
-        if (NS_FAILED(rv)) return rv;
-        rv = Write(buffer, count, &count);
-        totalCount -= count;
-        *actualCount += count;
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsANSIFileStream::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsANSIFileStream::SetNonBlocking(PRBool aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsANSIFileStream::GetObserver(nsIOutputStreamObserver * *aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsANSIFileStream::SetObserver(nsIOutputStreamObserver * aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsANSIFileStream::Seek(PRInt32 whence, PRInt32 offset)
-{
-    if (mFile) {
-        ::fseek(mFile, offset, whence);
-        nsresult rv = (ferror(mFile) ? NS_ERROR_FAILURE : NS_OK);
-        return rv;
-    }
-    return NS_BASE_STREAM_CLOSED;
-}
-
-NS_IMETHODIMP nsANSIFileStream::Tell(PRUint32 * result)
-{
-    if (mFile) {
-        *result = ::ftell(mFile);
-        nsresult rv = (ferror(mFile) ? NS_ERROR_FAILURE : NS_OK);
-        return rv;
-    }
-    return NS_BASE_STREAM_CLOSED;
-}

mozilla/netwerk/cache/src/nsANSIFileStreams.h

@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsANSIFileStreams.h, released March 23, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Patrick C. Beard <beard@netscape.com>
- */
-
-#ifndef _nsANSIFileStreams_h_
-#define _nsANSIFileStreams_h_
-
-#include <stdio.h>
-
-#include "nsIFileStreams.h"
-
-class nsANSIInputStream : public nsIInputStream, public nsISeekableStream {
-    FILE*       mFile;
-    PRUint32    mSize;
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIINPUTSTREAM
-    NS_DECL_NSISEEKABLESTREAM
-    
-    nsANSIInputStream();
-    virtual ~nsANSIInputStream();
-    nsresult Open(nsILocalFile* file);
-};
-
-class nsANSIOutputStream : public nsIOutputStream, public nsISeekableStream {
-    FILE*       mFile;
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIOUTPUTSTREAM
-    NS_DECL_NSISEEKABLESTREAM
-    
-    nsANSIOutputStream();
-    virtual ~nsANSIOutputStream();
-    nsresult Open(nsILocalFile* file);
-};
-
-class nsANSIFileStream : public nsIInputStream, public nsIOutputStream, public nsISeekableStream {
-    FILE*       mFile;
-    PRUint32    mSize;
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIINPUTSTREAM
-
-    // NS_DECL_NSIOUTPUTSTREAM
-    // XXX must only declare additional methods introduced by nsIOutputStream.
-    NS_IMETHOD Flush(void);
-    NS_IMETHOD Write(const char *buf, PRUint32 count, PRUint32 *_retval);
-    NS_IMETHOD WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval);
-    NS_IMETHOD WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval);
-    NS_IMETHOD SetNonBlocking(PRBool aNonBlocking);
-    NS_IMETHOD GetObserver(nsIOutputStreamObserver * *aObserver);
-    NS_IMETHOD SetObserver(nsIOutputStreamObserver * aObserver);
-
-    NS_DECL_NSISEEKABLESTREAM
-
-    nsANSIFileStream();
-    virtual ~nsANSIFileStream();
-    nsresult Open(nsILocalFile* file);
-};
-
-#endif // _nsANSIFileStreams_h_

mozilla/netwerk/cache/src/nsCache.cpp

@@ -1,119 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsCache.cpp, released March 18, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan  <gordon@netscape.com>
- *    Patrick C. Beard <beard@netscape.com>
- *    Darin Fisher     <darin@netscape.com>
- */
-
-#include "nsCache.h"
-#include "nsReadableUtils.h"
-
-
-/**
- * Cache Service Utility Functions
- */
-
-#if defined(PR_LOGGING)
-PRLogModuleInfo * gCacheLog = nsnull;
-
-void
-CacheLogInit()
-{
-    if (gCacheLog) return;
-    gCacheLog = PR_NewLogModule("cache");
-    NS_ASSERTION(gCacheLog, "\n### failed to allocate cache log.\n");
-}
-#endif
-
-PRUint32
-SecondsFromPRTime(PRTime prTime)
-{
-  PRInt64  microSecondsPerSecond, intermediateResult;
-  PRUint32 seconds;
-
-  LL_I2L(microSecondsPerSecond, PR_USEC_PER_SEC);
-  LL_DIV(intermediateResult, prTime, microSecondsPerSecond);
-  LL_L2UI(seconds, intermediateResult);
-  return seconds;
-}
-
-
-PRTime
-PRTimeFromSeconds(PRUint32 seconds)
-{
-  PRInt64 microSecondsPerSecond, intermediateResult;
-  PRTime  prTime;
-
-  LL_I2L(microSecondsPerSecond, PR_USEC_PER_SEC);
-  LL_UI2L(intermediateResult, seconds);
-  LL_MUL(prTime, intermediateResult, microSecondsPerSecond);
-  return prTime;
-}
-
-
-nsresult
-ClientIDFromCacheKey(const nsAReadableCString&  key, char ** result)
-{
-    nsresult  rv = NS_OK;
-    *result = nsnull;
-
-    nsReadingIterator<char> colon;
-    key.BeginReading(colon);
-        
-    nsReadingIterator<char> start;
-    key.BeginReading(start);
-        
-    nsReadingIterator<char> end;
-    key.EndReading(end);
-        
-    if (FindCharInReadable(':', colon, end)) {
-        *result = ToNewCString( Substring(start, colon));
-        if (!*result) rv = NS_ERROR_OUT_OF_MEMORY;
-    } else {
-        NS_ASSERTION(PR_FALSE, "FindCharInRead failed to find ':'");
-        rv = NS_ERROR_UNEXPECTED;
-    }
-    return rv;
-}
-
-
-nsresult
-ClientKeyFromCacheKey(const nsAReadableCString& key, char ** result)
-{
-    nsresult  rv = NS_OK;
-    *result = nsnull;
-
-    nsReadingIterator<char> start;
-    key.BeginReading(start);
-        
-    nsReadingIterator<char> end;
-    key.EndReading(end);
-        
-    if (FindCharInReadable(':', start, end)) {
-        ++start;  // advance past clientID ':' delimiter
-        *result = ToNewCString( Substring(start, end));
-        if (!*result) rv = NS_ERROR_OUT_OF_MEMORY;
-    } else {
-        NS_ASSERTION(PR_FALSE, "FindCharInRead failed to find ':'");
-        rv = NS_ERROR_UNEXPECTED;
-    }
-    return rv;
-}

mozilla/netwerk/cache/src/nsCache.h

@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsCache.h, released March 18, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan  <gordon@netscape.com>
- *    Patrick C. Beard <beard@netscape.com>
- *    Darin Fisher     <darin@netscape.com>
- */
-
-/**
- * Cache Service Utility Functions
- */
-
-#ifndef _nsCache_h_
-#define _nsCache_h_
-
-#include "nsAReadableString.h"
-#include "prtime.h"
-#include "nsError.h"
-#include "prlog.h"
-
-// PR_LOG args = "format string", arg, arg, ...
-#if defined(PR_LOGGING)
-extern PRLogModuleInfo * gCacheLog;
-void   CacheLogInit();
-#define CACHE_LOG_INIT()        CacheLogInit()
-#define CACHE_LOG_ALWAYS(args)  PR_LOG(gCacheLog, PR_LOG_ALWAYS, args)
-#define CACHE_LOG_ERROR(args)   PR_LOG(gCacheLog, PR_LOG_ERROR, args)
-#define CACHE_LOG_WARNING(args) PR_LOG(gCacheLog, PR_LOG_WARNING, args)
-#define CACHE_LOG_DEBUG(args)   PR_LOG(gCacheLog, PR_LOG_DEBUG, args)
-#else
-#define CACHE_LOG_INIT()        {}
-#define CACHE_LOG_ALWAYS(args)  {}
-#define CACHE_LOG_ERROR(args)   {}
-#define CACHE_LOG_WARNING(args) {}
-#define CACHE_LOG_DEBUG(args)   {}
-#endif
-
-
-extern PRUint32  SecondsFromPRTime(PRTime prTime);
-extern PRTime    PRTimeFromSeconds(PRUint32 seconds);
-
-
-extern nsresult  ClientIDFromCacheKey(const nsAReadableCString&  key, char ** result);
-extern nsresult  ClientKeyFromCacheKey(const nsAReadableCString& key, char ** result);
-
-#endif // _nsCache_h

mozilla/netwerk/cache/src/nsCacheDevice.h

@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsCacheDevice.h, released February 22, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan, 22-February-2001
- */
-
-#ifndef _nsCacheDevice_h_
-#define _nsCacheDevice_h_
-
-#include "nspr.h"
-#include "nsError.h"
-#include "nsICache.h"
-
-class nsIFile;
-class nsCString;
-class nsCacheEntry;
-class nsICacheVisitor;
-class nsITransport;
-
-/******************************************************************************
-* nsCacheDevice
-*******************************************************************************/
-class nsCacheDevice {
-public:
-    virtual ~nsCacheDevice() {}
-
-    virtual nsresult Init() = 0;
-    virtual nsresult Shutdown() = 0;
-
-    virtual const char *   GetDeviceID(void) = 0;
-    virtual nsCacheEntry * FindEntry( nsCString * key ) = 0;
-
-    virtual nsresult DeactivateEntry( nsCacheEntry * entry ) = 0;
-    virtual nsresult BindEntry( nsCacheEntry * entry ) = 0;
-    virtual void     DoomEntry( nsCacheEntry * entry ) = 0;
-
-    virtual nsresult GetTransportForEntry( nsCacheEntry * entry,
-                                           nsCacheAccessMode mode,
-                                           nsITransport **result ) = 0;
-
-    virtual nsresult GetFileForEntry( nsCacheEntry *    entry,
-                                      nsIFile **        result ) = 0;
-
-    virtual nsresult OnDataSizeChange( nsCacheEntry * entry, PRInt32 deltaSize ) = 0;
-
-    virtual nsresult Visit(nsICacheVisitor * visitor) = 0;
-
-    /**
-     * Device must evict entries associated with clientID.  If clientID == nsnull, all
-     * entries must be evicted.  Active entries must be doomed, rather than evicted.
-     */
-    virtual nsresult EvictEntries(const char * clientID) = 0;
-};
-
-#endif // _nsCacheDevice_h_

mozilla/netwerk/cache/src/nsCacheEntry.cpp

@@ -1,579 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsCacheEntry.cpp, released February 22, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan, 22-February-2001
- */
-
-
-#include "nspr.h"
-#include "nsCacheEntry.h"
-#include "nsCacheEntryDescriptor.h"
-#include "nsCacheMetaData.h"
-#include "nsCacheRequest.h"
-#include "nsError.h"
-#include "nsICacheService.h"
-#include "nsCache.h"
-
-
-nsCacheEntry::nsCacheEntry(nsCString *          key,
-                           PRBool               streamBased,
-                           nsCacheStoragePolicy storagePolicy)
-    : mKey(key),
-      mFetchCount(0),
-      mLastFetched(0),
-      mExpirationTime(0),
-      mFlags(0),
-      mDataSize(0),
-      mMetaSize(0),
-      mCacheDevice(nsnull),
-      mData(nsnull),
-      mMetaData(nsnull)
-{
-    PR_INIT_CLIST(this);
-    PR_INIT_CLIST(&mRequestQ);
-    PR_INIT_CLIST(&mDescriptorQ);
-
-    if (streamBased) MarkStreamBased();
-    SetStoragePolicy(storagePolicy);
-}
-
-
-nsCacheEntry::~nsCacheEntry()
-{
-    delete mKey;
-    delete mMetaData;
-}
-
-
-void
-nsCacheEntry::Fetched()
-{
-    mLastFetched = SecondsFromPRTime(PR_Now());
-    ++mFetchCount;
-    MarkEntryDirty();
-}
-
-
-nsresult
-nsCacheEntry::GetData(nsISupports **result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    NS_IF_ADDREF(*result = mData);
-    return NS_OK;
-}
-
-void
-nsCacheEntry::TouchData()
-{
-    mLastModified = SecondsFromPRTime(PR_Now());
-    MarkDataDirty();
-}
-
-
-
-nsresult
-nsCacheEntry::GetMetaDataElement( const nsAReadableCString&  key,
-                                  nsAReadableCString **      value)
-{
-    *value = mMetaData ? mMetaData->GetElement(&key) : nsnull;
-    return NS_OK;
-}
-
-
-nsresult
-nsCacheEntry::SetMetaDataElement( const nsAReadableCString& key, 
-                                  const nsAReadableCString& value)
-{
-    if (!mMetaData) {
-        mMetaData = nsCacheMetaData::Create();
-        if (!mMetaData)
-            return NS_ERROR_OUT_OF_MEMORY;
-    }
-    nsresult rv = mMetaData->SetElement(key, value);
-    if (NS_FAILED(rv))
-        return rv;
-
-    mMetaSize = mMetaData->Size();                // calc new meta data size
-    return rv;
-}
-
-
-nsresult
-nsCacheEntry::VisitMetaDataElements( nsICacheMetaDataVisitor * visitor)
-{
-    NS_ENSURE_ARG_POINTER(visitor);
-
-    if (mMetaData)
-        mMetaData->VisitElements(visitor);
-
-    return NS_OK;
-}
-
-
-nsresult
-nsCacheEntry::FlattenMetaData(char ** data, PRUint32 * size)
-{
-    NS_ENSURE_ARG_POINTER(size);
-
-    if (mMetaData)
-        return mMetaData->FlattenMetaData(data, size);
-
-    if (data) *data = nsnull;
-    *size = 0;
-
-    return NS_OK;
-}
-
-nsresult
-nsCacheEntry::UnflattenMetaData(char * data, PRUint32 size)
-{
-    delete mMetaData;
-    mMetaData = nsCacheMetaData::Create();
-    if (!mMetaData)
-        return NS_ERROR_OUT_OF_MEMORY;
-    nsresult rv = mMetaData->UnflattenMetaData(data, size);
-    if (NS_SUCCEEDED(rv))
-        mMetaSize = mMetaData->Size();
-    return rv;
-}
-
-
-void
-nsCacheEntry::TouchMetaData()
-{
-    mLastModified = SecondsFromPRTime(PR_Now());
-    MarkMetaDataDirty();
-}
-
-#if 0
-nsresult
-nsCacheEntry::GetKeyValueArray(nsCacheMetaDataKeyValuePair ** array,
-                               PRUint32 *                     count)
-{
-    if (!array || !count)  return NS_ERROR_NULL_POINTER;
-
-    if (!mMetaData) {
-        *array = nsnull;
-        *count = 0;
-        return NS_OK;
-    }
-    return mMetaData->GetKeyValueArray(array, count);
-}
-#endif
-
-
-nsresult
-nsCacheEntry::GetSecurityInfo( nsISupports ** result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    NS_IF_ADDREF(*result = mSecurityInfo);
-    return NS_OK;
-}
-
-
-/**
- *  cache entry states
- *      0 descriptors (new entry)
- *      0 descriptors (existing, bound entry)
- *      n descriptors (existing, bound entry) valid
- *      n descriptors (existing, bound entry) not valid (wait until valid or doomed)
- */
-
-nsresult
-nsCacheEntry::RequestAccess(nsCacheRequest * request, nsCacheAccessMode *accessGranted)
-{
-    nsresult  rv = NS_OK;
-    
-    if (!IsInitialized()) {
-        // brand new, unbound entry
-        request->mKey = nsnull;  // steal ownership of the key string
-        if (request->IsStreamBased())  MarkStreamBased();
-        MarkInitialized();
-
-        *accessGranted = request->AccessRequested() & nsICache::ACCESS_WRITE;
-        NS_ASSERTION(*accessGranted, "new cache entry for READ-ONLY request");
-        PR_APPEND_LINK(request, &mRequestQ);
-        return rv;
-    }
-    
-    if (IsDoomed()) return NS_ERROR_CACHE_ENTRY_DOOMED;
-
-    if (IsStreamData() != request->IsStreamBased()) {
-        *accessGranted = nsICache::ACCESS_NONE;
-        return request->IsStreamBased() ?
-            NS_ERROR_CACHE_DATA_IS_NOT_STREAM : NS_ERROR_CACHE_DATA_IS_STREAM;
-    }
-
-    if (PR_CLIST_IS_EMPTY(&mDescriptorQ)) {
-        // 1st descriptor for existing bound entry
-        *accessGranted = request->AccessRequested();
-        if (*accessGranted & nsICache::ACCESS_WRITE) {
-            MarkInvalid();
-        } else {
-            MarkValid();
-        }
-    } else {
-        // nth request for existing, bound entry
-        *accessGranted = request->AccessRequested() & ~nsICache::ACCESS_WRITE;
-        if (!IsValid())
-            rv = NS_ERROR_CACHE_WAIT_FOR_VALIDATION;
-    }
-    PR_APPEND_LINK(request,&mRequestQ);
-
-    return rv;
-}
-
-
-nsresult
-nsCacheEntry::CreateDescriptor(nsCacheRequest *           request,
-                               nsCacheAccessMode          accessGranted,
-                               nsICacheEntryDescriptor ** result)
-{
-    NS_ENSURE_ARG_POINTER(request && result);
-    
-    nsCacheEntryDescriptor * descriptor =
-        new nsCacheEntryDescriptor(this, accessGranted);
-
-    // XXX check request is on q
-    PR_REMOVE_AND_INIT_LINK(request); // remove request regardless of success
-
-    if (descriptor == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    PR_APPEND_LINK(descriptor, &mDescriptorQ);
-
-    NS_ADDREF(*result = descriptor);
-    return NS_OK;
-}
-
-
-PRBool
-nsCacheEntry::RemoveRequest(nsCacheRequest * request)
-{
-    // XXX if debug: verify this request belongs to this entry
-    PR_REMOVE_AND_INIT_LINK(request);
-
-    // return true if this entry should stay active
-    return !((PR_CLIST_IS_EMPTY(&mRequestQ)) &&
-             (PR_CLIST_IS_EMPTY(&mDescriptorQ)));
-}
-
-
-PRBool
-nsCacheEntry::RemoveDescriptor(nsCacheEntryDescriptor * descriptor)
-{
-    // XXX if debug: verify this descriptor belongs to this entry
-    PR_REMOVE_AND_INIT_LINK(descriptor);
-
-    if (!PR_CLIST_IS_EMPTY(&mDescriptorQ))
-        return PR_TRUE;  // stay active if we still have open descriptors
-
-    if (PR_CLIST_IS_EMPTY(&mRequestQ))
-        return PR_FALSE; // no descriptors or requests, we can deactivate
-
-    return PR_TRUE;     // find next best request to give a descriptor to
-}
-
-
-void
-nsCacheEntry::DetachDescriptors(void)
-{
-    nsCacheEntryDescriptor * descriptor =
-        (nsCacheEntryDescriptor *)PR_LIST_HEAD(&mDescriptorQ);
-
-    while (descriptor != &mDescriptorQ) {
-        nsCacheEntryDescriptor * nextDescriptor =
-            (nsCacheEntryDescriptor *)PR_NEXT_LINK(descriptor);
-        
-        descriptor->ClearCacheEntry();
-        PR_REMOVE_AND_INIT_LINK(descriptor);
-        descriptor = nextDescriptor;
-    }
-}
-
-
-/******************************************************************************
- * nsCacheEntryInfo - for implementing about:cache
- *****************************************************************************/
-
-NS_IMPL_ISUPPORTS1(nsCacheEntryInfo, nsICacheEntryInfo);
-
-
-NS_IMETHODIMP
-nsCacheEntryInfo::GetClientID(char ** clientID)
-{
-    NS_ENSURE_ARG_POINTER(clientID);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    return ClientIDFromCacheKey(*mCacheEntry->Key(), clientID);
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryInfo::GetKey(char ** key)
-{
-    NS_ENSURE_ARG_POINTER(key);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    return ClientKeyFromCacheKey(*mCacheEntry->Key(), key);
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryInfo::GetFetchCount(PRInt32 * fetchCount)
-{
-    NS_ENSURE_ARG_POINTER(fetchCount);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    *fetchCount = mCacheEntry->FetchCount();
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryInfo::GetLastFetched(PRUint32 * lastFetched)
-{
-    NS_ENSURE_ARG_POINTER(lastFetched);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    *lastFetched = mCacheEntry->LastFetched();
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryInfo::GetLastModified(PRUint32 * lastModified)
-{
-    NS_ENSURE_ARG_POINTER(lastModified);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    *lastModified = mCacheEntry->LastModified();
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryInfo::GetExpirationTime(PRUint32 * expirationTime)
-{
-    NS_ENSURE_ARG_POINTER(expirationTime);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    *expirationTime = mCacheEntry->ExpirationTime();
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryInfo::GetDataSize(PRUint32 * dataSize)
-{
-    NS_ENSURE_ARG_POINTER(dataSize);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    *dataSize = mCacheEntry->DataSize();
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryInfo::IsStreamBased(PRBool * result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-    
-    *result = mCacheEntry->IsStreamData();
-    return NS_OK;
-}
-
-
-/******************************************************************************
- *  nsCacheEntryHashTable
- *****************************************************************************/
-
-PLDHashTableOps
-nsCacheEntryHashTable::ops =
-{
-    PL_DHashAllocTable,
-    PL_DHashFreeTable,
-    GetKey,
-    HashKey,
-    MatchEntry,
-    MoveEntry,
-    ClearEntry,
-    Finalize
-};
-
-
-nsCacheEntryHashTable::nsCacheEntryHashTable()
-    : initialized(PR_FALSE)
-{
-}
-
-
-nsCacheEntryHashTable::~nsCacheEntryHashTable()
-{
-    if (initialized)
-        PL_DHashTableFinish(&table);
-}
-
-
-nsresult
-nsCacheEntryHashTable::Init()
-{
-    nsresult rv = NS_OK;
-    initialized = PL_DHashTableInit(&table, &ops, nsnull,
-                                           sizeof(nsCacheEntryHashTableEntry), 512);
-
-    if (!initialized) rv = NS_ERROR_OUT_OF_MEMORY;
-    
-    return rv;
-}
-
-
-nsCacheEntry *
-nsCacheEntryHashTable::GetEntry( const nsCString * key)
-{
-    PLDHashEntryHdr *hashEntry;
-    nsCacheEntry    *result = nsnull;
-
-    NS_ASSERTION(initialized, "nsCacheEntryHashTable not initialized");
-    hashEntry = PL_DHashTableOperate(&table, key, PL_DHASH_LOOKUP);
-    if (PL_DHASH_ENTRY_IS_BUSY(hashEntry)) {
-        result = ((nsCacheEntryHashTableEntry *)hashEntry)->cacheEntry;
-    }
-    return result;
-}
-
-
-nsresult
-nsCacheEntryHashTable::AddEntry( nsCacheEntry *cacheEntry)
-{
-    PLDHashEntryHdr    *hashEntry;
-
-    NS_ASSERTION(initialized, "nsCacheEntryHashTable not initialized");
-    if (!cacheEntry) return NS_ERROR_NULL_POINTER;
-
-    hashEntry = PL_DHashTableOperate(&table, cacheEntry->mKey, PL_DHASH_ADD);
-#ifndef DEBUG_dougt
-    NS_ASSERTION(((nsCacheEntryHashTableEntry *)hashEntry)->cacheEntry == 0,
-                 "### nsCacheEntryHashTable::AddEntry - entry already used");
-#endif
-    ((nsCacheEntryHashTableEntry *)hashEntry)->cacheEntry = cacheEntry;
-
-    return NS_OK;
-}
-
-
-void
-nsCacheEntryHashTable::RemoveEntry( nsCacheEntry *cacheEntry)
-{
-    NS_ASSERTION(initialized, "nsCacheEntryHashTable not initialized");
-    NS_ASSERTION(cacheEntry, "### cacheEntry == nsnull");
-
-#if DEBUG
-    // XXX debug code to make sure we have the entry we're trying to remove
-    nsCacheEntry *check = GetEntry(cacheEntry->mKey);
-    NS_ASSERTION(check == cacheEntry, "### Attempting to remove unknown cache entry!!!");
-#endif
-    (void) PL_DHashTableOperate(&table, cacheEntry->mKey, PL_DHASH_REMOVE);
-}
-
-
-void
-nsCacheEntryHashTable::VisitEntries( nsCacheEntryHashTable::Visitor *visitor)
-{
-    PL_DHashTableEnumerate(&table, VisitEntry, visitor);
-}
-
-
-PLDHashOperator PR_CALLBACK
-nsCacheEntryHashTable::VisitEntry(PLDHashTable *table,
-                                  PLDHashEntryHdr *hashEntry,
-                                  PRUint32 number,
-                                  void *arg)
-{
-    nsCacheEntry *cacheEntry = ((nsCacheEntryHashTableEntry *)hashEntry)->cacheEntry;
-    nsCacheEntryHashTable::Visitor *visitor = (nsCacheEntryHashTable::Visitor*) arg;
-    return (visitor->VisitEntry(cacheEntry) ? PL_DHASH_NEXT : PL_DHASH_STOP);
-}
-
-/**
- *  hash table operation callback functions
- */
-const void * PR_CALLBACK
-nsCacheEntryHashTable::GetKey( PLDHashTable * /*table*/, PLDHashEntryHdr *hashEntry)
-{
-    nsCacheEntry *cacheEntry = ((nsCacheEntryHashTableEntry *)hashEntry)->cacheEntry;
-    return cacheEntry->mKey;
-}
-
-
-PLDHashNumber PR_CALLBACK
-nsCacheEntryHashTable::HashKey( PLDHashTable *table, const void *key)
-{
-    return PL_DHashStringKey(table,((nsCString *)key)->get());
-}
-
-PRBool PR_CALLBACK
-nsCacheEntryHashTable::MatchEntry(PLDHashTable *       /* table */,
-                                  const PLDHashEntryHdr * hashEntry,
-                                  const void *            key)
-{
-    NS_ASSERTION(key !=  nsnull, "### nsCacheEntryHashTable::MatchEntry : null key");
-    nsCacheEntry *cacheEntry = ((nsCacheEntryHashTableEntry *)hashEntry)->cacheEntry;
-
-    return nsStr::StrCompare(*cacheEntry->mKey, *(nsCString *)key, -1, PR_FALSE) == 0;
-}
-
-
-void PR_CALLBACK
-nsCacheEntryHashTable::MoveEntry(PLDHashTable * /* table */,
-                                 const PLDHashEntryHdr *from,
-                                 PLDHashEntryHdr       *to)
-{
-    ((nsCacheEntryHashTableEntry *)to)->cacheEntry =
-        ((nsCacheEntryHashTableEntry *)from)->cacheEntry;
-}
-
-
-void PR_CALLBACK
-nsCacheEntryHashTable::ClearEntry(PLDHashTable * /* table */,
-                                  PLDHashEntryHdr * hashEntry)
-{
-    ((nsCacheEntryHashTableEntry *)hashEntry)->cacheEntry = 0;
-}
-
-
-void
-nsCacheEntryHashTable::Finalize(PLDHashTable * table)
-{
-    (void) PL_DHashTableEnumerate(table, FreeCacheEntries, nsnull);
-}
-
-
-PLDHashOperator PR_CALLBACK
-nsCacheEntryHashTable::FreeCacheEntries(PLDHashTable *table,
-                              PLDHashEntryHdr *hdr,
-                              PRUint32 number,
-                              void *arg)
-{
-    nsCacheEntryHashTableEntry *entry = (nsCacheEntryHashTableEntry *)hdr;
-    delete entry->cacheEntry;
-    return PL_DHASH_NEXT;
-}

mozilla/netwerk/cache/src/nsCacheEntry.h

@@ -1,319 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsCacheEntry.h, released February 22, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan, 22-February-2001
- */
-
-#ifndef _nsCacheEntry_h_
-#define _nsCacheEntry_h_
-
-#include "nspr.h"
-#include "pldhash.h"
-#include "nscore.h"
-#include "nsCOMPtr.h"
-#include "nsString.h"
-#include "nsAReadableString.h"
-
-#include "nsICache.h"
-#include "nsICacheEntryDescriptor.h"
-#include "nsCacheMetaData.h"
-
-
-class nsCacheDevice;
-class nsCacheMetaData;
-class nsCacheRequest;
-class nsCacheEntryDescriptor;
-
-/******************************************************************************
-* nsCacheEntry
-*******************************************************************************/
-class nsCacheEntry : public PRCList
-{
-public:
-
-    nsCacheEntry(nsCString *          key,
-                 PRBool               streamBased,
-                 nsCacheStoragePolicy storagePolicy);
-    ~nsCacheEntry();
-
-
-    nsCString *  Key()  { return mKey; }
-
-    PRInt32  FetchCount()                              { return mFetchCount;}
-    void     SetFetchCount( PRInt32   count)           { mFetchCount = count;}
-    void     Fetched();
-
-    PRUint32 LastFetched()                             { return mLastFetched;}
-    void     SetLastFetched( PRUint32  lastFetched)    { mLastFetched = lastFetched;}
-
-    PRUint32 LastModified()                            { return mLastModified;}
-    void     SetLastModified( PRUint32 lastModified)   { mLastModified = lastModified;}
-
-    PRUint32 ExpirationTime()                     { return mExpirationTime;}
-    void     SetExpirationTime( PRUint32 expires) { mExpirationTime = expires;}
-
-    PRUint32 Size()                               { return mDataSize + mMetaSize; }
-
-    nsCacheDevice * CacheDevice()                            { return mCacheDevice;}
-    void            SetCacheDevice( nsCacheDevice * device)  { mCacheDevice = device;}
-
-
-    /**
-     * Data accessors
-     */
-    nsresult GetData( nsISupports ** result);
-    void     SetData( nsISupports *  data)        { mData = data; }
-
-    PRUint32 DataSize()                           { return mDataSize;}
-    void     SetDataSize( PRUint32  size)         { mDataSize = size;}
-
-    void     TouchData();
-
-
-    /**
-     * Meta data accessors
-     */
-    nsresult GetMetaDataElement( const nsAReadableCString&  key,
-                                 nsAReadableCString **      value);
-    nsresult SetMetaDataElement( const nsAReadableCString&  key,
-                                 const nsAReadableCString&  value);
-
-    nsresult VisitMetaDataElements( nsICacheMetaDataVisitor * visitor);
-
-    nsresult FlattenMetaData( char ** data,  PRUint32 * size);
-    nsresult UnflattenMetaData( char * data, PRUint32   size);
-
-    PRUint32 MetaDataSize()                       { return mMetaSize;}
-
-    void     TouchMetaData();
-
-
-    /**
-     * Security Info accessors
-     */
-    nsresult GetSecurityInfo( nsISupports ** result);
-    void     SetSecurityInfo( nsISupports *  info) { mSecurityInfo = info; }
-
-
-    // XXX enumerate MetaData method
-
-
-    enum CacheEntryFlags {
-        eStoragePolicyMask   = 0x000000FF,
-        eDoomedMask          = 0x00000100,
-        eEntryDirtyMask      = 0x00000200,
-        eDataDirtyMask       = 0x00000400,
-        eMetaDataDirtyMask   = 0x00000800,
-        eStreamDataMask      = 0x00001000,
-        eActiveMask          = 0x00002000,
-        eInitializedMask     = 0x00004000,
-        eValidMask           = 0x00008000,
-        eBindingMask         = 0x00010000
-    };
-    
-    void MarkBinding()         { mFlags |=  eBindingMask; }
-    void ClearBinding()        { mFlags &= ~eBindingMask; }
-    PRBool IsBinding()         { return (mFlags & eBindingMask) != 0; }
-
-    void MarkEntryDirty()      { mFlags |=  eEntryDirtyMask; }
-    void MarkEntryClean()      { mFlags &= ~eEntryDirtyMask; }
-    void MarkDataDirty()       { mFlags |=  eDataDirtyMask; }
-    void MarkDataClean()       { mFlags &= ~eDataDirtyMask; }
-    void MarkMetaDataDirty()   { mFlags |=  eMetaDataDirtyMask; }
-    void MarkMetaDataClean()   { mFlags &= ~eMetaDataDirtyMask; }
-    void MarkStreamData()      { mFlags |=  eStreamDataMask; }
-    void MarkValid()           { mFlags |=  eValidMask; }
-    void MarkInvalid()         { mFlags &= ~eValidMask; }
-    //    void MarkAllowedInMemory() { mFlags |=  eAllowedInMemoryMask; }
-    //    void MarkAllowedOnDisk()   { mFlags |=  eAllowedOnDiskMask; }
-
-    PRBool IsDoomed()          { return (mFlags & eDoomedMask) != 0; }
-    PRBool IsEntryDirty()      { return (mFlags & eEntryDirtyMask) != 0; }
-    PRBool IsDataDirty()       { return (mFlags & eDataDirtyMask) != 0; }
-    PRBool IsMetaDataDirty()   { return (mFlags & eMetaDataDirtyMask) != 0; }
-    PRBool IsStreamData()      { return (mFlags & eStreamDataMask) != 0; }
-    PRBool IsActive()          { return (mFlags & eActiveMask) != 0; }
-    PRBool IsInitialized()     { return (mFlags & eInitializedMask) != 0; }
-    PRBool IsValid()           { return (mFlags & eValidMask) != 0; }
-    PRBool IsInvalid()         { return (mFlags & eValidMask) == 0; }
-    PRBool IsInUse()           { return !(PR_CLIST_IS_EMPTY(&mRequestQ) &&
-                                          PR_CLIST_IS_EMPTY(&mDescriptorQ)); }
-    PRBool IsNotInUse()        { return (PR_CLIST_IS_EMPTY(&mRequestQ) &&
-                                         PR_CLIST_IS_EMPTY(&mDescriptorQ)); }
-
-
-    PRBool IsAllowedInMemory()
-    {
-        return (StoragePolicy() ==  nsICache::STORE_ANYWHERE) ||
-            (StoragePolicy() == nsICache::STORE_IN_MEMORY);
-    }
-
-    PRBool IsAllowedOnDisk()
-    {
-        return (StoragePolicy() == nsICache::STORE_ANYWHERE) ||
-            (StoragePolicy() == nsICache::STORE_ON_DISK) ||
-            (StoragePolicy() == nsICache::STORE_ON_DISK_AS_FILE);
-    }
-
-    nsCacheStoragePolicy  StoragePolicy()
-    {
-        return (nsCacheStoragePolicy)(mFlags & eStoragePolicyMask);
-    }
-
-    void SetStoragePolicy(nsCacheStoragePolicy policy)
-    {
-        NS_ASSERTION(policy <= 0xFF, "too many bits in nsCacheStoragePolicy");
-        mFlags &= ~eStoragePolicyMask; // clear storage policy bits
-        mFlags |= policy;
-    }
-
-
-    // methods for nsCacheService
-    nsresult RequestAccess( nsCacheRequest * request, nsCacheAccessMode *accessGranted);
-    nsresult CreateDescriptor( nsCacheRequest *           request,
-                               nsCacheAccessMode          accessGranted,
-                               nsICacheEntryDescriptor ** result);
-
-    //    nsresult Open(nsCacheRequest *request, nsICacheEntryDescriptor ** result);
-    //    nsresult AsyncOpen(nsCacheRequest *request);
-    PRBool   RemoveRequest( nsCacheRequest * request);
-    PRBool   RemoveDescriptor( nsCacheEntryDescriptor * descriptor);
-    
-private:
-    friend class nsCacheEntryHashTable;
-    friend class nsCacheService;
-
-    void     DetachDescriptors(void);
-
-    // internal methods
-    void MarkDoomed()          { mFlags |=  eDoomedMask; }
-    void MarkStreamBased()     { mFlags |=  eStreamDataMask; }
-    void MarkInitialized()     { mFlags |=  eInitializedMask; }
-    void MarkActive()          { mFlags |=  eActiveMask; }
-    void MarkInactive()        { mFlags &= ~eActiveMask; }
-
-    nsCString *            mKey;            // 4  // XXX ask scc about const'ness
-    PRUint32               mFetchCount;     // 4
-    PRUint32               mLastFetched;    // 4
-    PRUint32               mLastModified;   // 4
-    PRUint32               mLastValidated;  // 4
-    PRUint32               mExpirationTime; // 4
-    PRUint32               mFlags;          // 4
-    PRUint32               mDataSize;       // 4
-    PRUint32               mMetaSize;       // 4
-    nsCacheDevice *        mCacheDevice;    // 4
-    nsCOMPtr<nsISupports>  mSecurityInfo;   // 
-    nsCOMPtr<nsISupports>  mData;           // 
-    nsCacheMetaData *      mMetaData;       // 4
-    PRCList                mRequestQ;       // 8
-    PRCList                mDescriptorQ;    // 8
-};
-
-
-/******************************************************************************
-* nsCacheEntryInfo
-*******************************************************************************/
-class nsCacheEntryInfo : public nsICacheEntryInfo {
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSICACHEENTRYINFO
-
-    nsCacheEntryInfo(nsCacheEntry* entry)
-        :   mCacheEntry(entry)
-    {
-        NS_INIT_ISUPPORTS();
-    }
-
-    virtual ~nsCacheEntryInfo() {}
-    void    DetachEntry() { mCacheEntry = nsnull; }
-    
-private:
-    nsCacheEntry * mCacheEntry;
-};
-
-
-/******************************************************************************
-* nsCacheEntryHashTable
-*******************************************************************************/
-typedef struct {
-    PLDHashNumber  keyHash;
-    nsCacheEntry  *cacheEntry;
-} nsCacheEntryHashTableEntry;
-
-
-class nsCacheEntryHashTable
-{
-public:
-    nsCacheEntryHashTable();
-    ~nsCacheEntryHashTable();
-
-    nsresult      Init();
-
-    nsCacheEntry *GetEntry( const nsCString * key);
-    nsresult      AddEntry( nsCacheEntry *entry);
-    void          RemoveEntry( nsCacheEntry *entry);
-    
-    // XXX enumerate entries?
-    class Visitor {
-    public:
-        virtual PRBool VisitEntry( nsCacheEntry *entry) = 0;
-    };
-    
-    void          VisitEntries( Visitor *visitor);
-    
-private:
-    friend class nsCacheService; // XXX redefine interface so this isn't necessary
-
-    // PLDHashTable operation callbacks
-    static const void *   PR_CALLBACK GetKey( PLDHashTable *table, PLDHashEntryHdr *entry);
-
-    static PLDHashNumber  PR_CALLBACK HashKey( PLDHashTable *table, const void *key);
-
-    static PRBool         PR_CALLBACK MatchEntry( PLDHashTable *           table,
-                                                  const PLDHashEntryHdr *  entry,
-                                                  const void *             key);
-
-    static void           PR_CALLBACK MoveEntry( PLDHashTable *table,
-                                                 const PLDHashEntryHdr *from,
-                                                 PLDHashEntryHdr       *to);
-
-    static void           PR_CALLBACK ClearEntry( PLDHashTable *table, PLDHashEntryHdr *entry);
-
-    static void           PR_CALLBACK Finalize( PLDHashTable *table);
-
-    static
-    PLDHashOperator       PR_CALLBACK FreeCacheEntries(PLDHashTable *    table,
-                                                       PLDHashEntryHdr * hdr,
-                                                       PRUint32          number,
-                                                       void *            arg);
-    static
-    PLDHashOperator       PR_CALLBACK VisitEntry(PLDHashTable *         table,
-                                                 PLDHashEntryHdr *      hdr,
-                                                 PRUint32               number,
-                                                 void *                 arg);
-                                     
-    // member variables
-    static PLDHashTableOps ops;
-    PLDHashTable           table;
-    PRBool                 initialized;
-};
-
-#endif // _nsCacheEntry_h_
-

mozilla/netwerk/cache/src/nsCacheEntryDescriptor.cpp

@@ -1,654 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsCacheEntryDescriptor.cpp, released February 22, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan, 22-February-2001
- */
-
-#include "nsICache.h"
-#include "nsCache.h"
-#include "nsCacheService.h"
-#include "nsCacheEntryDescriptor.h"
-#include "nsCacheEntry.h"
-#include "nsReadableUtils.h"
-#include "nsIOutputStream.h"
-
-NS_IMPL_ISUPPORTS1(nsCacheEntryDescriptor, nsICacheEntryDescriptor)
-
-
-nsCacheEntryDescriptor::nsCacheEntryDescriptor(nsCacheEntry * entry,
-                                               nsCacheAccessMode accessGranted)
-    : mCacheEntry(entry),
-      mAccessGranted(accessGranted)
-{
-  NS_INIT_ISUPPORTS();
-  PR_INIT_CLIST(this);
-}
-
-
-nsCacheEntryDescriptor::~nsCacheEntryDescriptor()
-{
-    if (mCacheEntry)
-        Close();
-}
-
-
-nsresult
-nsCacheEntryDescriptor::Create(nsCacheEntry * entry, nsCacheAccessMode  accessGranted,
-                               nsICacheEntryDescriptor ** result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    nsresult rv = nsnull;
-    
-    nsCacheEntryDescriptor * descriptor =
-        new nsCacheEntryDescriptor(entry, accessGranted);
-
-    if (descriptor == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(descriptor);
-    rv = descriptor->QueryInterface(NS_GET_IID(nsICacheEntryDescriptor), (void**)result);
-    NS_RELEASE(descriptor);
-    return rv;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::GetClientID(char ** result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    return ClientIDFromCacheKey(*(mCacheEntry->Key()), result);
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::GetKey(char ** result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    return ClientKeyFromCacheKey(*(mCacheEntry->Key()), result);
-
-#if 0
-    nsCString * key;
-    nsresult    rv = NS_OK;
-
-    *result = nsnull;
-    key = mCacheEntry->Key();
-
-    nsReadingIterator<char> start;
-    key->BeginReading(start);
-        
-    nsReadingIterator<char> end;
-    key->EndReading(end);
-        
-    if (FindCharInReadable(':', start, end)) {
-        ++start;  // advance past clientID ':' delimiter
-        *result = ToNewCString( Substring(start, end));
-        if (!*result) rv = NS_ERROR_OUT_OF_MEMORY;
-    } else {
-        NS_ASSERTION(PR_FALSE, "FindCharInRead failed to find ':'");
-        rv = NS_ERROR_UNEXPECTED;
-    }
-    return rv;
-#endif
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::GetFetchCount(PRInt32 *result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    *result = mCacheEntry->FetchCount();
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::GetLastFetched(PRUint32 *result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    *result = mCacheEntry->LastFetched();
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::GetLastModified(PRUint32 *result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    *result = mCacheEntry->LastModified();
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::GetExpirationTime(PRUint32 *result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    *result = mCacheEntry->ExpirationTime();
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::SetExpirationTime(PRUint32 expirationTime)
-{
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    mCacheEntry->SetExpirationTime(expirationTime);
-    mCacheEntry->MarkEntryDirty();
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP nsCacheEntryDescriptor::IsStreamBased(PRBool *result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    *result = mCacheEntry->IsStreamData();  // XXX which name is better?
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP nsCacheEntryDescriptor::GetDataSize(PRUint32 *result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    *result = mCacheEntry->DataSize();
-    return NS_OK;
-}
-
-
-nsresult
-nsCacheEntryDescriptor::RequestDataSizeChange(PRInt32 deltaSize)
-{
-    nsresult  rv;
-    rv = nsCacheService::GlobalInstance()->OnDataSizeChange(mCacheEntry, deltaSize);
-    if (NS_SUCCEEDED(rv)) {
-        // XXX review for signed/unsigned math errors
-        PRUint32  newDataSize = mCacheEntry->DataSize() + deltaSize;
-        mCacheEntry->SetDataSize(newDataSize);
-        mCacheEntry->TouchData();
-    }
-    return rv;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::SetDataSize(PRUint32 dataSize)
-{
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    // XXX review for signed/unsigned math errors
-    PRInt32  deltaSize = dataSize - mCacheEntry->DataSize();
-
-    // this had better be NS_OK, this call instance is advisory
-    nsresult  rv = RequestDataSizeChange(deltaSize);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "failed SetDataSize() on memory cache object!");
-    return rv;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::GetTransport(nsITransport ** result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    if (!mCacheEntry)                  return NS_ERROR_NOT_AVAILABLE;
-    if (!mCacheEntry->IsStreamData())  return NS_ERROR_CACHE_DATA_IS_NOT_STREAM;
-
-    NS_ADDREF(*result = &mTransportWrapper);
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::GetCacheElement(nsISupports ** result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    if (!mCacheEntry)                 return NS_ERROR_NOT_AVAILABLE;
-    if (mCacheEntry->IsStreamData())  return NS_ERROR_CACHE_DATA_IS_STREAM;
-
-    return mCacheEntry->GetData(result);
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::SetCacheElement(nsISupports * cacheElement)
-{
-    if (!mCacheEntry)                 return NS_ERROR_NOT_AVAILABLE;
-    if (mCacheEntry->IsStreamData())  return NS_ERROR_CACHE_DATA_IS_STREAM;
-
-    mCacheEntry->SetData(cacheElement);
-    mCacheEntry->TouchData();
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::GetAccessGranted(nsCacheAccessMode *result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    *result = mAccessGranted;
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::GetStoragePolicy(nsCacheStoragePolicy *result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-    
-    return mCacheEntry->StoragePolicy();
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::SetStoragePolicy(nsCacheStoragePolicy policy)
-{
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-    // XXX validate policy against session?
-    mCacheEntry->SetStoragePolicy(policy);
-    mCacheEntry->MarkEntryDirty();
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::GetFile(nsIFile ** result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-    
-    return nsCacheService::GlobalInstance()->GetFileForEntry(mCacheEntry, result);
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::GetSecurityInfo(nsISupports ** result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    return mCacheEntry->GetSecurityInfo(result);
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::SetSecurityInfo(nsISupports * securityInfo)
-{
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    mCacheEntry->SetSecurityInfo(securityInfo);
-    mCacheEntry->MarkEntryDirty();
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::Doom()
-{
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    return nsCacheService::GlobalInstance()->DoomEntry(mCacheEntry);
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::DoomAndFailPendingRequests(nsresult status)
-{
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::MarkValid()
-{
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    nsresult  rv;
-    rv = nsCacheService::GlobalInstance()->ValidateEntry(mCacheEntry);
-    return rv;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::Close()
-{
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    // tell nsCacheService we're going away
-    nsCacheService::GlobalInstance()->CloseDescriptor(this);
-    mCacheEntry = nsnull;
-
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::GetMetaDataElement(const char *key, char ** result)
-{
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    if (!key | !result) return NS_ERROR_NULL_POINTER;
-    nsAReadableCString *value;
-    *result = nsnull;
-
-    // XXX not thread safe    
-    nsresult rv = mCacheEntry->GetMetaDataElement(nsLiteralCString(key), &value);
-    if (NS_FAILED(rv)) return rv;
-
-    if (!value) return NS_ERROR_NOT_AVAILABLE;
-
-    *result = ToNewCString(*value);
-    if (!*result) return NS_ERROR_OUT_OF_MEMORY;
-
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::SetMetaDataElement(const char *key, const char *value)
-{
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    if (!key) return NS_ERROR_NULL_POINTER;
-    // XXX not thread safe
-    // XXX allow null value, for clearing key?
-    nsresult rv = mCacheEntry->SetMetaDataElement(nsLiteralCString(key),
-                                                  nsLiteralCString(value));
-    if (NS_SUCCEEDED(rv))
-        mCacheEntry->TouchMetaData();
-    return rv;
-}
-
-
-NS_IMETHODIMP
-nsCacheEntryDescriptor::VisitMetaData(nsICacheMetaDataVisitor * visitor)
-{
-    NS_ENSURE_ARG_POINTER(visitor);
-    if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    return mCacheEntry->VisitMetaDataElements(visitor);
-}
-
-
-/******************************************************************************
- * nsCacheTransportWrapper
- ******************************************************************************/
-
-// XXX NS_IMPL_ISUPPORTS1(nsCacheEntryDescriptor::nsTransportWrapper, nsITransport);
-NS_IMPL_QUERY_INTERFACE1(nsCacheEntryDescriptor::nsTransportWrapper, nsITransport)
-
-
-//  special AddRef and Release, because we are part of the descriptor
-#define GET_DESCRIPTOR_FROM_TRANSPORT_WRAPPER(_this) \
-        ((nsCacheEntryDescriptor*)((char*)(_this) - \
-                                   offsetof(nsCacheEntryDescriptor, mTransportWrapper)))
-
-NS_IMETHODIMP_(nsrefcnt) nsCacheEntryDescriptor::
-nsTransportWrapper::AddRef(void)
-{
-    return GET_DESCRIPTOR_FROM_TRANSPORT_WRAPPER(this)->AddRef();
-}
-
-NS_IMETHODIMP_(nsrefcnt) nsCacheEntryDescriptor::
-nsTransportWrapper::Release(void)
-{
-    return GET_DESCRIPTOR_FROM_TRANSPORT_WRAPPER(this)->Release();
-}
-
-
-nsresult nsCacheEntryDescriptor::
-nsTransportWrapper::EnsureTransportWithAccess(nsCacheAccessMode  mode)
-{
-    nsresult  rv = NS_OK;
-
-    nsCacheEntryDescriptor * descriptor = GET_DESCRIPTOR_FROM_TRANSPORT_WRAPPER(this);
-    if (!descriptor->mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-    if (!descriptor->mAccessGranted & mode) {
-        rv = (mode == nsICache::ACCESS_READ) ?
-            NS_ERROR_CACHE_READ_ACCESS_DENIED : NS_ERROR_CACHE_WRITE_ACCESS_DENIED;
-        return rv;
-    }
-
-    if (!mTransport) {
-        rv = nsCacheService::GlobalInstance()->
-            GetTransportForEntry(descriptor->mCacheEntry,
-                                 descriptor->mAccessGranted,
-                                 getter_AddRefs(mTransport));
-        if (NS_FAILED(rv))  return rv;
-    }
-    return NS_OK;
-}
-
-
-nsresult 
-nsCacheEntryDescriptor::NewOutputStreamWrapper(nsIOutputStream **       result,
-                                               nsCacheEntryDescriptor * descriptor,
-                                               nsIOutputStream *        output)
-{
-    nsOutputStreamWrapper* cacheOutput =
-        new nsOutputStreamWrapper(descriptor, output);
-    if (!cacheOutput) return NS_ERROR_OUT_OF_MEMORY;
-
-    nsCOMPtr<nsISupports> ref(cacheOutput);
-    nsresult              rv = cacheOutput->Init();
-    if (NS_FAILED(rv)) return rv;
-
-    NS_ADDREF(*result = cacheOutput);
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP nsCacheEntryDescriptor::
-nsTransportWrapper::GetSecurityInfo(nsISupports ** securityInfo)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-NS_IMETHODIMP nsCacheEntryDescriptor::
-nsTransportWrapper::GetNotificationCallbacks(nsIInterfaceRequestor **result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    // if (!mCacheEntry)  return NS_ERROR_NOT_AVAILABLE;
-
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-NS_IMETHODIMP nsCacheEntryDescriptor::
-nsTransportWrapper::SetNotificationCallbacks(nsIInterfaceRequestor *requestor,
-                                                 PRBool isBackground)
-{
-    //    if (!mCacheEntry)       return NS_ERROR_NOT_AVAILABLE;
-
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-NS_IMETHODIMP nsCacheEntryDescriptor::
-nsTransportWrapper::OpenInputStream(PRUint32           offset,
-                                    PRUint32           count,
-                                    PRUint32           flags,
-                                    nsIInputStream  ** result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-
-    nsresult  rv = EnsureTransportWithAccess(nsICache::ACCESS_READ);
-    if (NS_FAILED(rv)) return rv;
-    
-    return mTransport->OpenInputStream(offset, count, flags, result);
-}
-
-
-NS_IMETHODIMP nsCacheEntryDescriptor::
-nsTransportWrapper::OpenOutputStream(PRUint32            offset,
-                                     PRUint32            count,
-                                     PRUint32            flags,
-                                     nsIOutputStream  ** result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-
-    nsresult  rv = EnsureTransportWithAccess(nsICache::ACCESS_WRITE);
-    if (NS_FAILED(rv))  return rv;
-
-    // XXX allow more than one output stream at a time on a descriptor?  Why?  
-
-    // Create the underlying output stream using the wrapped transport.
-    nsCOMPtr<nsIOutputStream> output;    
-    rv = mTransport->OpenOutputStream(offset, count, flags, getter_AddRefs(output));
-    if (NS_FAILED(rv)) return rv;
-
-    // Wrap this output stream, with a stream that monitors how much data gets written,
-    // to maintain the cache entry's size, and to inform the cache device. Eventually,
-    // this mechanism will provide a way for the cache device to enforce space limits,
-    // and to drive cache entry eviction.
-    nsCacheEntryDescriptor * descriptor = GET_DESCRIPTOR_FROM_TRANSPORT_WRAPPER(this);
-    return NewOutputStreamWrapper(result, descriptor, output);
-}
-
-
-NS_IMETHODIMP nsCacheEntryDescriptor::
-nsTransportWrapper::AsyncRead(nsIStreamListener * listener,
-                              nsISupports *       ctxt,
-                              PRUint32            offset,
-                              PRUint32            count,
-                              PRUint32            flags,
-                              nsIRequest       ** result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-
-    nsresult  rv = EnsureTransportWithAccess(nsICache::ACCESS_READ);
-    if (NS_FAILED(rv))  return rv;
-    
-    return mTransport->AsyncRead(listener, ctxt, offset, count, flags, result);
-}
-
-
-NS_IMETHODIMP nsCacheEntryDescriptor::
-nsTransportWrapper::AsyncWrite(nsIStreamProvider * provider,
-                               nsISupports *       ctxt,
-                               PRUint32            offset, 
-                               PRUint32            count, 
-                               PRUint32            flags, 
-                               nsIRequest       ** result)
-{
-    // we're not planning on implementing this
-    return NS_ERROR_NOT_IMPLEMENTED;
-
-#if 0
-    NS_ENSURE_ARG_POINTER(result);
-
-    nsresult rv = EnsureTransportWithAccess(nsICache::ACCESS_WRITE);
-    if (NS_FAILED(rv)) return rv;
-    
-    return mTransport->AsyncWrite(provider, ctxt, offset, count, flags, result);
-#endif
-}
-
-
-/******************************************************************************
- * nsCacheOutputStream - a wrapper for nsIOutputstream to track the amount of
- *                       data written to a cache entry.
- ******************************************************************************/
-
-NS_IMPL_ISUPPORTS1(nsCacheEntryDescriptor::nsOutputStreamWrapper, nsIOutputStream);
-
-nsresult nsCacheEntryDescriptor::
-nsOutputStreamWrapper::Init()
-{
-    nsCacheAccessMode mode;
-    nsresult rv = mDescriptor->GetAccessGranted(&mode);
-    if (NS_FAILED(rv)) return rv;
-
-    if (mode == nsICache::ACCESS_WRITE) {
-        nsCacheEntry* cacheEntry = mDescriptor->CacheEntry();
-        if (!cacheEntry) return NS_ERROR_NOT_AVAILABLE;
-
-        nsCacheDevice* device = cacheEntry->CacheDevice();
-        if (!device) return NS_ERROR_NOT_AVAILABLE;
-
-        // the entry has been truncated to zero bytes, inform the device.
-        PRInt32 delta = -cacheEntry->DataSize();
-        rv = device->OnDataSizeChange(cacheEntry, delta);
-        cacheEntry->SetDataSize(0);
-    }
-    return rv;
-}
-
-
-NS_IMETHODIMP nsCacheEntryDescriptor::
-nsOutputStreamWrapper::Write(const char * buf,
-                             PRUint32     count,
-                             PRUint32 *   result)
-{
-    nsresult rv = OnWrite(count);
-    if (NS_FAILED(rv)) return rv;
-    return mOutput->Write(buf, count, result);
-}
-
-
-NS_IMETHODIMP nsCacheEntryDescriptor::
-nsOutputStreamWrapper::WriteFrom(nsIInputStream * inStr,
-                                 PRUint32         count,
-                                 PRUint32 *       result)
-{
-    nsresult rv = OnWrite(count);
-    if (NS_FAILED(rv)) return rv;
-    return mOutput->WriteFrom(inStr, count, result);
-}
-
-
-NS_IMETHODIMP nsCacheEntryDescriptor::
-nsOutputStreamWrapper::WriteSegments(nsReadSegmentFun  reader,
-                                    void *            closure,
-                                    PRUint32          count,
-                                    PRUint32 *        result)
-{
-    nsresult rv = OnWrite(count);
-    if (NS_FAILED(rv)) return rv;
-    return mOutput->WriteSegments(reader, closure, count, result);
-}
-
-
-nsresult nsCacheEntryDescriptor::
-nsOutputStreamWrapper::OnWrite(PRUint32 count)
-{
-    // XXX if count > 2^31 error_write_too_big
-    return mDescriptor->RequestDataSizeChange((PRInt32)count);
-}
-
-

mozilla/netwerk/cache/src/nsCacheEntryDescriptor.h

@@ -1,167 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsCacheEntryDescriptor.h, released February 22, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan, 22-February-2001
- */
-
-
-#ifndef _nsCacheEntryDescriptor_h_
-#define _nsCacheEntryDescriptor_h_
-
-#include "nsICacheEntryDescriptor.h"
-#include "nsCacheEntry.h"
-#include "nsIOutputStream.h"
-#include "nsITransport.h"
-
-/******************************************************************************
-* nsCacheEntryDescriptor
-*******************************************************************************/
-class nsCacheEntryDescriptor :
-    public PRCList,
-    public nsICacheEntryDescriptor
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSICACHEENTRYDESCRIPTOR
-    NS_DECL_NSICACHEENTRYINFO
-    
-    nsCacheEntryDescriptor(nsCacheEntry * entry, nsCacheAccessMode  mode);
-    virtual ~nsCacheEntryDescriptor();
-    
-    static nsresult Create(nsCacheEntry * entry, nsCacheAccessMode  accessGranted,
-                           nsICacheEntryDescriptor ** result);
-
-
-    /**
-     * utility method to attempt changing data size of associated entry
-     */
-    nsresult  RequestDataSizeChange(PRInt32 deltaSize);
-    
-    /**
-     * methods callbacks for nsCacheService
-     */
-    nsCacheEntry * CacheEntry(void)      { return mCacheEntry; }
-    void           ClearCacheEntry(void) { mCacheEntry = nsnull; }
-
-private:
-
-     /*************************************************************************
-      * transport wrapper class - 
-      *
-      * we want the transport wrapper to have the same lifetime as the
-      * descriptor, but since they each need to reference the other, we have the
-      * descriptor include the transport wrapper as a member, rather than just
-      * pointing to it, which avoids circular AddRefs.
-      *************************************************************************/
-     class nsTransportWrapper : public nsITransport
-     {
-     public:
-         NS_DECL_ISUPPORTS_INHERITED
-         NS_DECL_NSITRANSPORT
-
-         nsTransportWrapper() : mTransport(nsnull) {}
-         virtual ~nsTransportWrapper() {}
-
-         nsresult EnsureTransportWithAccess(nsCacheAccessMode  mode);
-
-         nsCOMPtr<nsITransport>   mTransport;
-     }; // end of class nsTransportWrapper
-     friend class nsTransportWrapper;
-
-
-     /*************************************************************************
-      * output stream wrapper class -
-      *
-      * The output stream wrapper references the descriptor, but the descriptor
-      * doesn't need any references to the stream wrapper, so we don't need the
-      * same kind of tricks that we're using for the transport wrapper.
-      *************************************************************************/
-     class nsOutputStreamWrapper : public nsIOutputStream {
-     private:
-         nsCacheEntryDescriptor *  mDescriptor;
-         nsCOMPtr<nsIOutputStream> mOutput;
-     public:
-         NS_DECL_ISUPPORTS
-         // NS_DECL_NSIOUTPUTSTREAM
-         NS_IMETHOD Close(void) { return mOutput->Close(); }
-         NS_IMETHOD Flush(void) { return mOutput->Flush(); }
-
-         NS_IMETHOD Write(const char * buf,
-                          PRUint32     count,
-                          PRUint32 *   result);
-
-         NS_IMETHOD WriteFrom(nsIInputStream * inStr,
-                              PRUint32         count,
-                              PRUint32 *       result);
-
-         NS_IMETHOD WriteSegments(nsReadSegmentFun reader,
-                                  void *           closure,
-                                  PRUint32         count,
-                                  PRUint32 *       result);
-
-         NS_IMETHOD GetNonBlocking(PRBool * nonBlocking)
-         { return mOutput->GetNonBlocking(nonBlocking); }
-
-         NS_IMETHOD SetNonBlocking(PRBool nonBlocking)
-         { return mOutput->SetNonBlocking(nonBlocking); }
-
-         NS_IMETHOD GetObserver(nsIOutputStreamObserver ** observer)
-         { return mOutput->GetObserver(observer); }
-
-         NS_IMETHOD SetObserver(nsIOutputStreamObserver * observer)
-         { return mOutput->SetObserver(observer); }
-
-         nsOutputStreamWrapper(nsCacheEntryDescriptor * descriptor,
-                               nsIOutputStream *        output)
-             : mDescriptor(nsnull), mOutput(output)
-         {
-             NS_INIT_ISUPPORTS();
-             NS_ADDREF(mDescriptor = descriptor);
-         }
-    
-         virtual ~nsOutputStreamWrapper()
-         {
-             NS_RELEASE(mDescriptor);
-         }
-    
-         nsresult Init();
-
-
-     private:
-         nsresult OnWrite(PRUint32 count);
-     }; // end of class nsOutputStreamWrapper
-     friend class nsOutputStreamWrapper;
-
-
-
-     static nsresult NewOutputStreamWrapper(nsIOutputStream **       result,
-                                            nsCacheEntryDescriptor * descriptor,
-                                            nsIOutputStream *        output);
- private:
-     /**
-      * nsCacheEntryDescriptor data members
-      */
-     nsCacheEntry          * mCacheEntry; // we are a child of the entry
-     nsCacheAccessMode       mAccessGranted;
-     nsTransportWrapper      mTransportWrapper;
-};
-
-
-#endif // _nsCacheEntryDescriptor_h_

mozilla/netwerk/cache/src/nsCacheMetaData.cpp

@@ -1,327 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsCacheMetaData.cpp, released February 22, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan, 22-February-2001
- */
-
-#include "nsCacheMetaData.h"
-#include "nsString.h"
-#include "nsICacheEntryDescriptor.h"
-
-
-/*
- *  nsCacheClientHashTable
- */
-
-PLDHashTableOps
-nsCacheMetaData::ops =
-{
-    PL_DHashAllocTable,
-    PL_DHashFreeTable,
-    GetKey,
-    HashKey,
-    MatchEntry,
-    MoveEntry,
-    ClearEntry,
-    Finalize
-};
-
-
-nsCacheMetaData::nsCacheMetaData()
-    : initialized(PR_FALSE)
-{
-}
-
-nsCacheMetaData::~nsCacheMetaData()
-{
-    if (initialized)
-        PL_DHashTableFinish(&table);
-}
-
-
-nsresult
-nsCacheMetaData::Init()
-{
-    nsresult rv = NS_OK;
-    initialized = PL_DHashTableInit(&table, &ops, nsnull,
-                                    sizeof(nsCacheMetaDataHashTableEntry), 16);
-
-    if (!initialized) rv = NS_ERROR_OUT_OF_MEMORY;
-    return rv;
-}
-
-
-nsCacheMetaData *
-nsCacheMetaData::Create()
-{
-    nsCacheMetaData * metaData = new nsCacheMetaData();
-    if (!metaData)
-        return nsnull;
-
-    nsresult rv = metaData->Init();
-    if (NS_FAILED(rv)) {
-        delete metaData;
-        return nsnull;
-    }
-
-    return metaData;
-}
-
-
-nsAReadableCString *
-nsCacheMetaData::GetElement(const nsAReadableCString * key)
-{
-    PLDHashEntryHdr * hashEntry;
-    nsCString *       result = nsnull;
-
-    // XXX need to copy string until we have scc's new flat string abstract class
-    // XXX see nsCacheMetaData::HashKey below (bug 70075)
-    nsCString * tempKey = new nsCString(*key);
-    if (!tempKey) return result;
-
-    NS_ASSERTION(initialized, "nsCacheMetaDataHashTable not initialized");
-    hashEntry = PL_DHashTableOperate(&table, tempKey, PL_DHASH_LOOKUP);
-    if (PL_DHASH_ENTRY_IS_BUSY(hashEntry)) {
-        result = ((nsCacheMetaDataHashTableEntry *)hashEntry)->value;
-    }
-
-    delete tempKey;
-    return result;
-}
-
-
-nsresult
-nsCacheMetaData::SetElement(const nsAReadableCString& key,
-                            const nsAReadableCString& value)
-{
-    nsCacheMetaDataHashTableEntry * metaEntry;
-    nsresult  rv = NS_ERROR_OUT_OF_MEMORY;  // presume the worst
-
-    NS_ASSERTION(initialized, "nsCacheMetaDataHashTable not initialized");
-
-    // XXX need to copy string until we have scc's new flat string abstract class
-    // XXX see nsCacheMetaData::HashKey below (bug 70075)
-    nsCString * tempKey = new nsCString(key);
-    if (!tempKey) return rv;
-
-    // XXX should empty value remove the key?
-
-    metaEntry = (nsCacheMetaDataHashTableEntry *)
-        PL_DHashTableOperate(&table, tempKey, PL_DHASH_ADD);
-    if (!metaEntry) goto error_exit;
-
-
-    if (metaEntry->key == nsnull) {
-        metaEntry->key = new nsCString(key);
-        if (metaEntry->key == nsnull) {
-            goto error_exit;
-        }
-    }
-    if (metaEntry->value != nsnull)
-        delete metaEntry->value;  // clear the old value
-
-    metaEntry->value = new nsCString(value);
-    if (metaEntry->value == nsnull) {
-        // XXX remove key?
-        goto error_exit;
-    }
-
-    rv = NS_OK;
- error_exit:
-    delete tempKey;
-    return rv;
-}
-
-
-PRUint32
-nsCacheMetaData::Size(void)
-{
-    PRUint32 size = 0;
-    (void) PL_DHashTableEnumerate(&table, CalculateSize, &size);
-    return size;
-}
-
-
-nsresult
-nsCacheMetaData::FlattenMetaData(char ** data, PRUint32 * size)
-{
-    *size = 0;
-
-    if (PL_DHashTableEnumerate(&table, CalculateSize, size) != 0 && data) {
-        *data = new char[*size];
-        if (*data == nsnull) return NS_ERROR_OUT_OF_MEMORY;
-        char* state = *data;
-        PL_DHashTableEnumerate(&table, AccumulateElement, &state);
-    }
-
-    return NS_OK;
-}
-
-nsresult
-nsCacheMetaData::UnflattenMetaData(char * data, PRUint32 size)
-{
-    nsresult rv = NS_ERROR_UNEXPECTED;
-    char* limit = data + size;
-    while (data < limit) {
-        const char* name = data;
-        PRUint32 nameSize = nsCRT::strlen(name);
-        data += 1 + nameSize;
-        if (data < limit) {
-            const char* value = data;
-            PRUint32 valueSize = nsCRT::strlen(value);
-            data += 1 + valueSize;
-            rv = SetElement(nsLocalCString(name, nameSize),
-                                   nsLocalCString(value, valueSize));
-            if (NS_FAILED(rv)) break;
-        }
-    }
-    return rv;
-}
-
-
-nsresult
-nsCacheMetaData::VisitElements(nsICacheMetaDataVisitor * visitor)
-{
-    (void) PL_DHashTableEnumerate(&table, VisitElement, visitor);
-    return NS_OK;
-}
-
-
-/*
- *  hash table operation callback functions
- */
-
-const void * PR_CALLBACK
-nsCacheMetaData::GetKey( PLDHashTable * /* table */, PLDHashEntryHdr *hashEntry)
-{
-    return ((nsCacheMetaDataHashTableEntry *)hashEntry)->key;
-}
-
-
-PLDHashNumber PR_CALLBACK
-nsCacheMetaData::HashKey( PLDHashTable * table, const void *key)
-{
-    // XXX need scc's new flat string abstract class here (bug 70075)
-    return PL_DHashStringKey(table, ((nsCString *)key)->get());
-}
-
-
-PRBool PR_CALLBACK
-nsCacheMetaData::MatchEntry(PLDHashTable *       /* table */,
-				     const PLDHashEntryHdr * hashEntry,
-				     const void *            key)
-{
-    NS_ASSERTION(key !=  nsnull, "### nsCacheMetaDataHashTable::MatchEntry : null key");
-    nsCString * entryKey = ((nsCacheMetaDataHashTableEntry *)hashEntry)->key;
-    NS_ASSERTION(entryKey, "### hashEntry->key == nsnull");
-
-    return entryKey->Equals(*NS_STATIC_CAST(const nsAReadableCString*,key));
-}
-
-
-void PR_CALLBACK
-nsCacheMetaData::MoveEntry(PLDHashTable * /* table */,
-				    const PLDHashEntryHdr *from,
-				    PLDHashEntryHdr       *to)
-{
-    ((nsCacheMetaDataHashTableEntry *)to)->key =
-        ((nsCacheMetaDataHashTableEntry *)from)->key;
-    ((nsCacheMetaDataHashTableEntry *)to)->value =
-        ((nsCacheMetaDataHashTableEntry *)from)->value;
-}
-
-
-void PR_CALLBACK
-nsCacheMetaData::ClearEntry(PLDHashTable * /* table */,
-                            PLDHashEntryHdr * hashEntry)
-{
-    ((nsCacheMetaDataHashTableEntry *)hashEntry)->key      = 0;
-    ((nsCacheMetaDataHashTableEntry *)hashEntry)->value    = 0;
-}
-
-
-void PR_CALLBACK
-nsCacheMetaData::Finalize(PLDHashTable * table)
-{
-    (void) PL_DHashTableEnumerate(table, FreeElement, nsnull);   
-}
-
-
-/**
- * hash table enumeration callback functions
- */
-
-PLDHashOperator PR_CALLBACK
-nsCacheMetaData::CalculateSize(PLDHashTable *table,
-                               PLDHashEntryHdr *hdr,
-                               PRUint32 number,
-                               void *arg)
-{
-    nsCacheMetaDataHashTableEntry* hashEntry = (nsCacheMetaDataHashTableEntry *)hdr;
-    *(PRUint32*)arg += (2 + hashEntry->key->Length() + hashEntry->value->Length());
-    return PL_DHASH_NEXT;
-}
-
-PLDHashOperator PR_CALLBACK
-nsCacheMetaData::AccumulateElement(PLDHashTable *table,
-                                 PLDHashEntryHdr *hdr,
-                                 PRUint32 number,
-                                 void *arg)
-{
-    char** bufferPtr = (char**) arg;
-    nsCacheMetaDataHashTableEntry* hashEntry = (nsCacheMetaDataHashTableEntry *)hdr;
-    PRUint32 size = 1 + hashEntry->key->Length();
-    nsCRT::memcpy(*bufferPtr, hashEntry->key->get(), size);
-    *bufferPtr += size;
-    size = 1 + hashEntry->value->Length();
-    nsCRT::memcpy(*bufferPtr, hashEntry->value->get(), size);
-    *bufferPtr += size;
-    return PL_DHASH_NEXT;
-}
-
-PLDHashOperator PR_CALLBACK
-nsCacheMetaData::FreeElement(PLDHashTable *table,
-                              PLDHashEntryHdr *hdr,
-                              PRUint32 number,
-                              void *arg)
-{
-    nsCacheMetaDataHashTableEntry *entry = (nsCacheMetaDataHashTableEntry *)hdr;
-    delete entry->key;
-    delete entry->value;
-    return PL_DHASH_NEXT;
-}
-
-
-PLDHashOperator PR_CALLBACK
-nsCacheMetaData::VisitElement(PLDHashTable *table,
-                              PLDHashEntryHdr *hdr,
-                              PRUint32 number,
-                              void *arg)
-{
-    nsCacheMetaDataHashTableEntry *entry   = (nsCacheMetaDataHashTableEntry *)hdr;
-    nsICacheMetaDataVisitor       *visitor = (nsICacheMetaDataVisitor *)arg;
-    const char * key   = entry->key   ? entry->key->get()   : nsnull;
-    const char * value = entry->value ? entry->value->get() : nsnull;
-    
-    PRBool keepGoing;
-    nsresult rv = visitor->VisitMetaDataElement(key, value, &keepGoing);
-
-    return NS_SUCCEEDED(rv) && keepGoing ? PL_DHASH_NEXT : PL_DHASH_STOP;
-}

mozilla/netwerk/cache/src/nsCacheMetaData.h

@@ -1,119 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsCacheMetaData.h, released February 22, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan, 22-February-2001
- */
-
-#ifndef _nsCacheMetaData_h_
-#define _nsCacheMetaData_h_
-
-#include "nspr.h"
-#include "pldhash.h"
-#include "nscore.h"
-// #include "nsCOMPtr.h"
-#include "nsString.h"
-// #include "nsAReadableString.h"
-
-class nsICacheMetaDataVisitor;
-
-typedef struct {
-    nsCString *  key;
-    nsCString *  value;
-} nsCacheMetaDataKeyValuePair;
-
-
-typedef struct {
-  PLDHashNumber  keyHash;
-  nsCString *    key;
-  nsCString *    value;
-} nsCacheMetaDataHashTableEntry;
-
-
-class nsCacheMetaData {
-public:
-    nsCacheMetaData();
-    ~nsCacheMetaData();
-
-    static
-    nsCacheMetaData *     Create(void);
-
-    nsresult              Init(void);
-
-    nsAReadableCString *  GetElement(const nsAReadableCString * key);
-
-    nsresult              SetElement(const nsAReadableCString& key,
-                                     const nsAReadableCString& value);
-
-    PRUint32              Size(void);
-
-    nsresult              FlattenMetaData(char ** data, PRUint32 * size);
-    
-    nsresult              UnflattenMetaData(char * data, PRUint32 size);
-
-    nsresult              VisitElements(nsICacheMetaDataVisitor * visitor);
-
-private:
-    // PLDHashTable operation callbacks
-    static const void *   PR_CALLBACK GetKey( PLDHashTable *table, PLDHashEntryHdr *entry);
-
-    static PLDHashNumber  PR_CALLBACK HashKey( PLDHashTable *table, const void *key);
-
-    static PRBool         PR_CALLBACK MatchEntry( PLDHashTable *           table,
-                                                  const PLDHashEntryHdr *  entry,
-                                                  const void *             key);
-
-    static void           PR_CALLBACK MoveEntry( PLDHashTable *table,
-                                                 const PLDHashEntryHdr *from,
-                                                 PLDHashEntryHdr       *to);
-
-    static void           PR_CALLBACK ClearEntry( PLDHashTable *table, PLDHashEntryHdr *entry);
-
-    static void           PR_CALLBACK Finalize( PLDHashTable *table);
-
-    static
-    PLDHashOperator       PR_CALLBACK CalculateSize(PLDHashTable *table,
-                                                    PLDHashEntryHdr *hdr,
-                                                    PRUint32 number,
-                                                    void *arg);
-
-    static
-    PLDHashOperator       PR_CALLBACK AccumulateElement(PLDHashTable *table,
-                                                         PLDHashEntryHdr *hdr,
-                                                         PRUint32 number,
-                                                         void *arg);
-
-    static
-    PLDHashOperator       PR_CALLBACK FreeElement(PLDHashTable *table,
-                                                   PLDHashEntryHdr *hdr,
-                                                   PRUint32 number,
-                                                   void *arg);
-    static
-    PLDHashOperator       PR_CALLBACK VisitElement(PLDHashTable *table,
-                                                    PLDHashEntryHdr *hdr,
-                                                    PRUint32 number,
-                                                    void *arg);
-
-    // member variables
-    static PLDHashTableOps ops;
-    PLDHashTable           table;
-    PRBool                 initialized;
-};
-
-#endif // _nsCacheMetaData_h

mozilla/netwerk/cache/src/nsCacheModule.cpp

@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsCacheModule.cpp, released February 23, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *  Patrick C. Beard <beard@netscape.com>
- *  Gordon Sheridan  <gordon@netscape.com>
- */
-
-#include "nsIGenericFactory.h"
-#include "nsCacheService.h"
-#include "nsNetCID.h"
-
-// nsCacheService
-//
-
-static nsModuleComponentInfo gResComponents[] = {
-    {
-        NS_CACHESERVICE_CLASSNAME,
-        NS_CACHESERVICE_CID,
-        NS_CACHESERVICE_CONTRACTID,
-        nsCacheService::Create
-    }
-};
-
-NS_IMPL_NSGETMODULE(cacheservice, gResComponents)

mozilla/netwerk/cache/src/nsCacheRequest.h

@@ -1,171 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsCacheRequest.h, released February 22, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan, 22-February-2001
- */
-
-#ifndef _nsCacheRequest_h_
-#define _nsCacheRequest_h_
-
-#include "nspr.h"
-#include "nsCOMPtr.h"
-#include "nsICache.h"
-#include "nsICacheListener.h"
-#include "nsIEventQueue.h"
-#include "nsCacheSession.h"
-
-
-class nsCacheRequest : public PRCList
-{
-private:
-    friend class nsCacheService;
-    friend class nsCacheEntry;
-
-    nsCacheRequest( nsCString *           key, 
-                    nsICacheListener *    listener,
-                    nsCacheAccessMode     accessRequested,
-                    nsCacheSession *      session)
-        : mKey(key),
-          mInfo(0),
-          mListener(listener),
-          mEventQ(nsnull),
-          mLock(nsnull),
-          mCondVar(nsnull)
-    {
-        PR_INIT_CLIST(this);
-        SetAccessRequested(accessRequested);
-        SetStoragePolicy(session->StoragePolicy());
-        if (session->IsStreamBased())             MarkStreamBased();
-        if (session->WillDoomEntriesIfExpired())  MarkDoomEntriesIfExpired();
-        MarkWaitingForValidation();
-    }
-    
-    ~nsCacheRequest()
-    {
-        delete mKey;
-        if (mLock)    PR_DestroyLock(mLock);
-        if (mCondVar) PR_DestroyCondVar(mCondVar);
-        NS_ASSERTION(PR_CLIST_IS_EMPTY(this), "request still on a list");
-    }
-    
-    /**
-     * Simple Accessors
-     */
-    enum CacheRequestInfo {
-        eStoragePolicyMask         = 0x000000FF,
-        eStreamBasedMask           = 0x00000100,
-        eDoomEntriesIfExpiredMask  = 0x00001000,
-        eWaitingForValidationMask  = 0x00010000,
-        eAccessRequestedMask       = 0xFF000000
-    };
-
-    void SetAccessRequested(nsCacheAccessMode mode)
-    {
-        NS_ASSERTION(mode <= 0xFF, "too many bits in nsCacheAccessMode");
-        mInfo &= ~eAccessRequestedMask;
-        mInfo |= mode << 24;
-    }
-
-    nsCacheAccessMode AccessRequested()
-    {
-        return (nsCacheAccessMode)((mInfo >> 24) & 0xFF);
-    }
-
-    void MarkStreamBased()      { mInfo |=  eStreamBasedMask; }
-    PRBool IsStreamBased()      { return (mInfo & eStreamBasedMask) != 0; }
-
-
-    void   MarkDoomEntriesIfExpired()  { mInfo |=  eDoomEntriesIfExpiredMask; }
-    PRBool WillDoomEntriesIfExpired()  { return (mInfo & eDoomEntriesIfExpiredMask); }
-
-    void SetStoragePolicy(nsCacheStoragePolicy policy)
-    {
-        NS_ASSERTION(policy <= 0xFF, "too many bits in nsCacheStoragePolicy");
-        mInfo &= ~eStoragePolicyMask;  // clear storage policy bits
-        mInfo |= policy;         // or in new bits
-    }
-
-    nsCacheStoragePolicy StoragePolicy()
-    {
-        return (nsCacheStoragePolicy)(mInfo & 0xFF);
-    }
-
-    void   MarkWaitingForValidation() { mInfo |=  eWaitingForValidationMask; }
-    void   DoneWaitingForValidation() { mInfo &= ~eWaitingForValidationMask; }
-    PRBool WaitingForValidation()
-    {
-        return (mInfo & eWaitingForValidationMask) != 0;
-    }
-
-    nsresult
-    WaitForValidation(void)
-    {
-        if (!WaitingForValidation()) {   // flag already cleared
-            MarkWaitingForValidation();  // set up for next time
-            return NS_OK;                // early exit;
-        }
-
-        if (!mLock) {
-            mLock = PR_NewLock();
-            if (!mLock) return NS_ERROR_OUT_OF_MEMORY;
-
-            NS_ASSERTION(!mCondVar,"we have mCondVar, but didn't have mLock?");
-            mCondVar = PR_NewCondVar(mLock);
-            if (!mCondVar) {
-                PR_DestroyLock(mLock);
-                return NS_ERROR_OUT_OF_MEMORY;
-            }
-        }
-        PRStatus status;
-        PR_Lock(mLock);
-        while (WaitingForValidation() && (status == PR_SUCCESS) ) {
-            status = PR_WaitCondVar(mCondVar, PR_INTERVAL_NO_TIMEOUT);
-        }
-        MarkWaitingForValidation();  // set up for next time
-        PR_Unlock(mLock);
-        
-        NS_ASSERTION(status == PR_SUCCESS, "PR_WaitCondVar() returned PR_FAILURE?");
-        if (status == PR_FAILURE)
-            return NS_ERROR_UNEXPECTED;
-
-        return NS_OK;
-    }
-
-    void WakeUp(void) {
-        DoneWaitingForValidation();
-        if (mLock) {
-        PR_Lock(mLock);
-        PR_NotifyCondVar(mCondVar);
-        PR_Unlock(mLock);
-        }
-    }
-
-    /**
-     * Data members
-     */
-    nsCString *                mKey;
-    PRUint32                   mInfo;
-    nsCOMPtr<nsICacheListener> mListener;
-    nsCOMPtr<nsIEventQueue>    mEventQ;
-    PRLock *                   mLock;
-    PRCondVar *                mCondVar;
-};
-
-#endif // _nsCacheRequest_h_

mozilla/netwerk/cache/src/nsCacheService.h

@@ -1,184 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsCacheService.h, released February 10, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan  <gordon@netscape.com>
- *    Patrick C. Beard <beard@netscape.com>
- *    Darin Fisher     <darin@netscape.com>
- */
-
-
-#ifndef _nsCacheService_h_
-#define _nsCacheService_h_
-
-#include "nspr.h"
-#include "nsICacheService.h"
-#include "nsCacheSession.h"
-#include "nsCacheDevice.h"
-#include "nsCacheEntry.h"
-#include "nsIObserver.h"
-#include "nsString.h"
-
-class nsCacheRequest;
-
-
-/******************************************************************************
- *  nsCacheService
- ******************************************************************************/
-
-class nsCacheService : public nsICacheService, public nsIObserver
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSICACHESERVICE
-    NS_DECL_NSIOBSERVER
-    
-    nsCacheService();
-    virtual ~nsCacheService();
-
-    // Define a Create method to be used with a factory:
-    static NS_METHOD
-    Create(nsISupports* outer, const nsIID& iid, void* *result);
-
-
-    /**
-     * Methods called by nsCacheSession
-     */
-    nsresult         OpenCacheEntry(nsCacheSession *           session,
-                                    const char *               key,
-                                    nsCacheAccessMode          accessRequested,
-                                    nsICacheListener *         listener,
-                                    nsICacheEntryDescriptor ** result);
-
-    /**
-     * Methods called by nsCacheEntryDescriptor
-     */
-
-    nsresult         OnDataSizeChange(nsCacheEntry * entry, PRInt32 deltaSize);
-
-    nsresult         ValidateEntry(nsCacheEntry * entry);
-
-    nsresult         GetTransportForEntry(nsCacheEntry *     entry,
-                                          nsCacheAccessMode  mode,
-                                          nsITransport **    result);
-
-    void             CloseDescriptor(nsCacheEntryDescriptor * descriptor);
-
-    nsresult         GetFileForEntry(nsCacheEntry *         entry,
-                                     nsIFile **             result);
-
-    /**
-     * Methods called by any cache classes
-     */
-
-    static
-    nsCacheService * GlobalInstance(void) { return gService; };
-
-    nsresult         DoomEntry(nsCacheEntry * entry);
-
-    nsresult         DoomEntry_Locked(nsCacheEntry * entry);
-
-    /**
-     * Methods called by nsCachePrefObserver
-     */
-    void             SetCacheDevicesEnabled(PRBool  disk, PRBool  memory);
-
-private:
-
-    /**
-     * Internal Methods
-     */
-
-    nsresult         CreateDiskDevice();
-    nsresult         CreateMemoryDevice();
-
-    nsresult         CreateRequest(nsCacheSession *   session,
-                                   const char *       clientKey,
-                                   nsCacheAccessMode  accessRequested,
-                                   nsICacheListener * listener,
-                                   nsCacheRequest **  request);
-
-    nsresult         NotifyListener(nsCacheRequest *          request,
-                                    nsICacheEntryDescriptor * descriptor,
-                                    nsCacheAccessMode         accessGranted,
-                                    nsresult                  error);
-
-    nsresult         ActivateEntry(nsCacheRequest * request, nsCacheEntry ** entry);
-
-    nsCacheDevice *  EnsureEntryHasDevice(nsCacheEntry * entry);
-
-    nsCacheEntry *   SearchCacheDevices(nsCString * key, nsCacheStoragePolicy policy);
-
-    void             DeactivateEntry(nsCacheEntry * entry);
-
-    nsresult         ProcessRequest(nsCacheRequest * request,
-                                    nsICacheEntryDescriptor ** result);
-
-    nsresult         ProcessPendingRequests(nsCacheEntry * entry);
-
-    void             ClearPendingRequests(nsCacheEntry * entry);
-    void             ClearDoomList(void);
-    void             ClearActiveEntries(void);
-
-    static
-    PLDHashOperator PR_CALLBACK  DeactivateAndClearEntry(PLDHashTable *    table,
-                                                         PLDHashEntryHdr * hdr,
-                                                         PRUint32          number,
-                                                         void *            arg);
-#if defined(PR_LOGGING)
-    void LogCacheStatistics();
-#endif
-    /**
-     *  Data Members
-     */
-
-    enum {
-        cacheServiceActiveMask    = 1
-    };
-
-    static nsCacheService * gService;  // there can be only one...
-
-    PRLock*                 mCacheServiceLock;
-    
-    PRBool                  mEnableMemoryDevice;
-    PRBool                  mEnableDiskDevice;
-
-    nsCacheDevice *         mMemoryDevice;
-    nsCacheDevice *         mDiskDevice;
-
-    //    nsCacheClientHashTable  mClientIDs;
-    nsCacheEntryHashTable   mActiveEntries;
-    PRCList                 mDoomedEntries;
-
-    // stats
-    
-    PRUint32                mTotalEntries;
-    PRUint32                mCacheHits;
-    PRUint32                mCacheMisses;
-    PRUint32                mMaxKeyLength;
-    PRUint32                mMaxDataSize;
-    PRUint32                mMaxMetaSize;
-
-    // Unexpected error totals
-    PRUint32                mDeactivateFailures;
-    PRUint32                mDeactivatedUnboundEntries;
-};
-
-
-#endif // _nsCacheService_h_

mozilla/netwerk/cache/src/nsCacheSession.cpp

@@ -1,101 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsCacheSession.h, released February 23, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan <gordon@netscape.com>
- *    Patrick Beard   <beard@netscape.com>
- *    Darin Fisher    <darin@netscape.com>
- */
-
-#include "nsCacheSession.h"
-#include "nsCacheService.h"
-
-
-NS_IMPL_ISUPPORTS1(nsCacheSession, nsICacheSession)
-
-nsCacheSession::nsCacheSession(const char *         clientID,
-                               nsCacheStoragePolicy storagePolicy,
-                               PRBool               streamBased)
-    : mClientID(clientID),
-      mInfo(0)
-{
-  NS_INIT_ISUPPORTS();
-  SetStoragePolicy(storagePolicy);
-
-  if (streamBased) MarkStreamBased();
-  else SetStoragePolicy(nsICache::STORE_IN_MEMORY);
-}
-
-nsCacheSession::~nsCacheSession()
-{
-  /* destructor code */
-    // notify service we are going away?
-}
-
-
-NS_IMETHODIMP nsCacheSession::GetDoomEntriesIfExpired(PRBool *result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    *result = WillDoomEntriesIfExpired();
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP nsCacheSession::SetDoomEntriesIfExpired(PRBool doomEntriesIfExpired)
-{
-    if (doomEntriesIfExpired)  MarkDoomEntriesIfExpired();
-    else                       ClearDoomEntriesIfExpired();
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsCacheSession::OpenCacheEntry(const char *               key, 
-                               nsCacheAccessMode          accessRequested, 
-                               nsICacheEntryDescriptor ** result)
-{
-    nsresult rv;
-    rv =  nsCacheService::GlobalInstance()->OpenCacheEntry(this,
-                                                           key,
-                                                           accessRequested,
-                                                           nsnull, // no listener
-                                                           result);
-    return rv;
-}
-
-
-NS_IMETHODIMP nsCacheSession::AsyncOpenCacheEntry(const char *key,
-                                                  nsCacheAccessMode accessRequested,
-                                                  nsICacheListener *listener)
-{
-    nsresult rv;
-    rv = nsCacheService::GlobalInstance()->OpenCacheEntry(this,
-                                                          key,
-                                                          accessRequested,
-                                                          listener,
-                                                          nsnull); // no result
-
-    if (rv == NS_ERROR_CACHE_WAIT_FOR_VALIDATION) rv = NS_OK;
-    return rv;
-}
-
-NS_IMETHODIMP nsCacheSession::EvictEntries()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}

mozilla/netwerk/cache/src/nsCacheSession.h

@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsCacheSession.h, released February 23, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan <gordon@netscape.com>
- *    Patrick Beard   <beard@netscape.com>
- *    Darin Fisher    <darin@netscape.com>
- */
-
-#ifndef _nsCacheSession_h_
-#define _nsCacheSession_h_
-
-#include "nspr.h"
-#include "nsError.h"
-#include "nsICacheSession.h"
-#include "nsString.h"
-
-class nsCacheSession : public nsICacheSession
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSICACHESESSION
-    
-    nsCacheSession(const char * clientID, nsCacheStoragePolicy storagePolicy, PRBool streamBased);
-    virtual ~nsCacheSession();
-    
-    nsCString *           ClientID()      { return &mClientID; }
-
-    enum SessionInfo {
-        eStoragePolicyMask        = 0x000000FF,
-        eStreamBasedMask          = 0x00000100,
-        eDoomEntriesIfExpiredMask = 0x00001000
-    };
-
-    void   MarkStreamBased()  { mInfo |=  eStreamBasedMask; }
-    void   ClearStreamBased() { mInfo &= ~eStreamBasedMask; }
-    PRBool IsStreamBased()    { return (mInfo & eStreamBasedMask) != 0; }
-
-    void   MarkDoomEntriesIfExpired()  { mInfo |=  eDoomEntriesIfExpiredMask; }
-    void   ClearDoomEntriesIfExpired() { mInfo &= ~eDoomEntriesIfExpiredMask; }
-    PRBool WillDoomEntriesIfExpired()  { return (mInfo & eDoomEntriesIfExpiredMask); }
-
-    nsCacheStoragePolicy  StoragePolicy()
-    {
-        return (nsCacheStoragePolicy)(mInfo & eStoragePolicyMask);
-    }
-
-    void SetStoragePolicy(nsCacheStoragePolicy policy)
-    {
-        NS_ASSERTION(policy <= 0xFF, "too many bits in nsCacheStoragePolicy");
-        mInfo &= ~eStoragePolicyMask; // clear storage policy bits
-        mInfo |= policy;
-    }
-
-private:
-    nsCString               mClientID;
-    PRUint32                mInfo;
-};
-
-#endif // _nsCacheSession_h_

mozilla/netwerk/cache/src/nsDiskCache.h

@@ -1,199 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsCacheDevice.h, released March 9, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Patrick Beard   <beard@netscape.com>
- *    Gordon Sheridan <gordon@netscape.com>
- */
-
-
-#ifndef _nsDiskCache_h_
-#define _nsDiskCache_h_
-
-#include "prtypes.h"
-#include "prnetdb.h"
-#include "nsDebug.h"
-
-class nsDiskCacheRecord {
-    enum {
-        eEvictionRankMask       = 0xFF000000,
-        eLocationSelectorMask   = 0x00C00000,
-
-        eExtraBlocksMask        = 0x00300000,
-        eBlockNumberMask        = 0x000FFFFF,
-
-        eFileReservedMask       = 0x003F0000,
-        eFileGenerationMask     = 0x0000FFFF
-    };
-
-public:
-    nsDiskCacheRecord()
-        :   mHashNumber(0), mEvictionRank(0), mLocation(0), mUnused(0)
-    {
-    }
-    
-    PRUint32   HashNumber() const
-    {
-        return mHashNumber;
-    }
-    
-    void       SetHashNumber(PRUint32 hashNumber)
-    {
-        mHashNumber = hashNumber;
-    }
-
-    PRUint32   EvictionRank() const
-    {
-        return mEvictionRank;
-    }
-
-    void       SetEvictionRank(PRUint32 rank)
-    {
-        mEvictionRank = rank;
-    }
-
-    PRUint32   LocationSelector() const
-    {
-        return (PRUint32)(mLocation & eLocationSelectorMask) >> 22;
-    }
-
-    void       SetLocationSelector(PRUint32 selector)
-    {
-        mLocation &= ~eLocationSelectorMask; // clear location selector bits
-        mLocation |= (selector & eLocationSelectorMask) << 22;
-    }
-
-    PRUint32   BlockCount() const
-    {
-        return (PRUint32)((mLocation & eExtraBlocksMask) >> 20) + 1;
-    }
-
-    void       SetBlockCount(PRUint32 count)
-    {
-        NS_ASSERTION( (count>=1) && (count<=4),"invalid block count");
-        count = --count;
-        mLocation &= ~eExtraBlocksMask; // clear extra blocks bits
-        mLocation |= (count & eExtraBlocksMask) << 20;
-    }
-
-    PRUint32   BlockNumber() const
-    {
-        return (mLocation & eBlockNumberMask);
-    }
-
-    void       SetBlockNumber(PRUint32  blockNumber)
-    {
-        mLocation &= ~eBlockNumberMask;  // clear block number bits
-        mLocation |= blockNumber & eBlockNumberMask;
-    }
-
-    PRUint16   FileGeneration() const
-    {
-        return (mLocation & eFileGenerationMask);
-    }
-
-    void       SetFileGeneration(PRUint16 generation)
-    {
-        mLocation &= ~eFileGenerationMask;  // clear file generation bits
-        mLocation |= generation & eFileGenerationMask;
-    }
-
-    void        Swap()
-    {
-        mHashNumber = ::PR_htonl(mHashNumber);
-        mEvictionRank = ::PR_htonl(mEvictionRank);
-        mLocation = ::PR_htonl(mLocation);
-        mUnused = ::PR_htonl(mUnused);
-    }
-    
-    void        Unswap()
-    {
-        mHashNumber = ::PR_ntohl(mHashNumber);
-        mEvictionRank = ::PR_ntohl(mEvictionRank);
-        mLocation = ::PR_ntohl(mLocation);
-        mUnused = ::PR_ntohl(mUnused);
-    }
-
-private:
-    PRUint32    mHashNumber;
-    PRUint32    mEvictionRank;
-    PRUint32    mLocation;
-    PRUint32    mUnused;
-};
-
-
-/*
-
-Cache Extent Table
-
-
-1111 1111 0000 0000 0000 0000 0000 0000 : eEvictionRankMask
-0000 0000 1100 0000 0000 0000 0000 0000 : eLocationSelectorMask   (0-3)
-0000 0000 0011 0000 0000 0000 0000 0000 : number of extra contiguous blocks 1-4
-0000 0000 0000 1111 1111 1111 1111 1111 : block#  0-1,048,575
-
-0000 0000 0011 1111 0000 0000 0000 0000 : eFileReservedMask
-0000 0000 0000 0000 1111 1111 1111 1111 : eFileGenerationMask
-
-0  file
-1   256 bytes
-2  1024
-3  4096
-
-
-	log2 of seconds = 5 bits
-
-log2	minutes	hours	days   years
-00000	   1
-00001	   2
-00010	   4
-00011	   8
-00100	  16
-00101	  32
-00110	  64	  1
-00111	 128	  2
-01000	 256	  4
-01001	 512	  8.5
-01010	1024	 17
-01011	2048	 34
-01100		 68
-01101		136
-01110		273	 11
-01111			 22
-10000			 45.5
-10001			 91
-10010			182
-10011			364	1
-10100				2
-10101				3
-10110				4
-10111
-11000
-11001
-11010
-11011
-11100
-11101
-11110
-11111
-
-*/
-
-
-#endif // _nsDiskCache_h_

mozilla/netwerk/cache/src/nsDiskCacheDevice.h

@@ -1,121 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsDiskCacheDevice.h, released February 20, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan <gordon@netscape.com>
- *    Patrick C. Beard <beard@netscape.com>
- */
-
-#ifndef _nsDiskCacheDevice_h_
-#define _nsDiskCacheDevice_h_
-
-#include "nsCacheDevice.h"
-#include "nsDiskCacheEntry.h"
-
-#include "nsILocalFile.h"
-#include "nsIObserver.h"
-
-class nsDiskCacheEntry;
-class nsDiskCacheMap;
-class nsDiskCacheRecord;
-
-class nsISupportsArray;
-class nsIInputStream;
-class nsIOutputStream;
-class nsANSIFileStream;
-
-class nsDiskCacheDevice : public nsCacheDevice {
-public:
-    nsDiskCacheDevice();
-    virtual ~nsDiskCacheDevice();
-
-    static nsresult         Create(nsCacheDevice **result);
-
-    virtual nsresult        Init();
-    virtual nsresult        Shutdown();
-
-    virtual const char *    GetDeviceID(void);
-    virtual nsCacheEntry *  FindEntry(nsCString * key);
-    virtual nsresult        DeactivateEntry(nsCacheEntry * entry);
-    virtual nsresult        BindEntry(nsCacheEntry * entry);
-    virtual void            DoomEntry( nsCacheEntry * entry );
-
-    virtual nsresult        GetTransportForEntry(nsCacheEntry * entry,
-                                          nsCacheAccessMode mode,
-                                          nsITransport ** result);
-
-    virtual nsresult        GetFileForEntry(nsCacheEntry *    entry,
-                                            nsIFile **        result);
-
-    virtual nsresult        OnDataSizeChange(nsCacheEntry * entry, PRInt32 deltaSize);
-    
-    virtual nsresult        Visit(nsICacheVisitor * visitor);
-
-    virtual nsresult        EvictEntries(const char * clientID);
-
-/* private: */
-    void                    setPrefsObserver(nsIObserver* observer);
-    void                    getPrefsObserver(nsIObserver ** result);
-    void                    setCacheDirectory(nsILocalFile* directory);
-    void                    setCacheCapacity(PRUint32 capacity);
-    PRUint32                getCacheCapacity();
-    PRUint32                getCacheSize();
-    PRUint32                getEntryCount();
-
-    nsresult getFileForHashNumber(PLDHashNumber hashNumber, PRBool meta, PRUint32 generation, nsIFile ** result);
-    nsresult getFileForKey(const char* key, PRBool meta, PRUint32 generation, nsIFile ** result);
-    nsresult getFileForDiskCacheEntry(nsDiskCacheEntry * diskEntry, PRBool meta, nsIFile ** result);
-
-    static nsresult getTransportForFile(nsIFile* file, nsCacheAccessMode mode, nsITransport ** result);
-    static nsresult openInputStream(nsIFile* file, nsIInputStream ** result);
-    static nsresult openOutputStream(nsIFile* file, nsIOutputStream ** result);
-
-    nsresult visitEntries(nsICacheVisitor * visitory);
-    
-    nsresult readDiskCacheEntry(const char * key, nsDiskCacheEntry ** diskEntry);
-
-    nsresult updateDiskCacheEntries();
-    nsresult updateDiskCacheEntry(nsDiskCacheEntry * diskEntry);
-    nsresult deleteDiskCacheEntry(nsDiskCacheEntry * diskEntry);
-    
-    nsresult scavengeDiskCacheEntries(nsDiskCacheEntry * diskEntry);
-
-    nsresult scanDiskCacheEntries(nsISupportsArray ** result);
-    nsresult evictDiskCacheEntries();
-
-    nsresult clobberDiskCache();
-    
-    nsresult openCacheMap();
-    nsresult readCacheMap();
-    nsresult writeCacheMap();
-
-    nsresult updateCacheMap(nsDiskCacheEntry * diskEntry);
-    nsresult evictDiskCacheRecord(nsDiskCacheRecord * record);
-    
-private:
-    PRBool                      mInitialized;
-    nsCOMPtr<nsIObserver>       mPrefsObserver;
-    nsCOMPtr<nsILocalFile>      mCacheDirectory;
-    nsDiskCacheEntryHashTable   mBoundEntries;
-    PRUint32                    mCacheCapacity;
-    nsDiskCacheMap*             mCacheMap;
-    nsANSIFileStream*           mCacheStream;
-};
-
-#endif // _nsDiskCacheDevice_h_

mozilla/netwerk/cache/src/nsDiskCacheEntry.cpp

@@ -1,213 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsMemoryCacheDevice.cpp, released February 22, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Patrick C. Beard <beard@netscape.com>
- */
-
-#include <limits.h>
-
-#include "nsDiskCacheEntry.h"
-
-NS_IMPL_ISUPPORTS0(nsDiskCacheEntry);
-
-PLDHashNumber
-nsDiskCacheEntry::Hash(const char* key)
-{
-    PLDHashNumber h = 0;
-    for (const PRUint8* s = (PRUint8*) key; *s != '\0'; ++s)
-        h = (h >> (PL_DHASH_BITS - 4)) ^ (h << 4) ^ *s;
-    return (h == 0 ? ULONG_MAX : h);
-}
-
-/******************************************************************************
- *  nsCacheEntryHashTable
- *****************************************************************************/
-
-PLDHashTableOps nsDiskCacheEntryHashTable::ops =
-{
-    PL_DHashAllocTable,
-    PL_DHashFreeTable,
-    GetKey,
-    HashKey,
-    MatchEntry,
-    MoveEntry,
-    ClearEntry,
-    Finalize
-};
-
-nsDiskCacheEntryHashTable::nsDiskCacheEntryHashTable()
-    : initialized(PR_FALSE)
-{
-}
-
-
-nsDiskCacheEntryHashTable::~nsDiskCacheEntryHashTable()
-{
-    if (initialized)
-        PL_DHashTableFinish(&table);
-}
-
-
-nsresult
-nsDiskCacheEntryHashTable::Init()
-{
-    nsresult rv = NS_OK;
-    initialized = PL_DHashTableInit(&table, &ops, nsnull,
-                                    sizeof(HashTableEntry), 512);
-
-    if (!initialized) rv = NS_ERROR_OUT_OF_MEMORY;
-    
-    return rv;
-}
-
-
-nsDiskCacheEntry *
-nsDiskCacheEntryHashTable::GetEntry(const char * key)
-{
-    return GetEntry(nsDiskCacheEntry::Hash(key));
-}
-
-
-nsDiskCacheEntry *
-nsDiskCacheEntryHashTable::GetEntry(PLDHashNumber key)
-{
-    nsDiskCacheEntry * result = nsnull;
-    NS_ASSERTION(initialized, "nsDiskCacheEntryHashTable not initialized");
-    HashTableEntry * hashEntry;
-    hashEntry = (HashTableEntry*) PL_DHashTableOperate(&table, (void*) key, PL_DHASH_LOOKUP);
-    if (PL_DHASH_ENTRY_IS_BUSY(hashEntry)) {
-        result = hashEntry->mDiskCacheEntry;
-    }
-    return result;
-}
-
-
-nsresult
-nsDiskCacheEntryHashTable::AddEntry(nsDiskCacheEntry * entry)
-{
-    NS_ENSURE_ARG_POINTER(entry);
-    NS_ASSERTION(initialized, "nsDiskCacheEntryHashTable not initialized");
-
-    HashTableEntry * hashEntry;
-    hashEntry = (HashTableEntry *) PL_DHashTableOperate(&table,
-                                                        (void*) entry->getHashNumber(),
-                                                        PL_DHASH_ADD);
-    if (!hashEntry) return NS_ERROR_OUT_OF_MEMORY;
-    
-    NS_ADDREF(hashEntry->mDiskCacheEntry = entry);
-
-    return NS_OK;
-}
-
-
-void
-nsDiskCacheEntryHashTable::RemoveEntry(nsDiskCacheEntry * entry)
-{
-    NS_ASSERTION(initialized, "nsDiskCacheEntryHashTable not initialized");
-    NS_ASSERTION(entry, "### cacheEntry == nsnull");
-
-    (void) PL_DHashTableOperate(&table, (void*) entry->getHashNumber(), PL_DHASH_REMOVE);
-}
-
-
-void
-nsDiskCacheEntryHashTable::VisitEntries(Visitor *visitor)
-{
-    PL_DHashTableEnumerate(&table, VisitEntry, visitor);
-}
-
-
-PLDHashOperator PR_CALLBACK
-nsDiskCacheEntryHashTable::VisitEntry(PLDHashTable *        table,
-                                      PLDHashEntryHdr *     header,
-                                      PRUint32              number,
-                                      void *                arg)
-{
-    HashTableEntry* hashEntry = (HashTableEntry *) header;
-    Visitor *visitor = (Visitor*) arg;
-    return (visitor->VisitEntry(hashEntry->mDiskCacheEntry) ? PL_DHASH_NEXT : PL_DHASH_STOP);
-}
-
-/**
- *  hash table operation callback functions
- */
-const void * PR_CALLBACK
-nsDiskCacheEntryHashTable::GetKey(PLDHashTable * /*table*/, PLDHashEntryHdr * header)
-{
-    HashTableEntry * hashEntry = (HashTableEntry *) header;
-    return (void*) hashEntry->mDiskCacheEntry->getHashNumber();
-}
-
-
-PLDHashNumber PR_CALLBACK
-nsDiskCacheEntryHashTable::HashKey( PLDHashTable *table, const void *key)
-{
-    return (PLDHashNumber) key;
-}
-
-PRBool PR_CALLBACK
-nsDiskCacheEntryHashTable::MatchEntry(PLDHashTable *             /* table */,
-                                      const PLDHashEntryHdr *       header,
-                                      const void *                  key)
-{
-    HashTableEntry * hashEntry = (HashTableEntry *) header;
-    return (hashEntry->mDiskCacheEntry->getHashNumber() == (PLDHashNumber) key);
-}
-
-void PR_CALLBACK
-nsDiskCacheEntryHashTable::MoveEntry(PLDHashTable *              /* table */,
-                                 const PLDHashEntryHdr *            fromHeader,
-                                 PLDHashEntryHdr       *            toHeader)
-{
-    HashTableEntry * fromEntry = (HashTableEntry *) fromHeader;
-    HashTableEntry * toEntry = (HashTableEntry *) toHeader;
-    toEntry->keyHash = fromEntry->keyHash;
-    toEntry->mDiskCacheEntry = fromEntry->mDiskCacheEntry;
-    fromEntry->mDiskCacheEntry = nsnull;
-}
-
-
-void PR_CALLBACK
-nsDiskCacheEntryHashTable::ClearEntry(PLDHashTable *             /* table */,
-                                      PLDHashEntryHdr *             header)
-{
-    HashTableEntry* hashEntry = (HashTableEntry *) header;
-    hashEntry->keyHash = 0;
-    NS_IF_RELEASE(hashEntry->mDiskCacheEntry);
-}
-
-
-void PR_CALLBACK
-nsDiskCacheEntryHashTable::Finalize(PLDHashTable * table)
-{
-    (void) PL_DHashTableEnumerate(table, FreeCacheEntries, nsnull);
-}
-
-
-PLDHashOperator PR_CALLBACK
-nsDiskCacheEntryHashTable::FreeCacheEntries(PLDHashTable *             /* table */,
-                                            PLDHashEntryHdr *             header,
-                                            PRUint32                      number,
-                                            void *                        arg)
-{
-    HashTableEntry *entry = (HashTableEntry *) header;
-    NS_IF_RELEASE(entry->mDiskCacheEntry);
-    return PL_DHASH_NEXT;
-}

mozilla/netwerk/cache/src/nsDiskCacheEntry.h

@@ -1,164 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsMemoryCacheDevice.cpp, released February 22, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Patrick C. Beard <beard@netscape.com>
- */
-
-#ifndef _nsDiskCacheEntry_h_
-#define _nsDiskCacheEntry_h_
-
-#include "nspr.h"
-#include "pldhash.h"
-
-#include "nsISupports.h"
-#include "nsCacheEntry.h"
-
-#ifdef MOZ_NEW_CACHE_REUSE_TRANSPORTS
-#include "nsITransport.h"
-#endif
-
-class nsDiskCacheEntry : public nsISupports, public PRCList {
-public:
-    NS_DECL_ISUPPORTS
-
-    nsDiskCacheEntry(nsCacheEntry* entry)
-        :   mCacheEntry(entry),
-            mGeneration(0)
-    {
-        NS_INIT_ISUPPORTS();
-        PR_INIT_CLIST(this);
-        mHashNumber = Hash(entry->Key()->get());
-    }
-
-    virtual ~nsDiskCacheEntry()
-    {
-        PR_REMOVE_LINK(this);
-    }
-
-#ifdef MOZ_NEW_CACHE_REUSE_TRANSPORTS
-    /**
-     * Maps a cache access mode to a cached nsITransport for that access
-     * mode. We keep these cached to avoid repeated trips to the
-     * file transport service.
-     */
-    nsCOMPtr<nsITransport>& getTransport(nsCacheAccessMode mode)
-    {
-        return mTransports[mode - 1];
-    }
-#endif
-    
-    nsCacheEntry* getCacheEntry()
-    {
-        return mCacheEntry;
-    }
-    
-    PRUint32 getGeneration()
-    {
-        return mGeneration;
-    }
-    
-    void setGeneration(PRUint32 generation)
-    {
-        mGeneration = generation;
-    }
-    
-    PLDHashNumber getHashNumber()
-    {
-        return mHashNumber;
-    }
-    
-    nsrefcnt getRefCount()
-    {
-        return mRefCnt;
-    }
-    
-    static PLDHashNumber Hash(const char* key);
-    
-private:
-#ifdef MOZ_NEW_CACHE_REUSE_TRANSPORTS
-    nsCOMPtr<nsITransport>  mTransports[3];
-#endif
-    nsCacheEntry*           mCacheEntry;
-    PRUint32                mGeneration;
-    PLDHashNumber           mHashNumber;
-};
-
-class nsDiskCacheEntryHashTable {
-public:
-    nsDiskCacheEntryHashTable();
-    ~nsDiskCacheEntryHashTable();
-
-    nsresult                Init();
-
-    nsDiskCacheEntry *      GetEntry(const char *               key);
-    nsDiskCacheEntry *      GetEntry(PLDHashNumber              key);
-    nsresult                AddEntry(nsDiskCacheEntry *         entry);
-    void                    RemoveEntry(nsDiskCacheEntry *      entry);
-    
-    class Visitor {
-    public:
-        virtual PRBool      VisitEntry(nsDiskCacheEntry *       entry) = 0;
-    };
-    
-    void                    VisitEntries(Visitor *              visitor);
-    
-private:
-    struct HashTableEntry : PLDHashEntryHdr {
-        nsDiskCacheEntry *  mDiskCacheEntry;                    // STRONG ref?
-    };
-
-    // PLDHashTable operation callbacks
-    static const void *     PR_CALLBACK GetKey(PLDHashTable *               table,
-                                               PLDHashEntryHdr *            entry);
-
-    static PLDHashNumber    PR_CALLBACK HashKey(PLDHashTable *              table,
-                                                const void *                key);
-
-    static PRBool           PR_CALLBACK MatchEntry(PLDHashTable *           table,
-                                                   const PLDHashEntryHdr *  entry,
-                                                   const void *             key);
-
-    static void             PR_CALLBACK MoveEntry(PLDHashTable *            table,
-                                                  const PLDHashEntryHdr *   from,
-                                                  PLDHashEntryHdr       *   to);
-
-    static void             PR_CALLBACK ClearEntry(PLDHashTable *           table,
-                                                   PLDHashEntryHdr *        entry);
-
-    static void             PR_CALLBACK Finalize(PLDHashTable *table);
-
-    static
-    PLDHashOperator         PR_CALLBACK FreeCacheEntries(PLDHashTable *     table,
-                                                         PLDHashEntryHdr *  hdr,
-                                                         PRUint32           number,
-                                                         void *             arg);
-    static
-    PLDHashOperator         PR_CALLBACK VisitEntry(PLDHashTable *           table,
-                                                   PLDHashEntryHdr *        hdr,
-                                                   PRUint32                 number,
-                                                   void *                   arg);
-                                     
-    // member variables
-    static PLDHashTableOps ops;
-    PLDHashTable           table;
-    PRBool                 initialized;
-};
-
-#endif /* _nsDiskCacheEntry_h_ */

mozilla/netwerk/cache/src/nsDiskCacheMap.cpp

@@ -1,263 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsDiskCacheMap.cpp, released March 23, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Patrick C. Beard <beard@netscape.com>
- */
-
-#include "nsDiskCacheMap.h"
-#include "nsIFileStreams.h"
-
-#include <string.h>
-
-nsDiskCacheMap::nsDiskCacheMap()
-{
-}
-
-nsDiskCacheMap::~nsDiskCacheMap()
-{
-}
-
-void nsDiskCacheMap::Reset()
-{
-    mHeader.mDataSize = 0;
-    mHeader.mEntryCount = 0;
-    mHeader.mIsDirty = PR_TRUE;
-
-    for (PRUint32 b = 0; b < kBucketsPerTable; ++b) {
-        nsDiskCacheBucket& bucket = mBuckets[b];
-        ::memset(&bucket, 0, sizeof(nsDiskCacheBucket));
-    }
-}
-
-nsDiskCacheRecord* nsDiskCacheMap::GetRecord(PRUint32 hashNumber)
-{
-    nsDiskCacheBucket& bucket = mBuckets[GetBucketIndex(hashNumber)];
-    nsDiskCacheRecord* oldestRecord = &bucket.mRecords[0];
-
-    for (int r = 0; r < kRecordsPerBucket; ++r) {
-        nsDiskCacheRecord* record = &bucket.mRecords[r];
-        if (record->HashNumber() == 0 || record->HashNumber() == hashNumber)
-            return record;
-        if (record->EvictionRank() < oldestRecord->EvictionRank())
-            oldestRecord = record;
-    }
-    // if we don't find an empty record, return the oldest record for eviction.
-    return oldestRecord;
-}
-
-
-void nsDiskCacheMap::DeleteRecord(nsDiskCacheRecord* deletedRecord)
-{
-    PRUint32 hashNumber = deletedRecord->HashNumber();
-    nsDiskCacheBucket& bucket = mBuckets[GetBucketIndex(hashNumber)];
-    NS_ASSERTION(deletedRecord >= &bucket.mRecords[0] &&
-                 deletedRecord < &bucket.mRecords[kRecordsPerBucket],
-                 "invalid record to delete.");
-    nsDiskCacheRecord* limit = &bucket.mRecords[kRecordsPerBucket];
-    nsDiskCacheRecord* lastRecord = nsnull;
-    // XXX use binary search to find the end, much quicker.
-    // find the last record, to fill in the deleted record.
-    for (nsDiskCacheRecord* record = deletedRecord + 1; record < limit; ++record) {
-        if (record->HashNumber() == 0) {
-            lastRecord = record - 1;
-            break;
-        }
-    }
-    // copy the last record, to the newly deleted record.
-    if (lastRecord && deletedRecord != lastRecord) {
-        *deletedRecord = *lastRecord;
-        deletedRecord = lastRecord;
-    }
-    // mark record as free.
-    deletedRecord->SetHashNumber(0);
-    // reduce the number of entries.
-    mHeader.mEntryCount--;
-}
-
-
-nsresult nsDiskCacheMap::Read(nsIInputStream* input)
-{
-    nsresult rv;
-    PRUint32 count;
-
-    // seek to beginning of the file.
-    nsCOMPtr<nsISeekableStream> seekable = do_QueryInterface(input, &rv);
-    if (NS_FAILED(rv)) return rv;
-    rv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, 0);
-    if (NS_FAILED(rv)) return rv;
-
-    // read the header.
-    nsDiskCacheHeader header;
-    rv = input->Read((char*)&header, sizeof(header), &count);
-    if (count != sizeof(header)) return NS_ERROR_FAILURE;
-    if (NS_FAILED(rv)) return rv;
-    header.Unswap();
-    
-    // validate the version.
-    if (header.mVersion != nsDiskCacheHeader::kCurrentVersion) return NS_ERROR_FAILURE;
-    mHeader = header;
-
-    // seek to beginning of first bucket.
-    rv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, sizeof(nsDiskCacheBucket));
-    if (NS_FAILED(rv)) return rv;
-
-    // read the buckets.
-    rv = input->Read((char*)&mBuckets, sizeof(mBuckets), &count);
-    if (count != sizeof(mBuckets)) return NS_ERROR_FAILURE;
-    if (NS_FAILED(rv)) return rv;
-    
-    // unswap all of the active records.
-    for (int b = 0; b < kBucketsPerTable; ++b) {
-        nsDiskCacheBucket& bucket = mBuckets[b];
-        for (int r = 0; r < kRecordsPerBucket; ++r) {
-            nsDiskCacheRecord* record = &bucket.mRecords[r];
-            if (record->HashNumber() == 0)
-                break;
-            record->Unswap();
-        }
-    }
-    
-    return NS_OK;
-}
-
-nsresult nsDiskCacheMap::Write(nsIOutputStream* output)
-{
-    nsresult rv;
-    PRUint32 count;
-
-    // seek to beginning of the file.
-    nsCOMPtr<nsISeekableStream> seekable = do_QueryInterface(output, &rv);
-    if (NS_FAILED(rv)) return rv;
-    rv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, 0);
-    if (NS_FAILED(rv)) return rv;
-    
-    // write the header.
-    nsDiskCacheHeader header = mHeader;
-    header.Swap();
-    rv = output->Write((char*)&header, sizeof(header), &count);
-    if (count != sizeof(header)) return NS_ERROR_FAILURE;
-    if (NS_FAILED(rv)) return rv;
-    
-    // pad the rest of the header to sizeof(nsDiskCacheBucket).
-    char padding[sizeof(nsDiskCacheBucket) - sizeof(nsDiskCacheHeader)];
-    ::memset(padding, 0, sizeof(padding));
-    rv = output->Write(padding, sizeof(padding), &count);
-    if (count != sizeof(padding)) return NS_ERROR_FAILURE;
-    if (NS_FAILED(rv)) return rv;
-
-    // swap all of the active records.
-    {
-        for (int b = 0; b < kBucketsPerTable; ++b) {
-            nsDiskCacheBucket& bucket = mBuckets[b];
-            for (int r = 0; r < kRecordsPerBucket; ++r) {
-                nsDiskCacheRecord* record = &bucket.mRecords[r];
-                if (record->HashNumber() == 0)
-                    break;
-                record->Swap();
-            }
-        }
-    }
-        
-    // write the buckets.
-    rv = output->Write((char*)&mBuckets, sizeof(mBuckets), &count);
-    output->Flush();
-
-    // unswap all of the active records.
-    {
-        for (int b = 0; b < kBucketsPerTable; ++b) {
-            nsDiskCacheBucket& bucket = mBuckets[b];
-            for (int r = 0; r < kRecordsPerBucket; ++r) {
-                nsDiskCacheRecord* record = &bucket.mRecords[r];
-                if (record->HashNumber() == 0)
-                    break;
-                record->Unswap();
-            }
-        }
-    }
-
-    if (count != sizeof(mBuckets)) return NS_ERROR_FAILURE;
-    return rv;
-}
-
-nsresult nsDiskCacheMap::WriteBucket(nsIOutputStream* output, PRUint32 index)
-{
-    nsresult rv;
-    
-    // can only do this if the stream is seekable.
-    nsCOMPtr<nsISeekableStream> seekable = do_QueryInterface(output, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    // seek to the offset of this bucket, (index + 1) to skip the header.
-    rv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, (index + 1) * sizeof(nsDiskCacheBucket));
-    if (NS_FAILED(rv)) return rv;
-    
-    nsDiskCacheBucket& bucket = mBuckets[index];
-    
-    // swap all of the active records.
-    {
-        for (int r = 0; r < kRecordsPerBucket; ++r) {
-            nsDiskCacheRecord* record = &bucket.mRecords[r];
-            if (record->HashNumber() == 0)
-                break;
-            record->Swap();
-        }
-    }
-
-    PRUint32 count;
-    rv = output->Write((char*)&bucket, sizeof(nsDiskCacheBucket), &count);
-    output->Flush();
-
-    // unswap all of the active records.
-    {
-        for (int r = 0; r < kRecordsPerBucket; ++r) {
-            nsDiskCacheRecord* record = &bucket.mRecords[r];
-            if (record->HashNumber() == 0)
-                break;
-            record->Unswap();
-        }
-    }
-
-    NS_ASSERTION(count == sizeof(nsDiskCacheBucket), "nsDiskCacheMap::WriteBucket failed");
-    if (count != sizeof(nsDiskCacheBucket)) return NS_ERROR_FAILURE;
-    
-    return rv;
-}
-
-nsresult nsDiskCacheMap::WriteHeader(nsIOutputStream* output)
-{
-    nsresult rv;
-    PRUint32 count;
-    
-    // can only do this if the stream is seekable.
-    nsCOMPtr<nsISeekableStream> seekable = do_QueryInterface(output, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, 0);
-    if (NS_FAILED(rv)) return rv;
-
-    // write the header.
-    nsDiskCacheHeader header = mHeader;
-    header.Swap();
-    rv = output->Write((char*)&header, sizeof(header), &count);
-    output->Flush();
-    if (count != sizeof(header)) return NS_ERROR_FAILURE;
-    
-    return rv;
-}

mozilla/netwerk/cache/src/nsDiskCacheMap.h

@@ -1,117 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsDiskCacheMap.h, released March 23, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Patrick C. Beard <beard@netscape.com>
- */
-
-#ifndef _nsDiskCacheMap_h_
-
-#include "nsDiskCache.h"
-#include "nsError.h"
-
-class nsIInputStream;
-class nsIOutputStream;
-
-struct nsDiskCacheHeader {
-    enum { kCurrentVersion = 0x00010002 };
-
-    PRUint32    mVersion;                           // cache version.
-    PRUint32    mDataSize;                          // size of cache in bytes.
-    PRUint32    mEntryCount;                        // number of entries stored in cache.
-    PRUint32    mIsDirty;                           // dirty flag.
-    // XXX need a bitmap?
-    
-    nsDiskCacheHeader()
-        :   mVersion(kCurrentVersion), mDataSize(0),
-            mEntryCount(0), mIsDirty(PR_TRUE)
-    {
-    }
-
-    void        Swap()
-    {
-        mVersion = ::PR_htonl(mVersion);
-        mDataSize = ::PR_htonl(mDataSize);
-        mEntryCount = ::PR_htonl(mEntryCount);
-        mIsDirty = ::PR_htonl(mIsDirty);
-    }
-    
-    void        Unswap()
-    {
-        mVersion = ::PR_ntohl(mVersion);
-        mDataSize = ::PR_ntohl(mDataSize);
-        mEntryCount = ::PR_ntohl(mEntryCount);
-        mIsDirty = ::PR_ntohl(mIsDirty);
-    }
-};
-
-// XXX initial capacity, enough for 8192 distinct entries.
-class nsDiskCacheMap {
-public:
-    nsDiskCacheMap();
-    ~nsDiskCacheMap();
-
-    void Reset();
-    
-    PRUint32& DataSize() { return mHeader.mDataSize; }
-    PRUint32& EntryCount() { return mHeader.mEntryCount; }
-    PRUint32& IsDirty() { return mHeader.mIsDirty; }
-    
-    nsDiskCacheRecord* GetRecord(PRUint32 hashNumber);
-    void DeleteRecord(nsDiskCacheRecord* record);
-    
-    enum {
-        kRecordsPerBucket = 256,
-        kBucketsPerTable = (1 << 5)                 // must be a power of 2!
-    };
-    
-    nsDiskCacheRecord* GetBucket(PRUint32 index)
-    {
-        return mBuckets[index].mRecords;
-    }
-    
-    PRUint32 GetBucketIndex(PRUint32 hashNumber)
-    {
-        return (hashNumber & (kBucketsPerTable - 1));
-    }
-    
-    PRUint32 GetBucketIndex(nsDiskCacheRecord* record)
-    {
-        return GetBucketIndex(record->HashNumber());
-    }
-    
-    nsresult Read(nsIInputStream* input);
-    nsresult Write(nsIOutputStream* output);
-    
-    nsresult ReadBucket(nsIInputStream* input, PRUint32 index);
-    nsresult WriteBucket(nsIOutputStream* output, PRUint32 index);
-    
-    nsresult ReadHeader(nsIInputStream* input);
-    nsresult WriteHeader(nsIOutputStream* output);
-    
-private:
-    struct nsDiskCacheBucket {
-        nsDiskCacheRecord   mRecords[kRecordsPerBucket];
-    };
-    
-    nsDiskCacheHeader       mHeader;
-    nsDiskCacheBucket       mBuckets[kBucketsPerTable];
-};
-
-#endif // _nsDiskCacheMap_h_

mozilla/netwerk/cache/src/nsMemoryCacheDevice.cpp

@@ -1,442 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsMemoryCacheDevice.cpp, released February 22, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan, <gordon@netscape.com>
- *    Patrick C. Beard <beard@netscape.com>
- */
-
-#include "nsMemoryCacheDevice.h"
-#include "nsCacheService.h"
-#include "nsICacheService.h"
-#include "nsIComponentManager.h"
-#include "nsNetCID.h"
-#include "nsIObserverService.h"
-#include "nsIPref.h"
-#include "nsICacheVisitor.h"
-#include "nsITransport.h"
-#include "signal.h"
-
-
-static NS_DEFINE_CID(kStorageTransportCID, NS_STORAGETRANSPORT_CID);
-
-const char *gMemoryDeviceID      = "memory";
-const char *gMemoryCacheSizePref = "browser.cache.memory_cache_size";
-
-
-nsMemoryCacheDevice::nsMemoryCacheDevice()
-    : mHardLimit(0),
-      mSoftLimit(0),
-      mTotalSize(0),
-      mInactiveSize(0),
-      mEntryCount(0),
-      mMaxEntryCount(0)
-{
-    PR_INIT_CLIST(&mEvictionList);
-}
-
-nsMemoryCacheDevice::~nsMemoryCacheDevice()
-{
-#if DEBUG
-    printf("### starting ~nsMemoryCacheDevice()\n");
-#endif
-    // XXX dealloc all memory
-    nsresult rv;
-    NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-        prefs->UnregisterCallback(gMemoryCacheSizePref, MemoryCacheSizeChanged, this);
-    }
-}
-
-
-int PR_CALLBACK
-nsMemoryCacheDevice::MemoryCacheSizeChanged(const char * pref, void * closure)
-{
-    nsresult  rv;
-    PRUint32   softLimit = 0;
-    nsMemoryCacheDevice * device = (nsMemoryCacheDevice *)closure;
-
-    NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv);
-    if (NS_FAILED(rv))  return rv;
-
-    rv = prefs->GetIntPref(gMemoryCacheSizePref, (PRInt32 *)&softLimit);
-    if (NS_FAILED(rv)) return rv;
-    
-    softLimit *= 1024;  // convert k into bytes
-    PRUint32 hardLimit = softLimit + 1024*1024*2;  // XXX find better limit than +2Meg
-    device->AdjustMemoryLimits(softLimit, hardLimit);
-
-    return 0; // XXX what are we supposed to return?
-}
-
-
-nsresult
-nsMemoryCacheDevice::Init()
-{
-    nsresult  rv;
-
-    rv = mMemCacheEntries.Init();
-    
-    // set some default memory limits, in case prefs aren't available
-    mSoftLimit = 1024 * 1024 * 3;
-    mHardLimit = mSoftLimit + 1024 *1024 * 2;
-
-    // read user prefs for memory cache limits
-    NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-
-        rv = prefs->RegisterCallback(gMemoryCacheSizePref, MemoryCacheSizeChanged, this);
-        if (NS_FAILED(rv))  return rv;
-
-        // Initialize the pref
-        MemoryCacheSizeChanged(gMemoryCacheSizePref, this);
-    }
-
-    // Register as a memory pressure observer
-    NS_WITH_SERVICE(nsIObserverService,
-                    observerService,
-                    NS_OBSERVERSERVICE_CONTRACTID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-        // XXX rv = observerServcie->AddObserver(this, NS_MEMORY_PRESSURE_TOPIC);
-    }
-    // Ignore failure of memory pressure registration
-
-    return rv;
-}
-
-nsresult
-nsMemoryCacheDevice::Shutdown()
-{
-    return NS_OK;
-}
-
-const char *
-nsMemoryCacheDevice::GetDeviceID()
-{
-    return gMemoryDeviceID;
-}
-
-
-nsCacheEntry *
-nsMemoryCacheDevice::FindEntry(nsCString * key)
-{
-    nsCacheEntry * entry = mMemCacheEntries.GetEntry(key);
-    if (!entry)  return nsnull;
-
-    // move entry to the tail of the eviction list
-    PR_REMOVE_AND_INIT_LINK(entry);
-    PR_APPEND_LINK(entry, &mEvictionList);
-    
-    mInactiveSize -= entry->Size();
-
-    return entry;
-}
-
-
-nsresult
-nsMemoryCacheDevice::DeactivateEntry(nsCacheEntry * entry)
-{
-    if (entry->IsDoomed()) {
-#if debug
-        // XXX verify we've removed it from mMemCacheEntries & eviction list
-#endif
-        // update statistics
-        mTotalSize    -= entry->Size();
-        --mEntryCount;
-
-        delete entry;
-        return NS_OK;
-    }
-
-    nsCacheEntry * ourEntry = mMemCacheEntries.GetEntry(entry->Key());
-    NS_ASSERTION(ourEntry, "DeactivateEntry called for an entry we don't have!");
-    NS_ASSERTION(entry == ourEntry, "entry doesn't match ourEntry");
-    if (ourEntry != entry)
-        return NS_ERROR_INVALID_POINTER;
-
-    mInactiveSize += entry->Size();
-    EvictEntriesIfNecessary();
-
-    return NS_OK;
-}
-
-
-nsresult
-nsMemoryCacheDevice::BindEntry(nsCacheEntry * entry)
-{
-    NS_ASSERTION(PR_CLIST_IS_EMPTY(entry),"entry is already on a list!");
-
-	if (!entry->IsDoomed()) {
-        // append entry to the eviction list
-	    PR_APPEND_LINK(entry, &mEvictionList);
-
-        // add entry to hashtable of mem cache entries
-        nsresult  rv = mMemCacheEntries.AddEntry(entry);
-        if (NS_FAILED(rv)) {
-            PR_REMOVE_AND_INIT_LINK(entry);
-            return rv;
-        }
-	}
-
-    // add size of entry to memory totals
-    ++mEntryCount;
-    if (mMaxEntryCount < mEntryCount) mMaxEntryCount = mEntryCount;
-
-    mTotalSize += entry->Size();
-    EvictEntriesIfNecessary();
-    
-    return NS_OK;
-}
-
-
-void
-nsMemoryCacheDevice::DoomEntry(nsCacheEntry * entry)
-{
-    // XXX debug code to verify we have entry
-    mMemCacheEntries.RemoveEntry(entry);
-
-    // remove entry from our eviction list
-    PR_REMOVE_AND_INIT_LINK(entry);
-}
-
-
-nsresult
-nsMemoryCacheDevice::GetTransportForEntry( nsCacheEntry *    entry,
-                                           nsCacheAccessMode mode,
-                                           nsITransport   ** transport )
-{
-    NS_ENSURE_ARG_POINTER(entry);
-    NS_ENSURE_ARG_POINTER(transport);
-
-    nsCOMPtr<nsISupports> data;
-
-    nsresult rv = entry->GetData(getter_AddRefs(data));
-    if (NS_FAILED(rv))
-        return rv;
-
-    if (data)
-        return CallQueryInterface(data, transport);
-    else {
-        // create a new transport for this entry
-        rv = nsComponentManager::CreateInstance(kStorageTransportCID,
-                                                nsnull,
-                                                NS_GET_IID(nsITransport),
-                                                (void **) transport);
-        if (NS_FAILED(rv)) return rv;
-
-        entry->SetData(*transport);
-        return NS_OK;
-    }
-}
-
-
-nsresult
-nsMemoryCacheDevice::GetFileForEntry( nsCacheEntry *    entry,
-                                      nsIFile **        result )
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-nsresult
-nsMemoryCacheDevice::OnDataSizeChange( nsCacheEntry * entry, PRInt32 deltaSize)
-{
-    if (entry->IsStreamData()) {
-        // we have the right to refuse or pre-evict
-    }
-
-    // adjust our totals
-    mTotalSize    += deltaSize;
-
-    EvictEntriesIfNecessary();
-
-    return NS_OK;
-}
-
-
-void
-nsMemoryCacheDevice::AdjustMemoryLimits(PRUint32  softLimit, PRUint32  hardLimit)
-{
-    mSoftLimit = softLimit;
-    mHardLimit = hardLimit;
-    EvictEntriesIfNecessary();
-}
-
-
-void
-nsMemoryCacheDevice::EvictEntry(nsCacheEntry * entry)
-{
-    // remove entry from our hashtable
-    mMemCacheEntries.RemoveEntry(entry);
-    
-    // remove entry from the eviction list
-    PR_REMOVE_AND_INIT_LINK(entry);
-    
-    // update statistics
-    PRUint32 memoryRecovered = entry->Size();
-    mTotalSize    -= memoryRecovered;
-    mInactiveSize -= memoryRecovered;
-    --mEntryCount;
-
-    delete entry;
-}
-
-
-void
-nsMemoryCacheDevice::EvictEntriesIfNecessary(void)
-{
-    nsCacheEntry * entry, * next;
-
-    if ((mTotalSize < mHardLimit) && (mInactiveSize < mSoftLimit))
-        return;
-
-    // XXX implement more sophisticated eviction ordering
-
-    entry = (nsCacheEntry *)PR_LIST_HEAD(&mEvictionList);
-    while (entry != &mEvictionList) {
-        if (entry->IsInUse()) {
-            entry = (nsCacheEntry *)PR_NEXT_LINK(entry);
-            continue;
-        }
-
-        next = (nsCacheEntry *)PR_NEXT_LINK(entry);
-        EvictEntry(entry);
-        entry = next;
-
-        if ((mTotalSize < mHardLimit) && (mInactiveSize < mSoftLimit))
-            break;
-    }
-}
-
-
-nsresult
-nsMemoryCacheDevice::Visit(nsICacheVisitor * visitor)
-{
-    nsMemoryCacheDeviceInfo * deviceInfo = new nsMemoryCacheDeviceInfo(this);
-    nsCOMPtr<nsICacheDeviceInfo> deviceRef(deviceInfo);
-    if (!deviceInfo) return NS_ERROR_OUT_OF_MEMORY;
-
-    PRBool keepGoing;
-    nsresult rv = visitor->VisitDevice(gMemoryDeviceID, deviceInfo, &keepGoing);
-    if (NS_FAILED(rv)) return rv;
-
-    if (!keepGoing)
-        return NS_OK;
-
-    nsCacheEntry *              entry;
-    nsCOMPtr<nsICacheEntryInfo> entryRef;
-
-    entry = (nsCacheEntry *)PR_LIST_HEAD(&mEvictionList);
-    while (entry != &mEvictionList) {
-        nsCacheEntryInfo * entryInfo = new nsCacheEntryInfo(entry);
-        if (!entryInfo) return NS_ERROR_OUT_OF_MEMORY;
-        entryRef = entryInfo;
-
-        rv = visitor->VisitEntry(gMemoryDeviceID, entryInfo, &keepGoing);
-        entryInfo->DetachEntry();
-        if (NS_FAILED(rv)) return rv;
-        if (!keepGoing) break;
-
-        entry = (nsCacheEntry *)PR_NEXT_LINK(entry);
-    }
-
-    return NS_OK;
-}
-
-
-nsresult
-nsMemoryCacheDevice::EvictEntries(const char * clientID)
-{
-    nsCacheEntry * entry;
-    PRUint32 prefixLength = nsCRT::strlen(clientID);
-
-    PRCList * elem = PR_LIST_HEAD(&mEvictionList);
-    while (elem != &mEvictionList) {
-        entry = (nsCacheEntry *)elem;
-        elem = PR_NEXT_LINK(elem);
-        
-        const char * key = entry->Key()->get();
-        if (clientID && nsCRT::strncmp(clientID, key, prefixLength) != 0)
-            continue;
-        
-        if (entry->IsInUse()) {
-            nsresult rv = nsCacheService::GlobalInstance()->DoomEntry_Locked(entry);
-            if (NS_FAILED(rv)) return rv;
-        } else {
-            EvictEntry(entry);
-        }
-    }
-    return NS_OK;
-}
-
-
-/******************************************************************************
- * nsMemoryCacheDeviceInfo - for implementing about:cache
- *****************************************************************************/
-
-
-NS_IMPL_ISUPPORTS1(nsMemoryCacheDeviceInfo, nsICacheDeviceInfo);
-
-
-NS_IMETHODIMP
-nsMemoryCacheDeviceInfo::GetDescription(char ** result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    *result = nsCRT::strdup("Memory cache device");
-    if (!*result) return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsMemoryCacheDeviceInfo::GetUsageReport(char ** result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    *result = nsCRT::strdup("Memory cache usage report:");
-    if (!*result) return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsMemoryCacheDeviceInfo::GetEntryCount(PRUint32 * result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    // XXX compare calculated count vs. mEntryCount
-    *result = mDevice->mEntryCount;
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsMemoryCacheDeviceInfo::GetTotalSize(PRUint32 * result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    *result = mDevice->mTotalSize;
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsMemoryCacheDeviceInfo::GetMaximumSize(PRUint32 * result)
-{
-    NS_ENSURE_ARG_POINTER(result);
-    *result = mDevice->mHardLimit;
-    return NS_OK;
-}

mozilla/netwerk/cache/src/nsMemoryCacheDevice.h

@@ -1,111 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is nsMemoryCacheDevice.h, released February 20, 2001.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *    Gordon Sheridan, 20-February-2001
- */
-
-#ifndef _nsMemoryCacheDevice_h_
-#define _nsMemoryCacheDevice_h_
-
-#include "nsCacheDevice.h"
-#include "pldhash.h"
-#include "nsCacheEntry.h"
-
-
-class nsMemoryCacheDeviceInfo;
-
-/******************************************************************************
- * nsMemoryCacheDevice
- ******************************************************************************/
-class nsMemoryCacheDevice : public nsCacheDevice
-{
-public:
-    nsMemoryCacheDevice();
-    virtual ~nsMemoryCacheDevice();
-
-    virtual nsresult        Init();
-    virtual nsresult        Shutdown();
-
-    virtual const char *    GetDeviceID(void);
-
-    virtual nsresult        BindEntry( nsCacheEntry * entry );
-    virtual nsCacheEntry *  FindEntry( nsCString * key );
-    virtual void            DoomEntry( nsCacheEntry * entry );
-    virtual nsresult        DeactivateEntry( nsCacheEntry * entry );
-
-    virtual nsresult GetTransportForEntry( nsCacheEntry * entry,
-                                           nsCacheAccessMode mode,
-                                           nsITransport **transport );
-
-    virtual nsresult GetFileForEntry( nsCacheEntry *    entry,
-                                      nsIFile **        result );
-
-    virtual nsresult OnDataSizeChange( nsCacheEntry * entry, PRInt32 deltaSize );
-
-    virtual nsresult Visit( nsICacheVisitor * visitor );
-
-    virtual nsresult        EvictEntries(const char * clientID);
-    
-    static int PR_CALLBACK MemoryCacheSizeChanged(const char * pref, void * closure);
- 
-private:
-    friend class nsMemoryCacheDeviceInfo;
-    void      AdjustMemoryLimits( PRUint32  softLimit, PRUint32  hardLimit);
-    void      EvictEntry( nsCacheEntry * entry );
-    void      EvictEntriesIfNecessary();
-
-    nsCacheEntryHashTable   mMemCacheEntries;
-    PRCList                 mEvictionList;
-
-    PRUint32                mHardLimit;
-    PRUint32                mSoftLimit;
-
-    PRUint32                mTotalSize;
-    PRUint32                mInactiveSize;
-
-    PRUint32                mEntryCount;
-
-    PRUint32                mMaxEntryCount;
-    // XXX what other stats do we want to keep?
-};
-
-
-/******************************************************************************
- * nsMemoryCacheDeviceInfo - used to call nsIVisitor for about:cache
- ******************************************************************************/
-class nsMemoryCacheDeviceInfo : public nsICacheDeviceInfo {
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSICACHEDEVICEINFO
-
-    nsMemoryCacheDeviceInfo(nsMemoryCacheDevice* device)
-        :   mDevice(device)
-    {
-        NS_INIT_ISUPPORTS();
-    }
-
-    virtual ~nsMemoryCacheDeviceInfo() {}
-    
-private:
-    nsMemoryCacheDevice* mDevice;
-};
-
-
-#endif // _nsMemoryCacheDevice_h_

mozilla/netwerk/cache/src/win32.order

@@ -1,231 +0,0 @@
-?AddRef@nsCacheEntryDescriptor@@UAGKXZ ; 35743
-?HashKey@nsCacheEntryHashTable@@CAIPAUPLDHashTable@@PBX@Z ; 29743
-?Release@nsCacheEntryDescriptor@@UAGKXZ ; 21199
-??_EnsCString@@UAEPAXI@Z ; 19905
-?AddRef@nsCacheSession@@UAGKXZ ; 17435
-?GetEntry@nsCacheEntryHashTable@@QAEPAVnsCacheEntry@@PBVnsCString@@@Z ; 17433
-?SecondsFromPRTime@@YAI_J@Z ; 14263
-?CalculateSize@nsCacheMetaData@@CA?AW4PLDHashOperator@@PAUPLDHashTable@@PAUPLDHashEntryHdr@@IPAX@Z ; 14243
-?Release@nsCacheEntryInfo@@UAGKXZ ; 10964
-?GetLastModified@nsDiskCacheEntryInfo@@UAGIPAI@Z ; 9800
-?Release@nsANSIOutputStream@@UAGKXZ ; 9758
-?MatchEntry@nsCacheEntryHashTable@@CAHPAUPLDHashTable@@PBUPLDHashEntryHdr@@PBX@Z ; 9663
-?QueryInterface@nsCacheEntryInfo@@UAGIABUnsID@@PAPAX@Z ; 8638
-??Rdo_QueryElementAt@@UBEIABUnsID@@PAPAX@Z ; 8638
-?assign_assuming_AddRef@nsCOMPtr_base@@IAEXPAVnsISupports@@@Z ; 8259
-??0nsDiskCacheRecord@@QAE@XZ ; 8192
-?EnsureEntryHasDevice@nsCacheService@@AAEPAVnsCacheDevice@@PAVnsCacheEntry@@@Z ; 7918
-?MoveEntry@nsCacheEntryHashTable@@CAXPAUPLDHashTable@@PBUPLDHashEntryHdr@@PAU3@@Z ; 7653
-?GetKey@nsCacheEntryHashTable@@CAPBXPAUPLDHashTable@@PAUPLDHashEntryHdr@@@Z ; 7653
-?Close@nsANSIOutputStream@@UAGIXZ ; 7092
-?Write@nsANSIOutputStream@@UAGIPBDIPAI@Z ; 7067
-?AccumulateElements@nsCacheMetaData@@CA?AW4PLDHashOperator@@PAUPLDHashTable@@PAUPLDHashEntryHdr@@IPAX@Z ; 7063
-?Release@nsDiskCacheDeviceInfo@@UAGKXZ ; 6471
-?CreateRequest@nsCacheService@@AAEIPAVnsCacheSession@@PBDHPAVnsICacheListener@@PAPAVnsCacheRequest@@@Z ; 6468
-?ActivateEntry@nsCacheService@@AAEIPAVnsCacheRequest@@PAPAVnsCacheEntry@@@Z ; 6468
-?ProcessRequest@nsCacheService@@AAEIPAVnsCacheRequest@@PAPAVnsICacheEntryDescriptor@@@Z ; 6468
-??1nsCacheRequest@@AAE@XZ ; 6468
-?OpenCacheEntry@nsCacheService@@QAEIPAVnsCacheSession@@PBDHPAVnsICacheListener@@PAPAVnsICacheEntryDescriptor@@@Z ; 6468
-??0nsCacheRequest@@AAE@PAVnsCString@@PAVnsICacheListener@@HPAVnsCacheSession@@@Z ; 6468
-?Hash@nsDiskCacheEntry@@SAIPBD@Z ; 6166
-?HashKey@nsDiskCacheEntryHashTable@@CAIPAUPLDHashTable@@PBX@Z ; 6037
-?EvictEntriesIfNecessary@nsMemoryCacheDevice@@AAEXXZ ; 5780
-?TouchData@nsCacheEntry@@QAEXXZ ; 5503
-?OpenCacheEntry@nsCacheSession@@UAGIPBDHPAPAVnsICacheEntryDescriptor@@@Z ; 5165
-?RequestAccess@nsCacheEntry@@QAEIPAVnsCacheRequest@@PAH@Z ; 5099
-?Fetched@nsCacheEntry@@QAEXXZ ; 5094
-??0nsTransportWrapper@nsCacheEntryDescriptor@@QAE@XZ ; 5092
-?CreateDescriptor@nsCacheEntry@@QAEIPAVnsCacheRequest@@HPAPAVnsICacheEntryDescriptor@@@Z ; 5092
-??0nsCacheEntryDescriptor@@QAE@PAVnsCacheEntry@@H@Z ; 5092
-?RemoveDescriptor@nsCacheEntry@@QAEHPAVnsCacheEntryDescriptor@@@Z ; 5090
-?CloseDescriptor@nsCacheService@@QAEXPAVnsCacheEntryDescriptor@@@Z ; 5090
-?Close@nsCacheEntryDescriptor@@UAGIXZ ; 5090
-??_GnsCacheEntryDescriptor@@UAEPAXI@Z ; 5090
-??1nsCacheEntryDescriptor@@UAE@XZ ; 5090
-?SearchCacheDevices@nsCacheService@@AAEPAVnsCacheEntry@@PAVnsCString@@H@Z ; 4993
-?AddEntry@nsCacheEntryHashTable@@QAEIPAVnsCacheEntry@@@Z ; 4993
-?FindEntry@nsMemoryCacheDevice@@UAEPAVnsCacheEntry@@PAVnsCString@@@Z ; 4993
-?ClearEntry@nsCacheEntryHashTable@@CAXPAUPLDHashTable@@PAUPLDHashEntryHdr@@@Z ; 4993
-?RemoveEntry@nsCacheEntryHashTable@@QAEXPAVnsCacheEntry@@@Z ; 4921
-?GetData@nsCacheEntry@@QAEIPAPAVnsISupports@@@Z ; 4811
-?Release@nsDiskCacheEntry@@UAGKXZ ; 4784
-?RequestDataSizeChange@nsCacheEntryDescriptor@@QAEIH@Z ; 4127
-?OnDataSizeChange@nsCacheService@@QAEIPAVnsCacheEntry@@H@Z ; 4127
-?SetElement@nsCacheMetaData@@QAEIABVnsACString@@0@Z ; 3682
-?ClearEntry@nsCacheMetaData@@CAXPAUPLDHashTable@@PAUPLDHashEntryHdr@@@Z ; 3681
-?FreeElements@nsCacheMetaData@@CA?AW4PLDHashOperator@@PAUPLDHashTable@@PAUPLDHashEntryHdr@@IPAX@Z ; 3681
-?GetEntry@nsDiskCacheEntryHashTable@@QAEPAVnsDiskCacheEntry@@PBD@Z ; 3651
-?GetRecord@nsDiskCacheMap@@QAEPAVnsDiskCacheRecord@@I@Z ; 3650
-?Size@nsCacheMetaData@@QAEIXZ ; 3628
-?DeactivateEntry@nsCacheService@@AAEXPAVnsCacheEntry@@@Z ; 3619
-?TouchMetaData@nsCacheEntry@@QAEXXZ ; 3601
-?SetMetaDataElement@nsCacheEntryDescriptor@@UAGIPBD0@Z ; 3601
-?SetMetaDataElement@nsCacheEntry@@QAEIABVnsACString@@0@Z ; 3601
-?getFileForHashNumber@nsDiskCacheDevice@@QAEIIHIPAPAVnsIFile@@@Z ; 3587
-?Read@nsANSIInputStream@@UAGIPADIPAI@Z ; 3570
-?getFileForDiskCacheEntry@nsDiskCacheDevice@@QAEIPAVnsDiskCacheEntry@@HPAPAVnsIFile@@@Z ; 3560
-?Unswap@MetaDataHeader@@QAEXXZ ; 3545
-??1MetaDataFile@@QAE@XZ ; 3545
-?OnDataSizeChange@nsDiskCacheDevice@@UAEIPAVnsCacheEntry@@H@Z ; 3210
-?ProcessPendingRequests@nsCacheService@@AAEIPAVnsCacheEntry@@@Z ; 2800
-??0nsCacheEntry@@QAE@PAVnsCString@@HH@Z ; 2673
-??1nsCacheEntry@@QAE@XZ ; 2673
-?MarkValid@nsCacheEntryDescriptor@@UAGIXZ ; 2592
-?ValidateEntry@nsCacheService@@QAEIPAVnsCacheEntry@@@Z ; 2592
-?GetCacheElement@nsCacheEntryDescriptor@@UAGIPAPAVnsISupports@@@Z ; 2413
-?MatchEntry@nsDiskCacheEntryHashTable@@CAHPAUPLDHashTable@@PBUPLDHashEntryHdr@@PBX@Z ; 2383
-?Release@nsANSIInputStream@@UAGKXZ ; 2380
-?AddRef@nsANSIInputStream@@UAGKXZ ; 2380
-?MatchEntry@nsCacheMetaData@@CAHPAUPLDHashTable@@PBUPLDHashEntryHdr@@PBX@Z ; 2365
-?GetMetaDataElement@nsCacheEntry@@QAEIABVnsACString@@PAPBV2@@Z ; 2365
-?GetElement@nsCacheMetaData@@QAEPBVnsACString@@PBV2@@Z ; 2365
-?GetMetaDataElement@nsCacheEntryDescriptor@@UAGIPBDPAPAD@Z ; 2365
-?openOutputStream@nsDiskCacheDevice@@SAIPAVnsIFile@@PAPAVnsIOutputStream@@@Z ; 2356
-?updateDiskCacheEntry@nsDiskCacheDevice@@QAEIPAVnsDiskCacheEntry@@@Z ; 2356
-??0nsANSIOutputStream@@QAE@PAU_iobuf@@@Z ; 2356
-??_EnsANSIOutputStream@@UAEPAXI@Z ; 2356
-??1nsANSIOutputStream@@UAE@XZ ; 2356
-?Swap@MetaDataHeader@@QAEXXZ ; 2355
-?FlattenMetaData@nsCacheMetaData@@QAEIPAPADPAI@Z ; 2355
-?Init@MetaDataFile@@QAEIPAVnsCacheEntry@@@Z ; 2355
-?updateCacheMap@nsDiskCacheDevice@@QAEIPAVnsDiskCacheEntry@@@Z ; 2355
-??0MetaDataHeader@@QAE@PAVnsCacheEntry@@@Z ; 2355
-?Write@MetaDataFile@@QAEIPAVnsIOutputStream@@@Z ; 2355
-?FlattenMetaData@nsCacheEntry@@QAEIPAPADPAI@Z ; 2355
-?DeactivateEntry@nsMemoryCacheDevice@@UAEIPAVnsCacheEntry@@@Z ; 2322
-?SetExpirationTime@nsCacheEntryDescriptor@@UAGII@Z ; 2259
-?QueryInterface@nsCacheEntryDescriptor@@UAGIABUnsID@@PAPAX@Z ; 2186
-?GetDataSize@nsCacheEntryDescriptor@@UAGIPAI@Z ; 2107
-?OnDataSizeChange@nsMemoryCacheDevice@@UAEIPAVnsCacheEntry@@H@Z ; 2082
-?SetDataSize@nsCacheEntryDescriptor@@UAGII@Z ; 2082
-?Write@nsOutputStreamWrapper@nsCacheEntryDescriptor@@UAGIPBDIPAI@Z ; 2045
-?OnWrite@nsOutputStreamWrapper@nsCacheEntryDescriptor@@AAEII@Z ; 2045
-?GetNonBlocking@nsOutputStreamWrapper@nsCacheEntryDescriptor@@UAGIPAH@Z ; 1550
-?SetCacheElement@nsCacheEntryDescriptor@@UAGIPAVnsISupports@@@Z ; 1376
-?BindEntry@nsMemoryCacheDevice@@UAEIPAVnsCacheEntry@@@Z ; 1376
-?AsyncOpenCacheEntry@nsCacheSession@@UAGIPBDHPAVnsICacheListener@@@Z ; 1303
-?NotifyListener@nsCacheService@@AAEIPAVnsCacheRequest@@PAVnsICacheEntryDescriptor@@HI@Z ; 1303
-??0nsCacheMetaData@@QAE@XZ ; 1298
-??1nsCacheMetaData@@QAE@XZ ; 1298
-?FindEntry@nsDiskCacheDevice@@UAEPAVnsCacheEntry@@PAVnsCString@@@Z ; 1295
-?Init@nsCacheMetaData@@QAEIXZ ; 1295
-?Finalize@nsCacheMetaData@@CAXPAUPLDHashTable@@@Z ; 1295
-?Create@nsCacheMetaData@@SAPAV1@XZ ; 1295
-?getTransportForFile@nsDiskCacheDevice@@SAIPAVnsIFile@@HPAPAVnsITransport@@@Z ; 1199
-?GetTransportForEntry@nsDiskCacheDevice@@UAEIPAVnsCacheEntry@@HPAPAVnsITransport@@@Z ; 1198
-?AddRef@nsTransportWrapper@nsCacheEntryDescriptor@@UAGKXZ ; 1198
-?EnsureTransportWithAccess@nsTransportWrapper@nsCacheEntryDescriptor@@QAEIH@Z ; 1198
-?GetTransport@nsCacheEntryDescriptor@@UAGIPAPAVnsITransport@@@Z ; 1198
-?GetTransportForEntry@nsCacheService@@QAEIPAVnsCacheEntry@@HPAPAVnsITransport@@@Z ; 1198
-?Release@nsTransportWrapper@nsCacheEntryDescriptor@@UAGKXZ ; 1198
-?GetSecurityInfo@nsCacheEntryDescriptor@@UAGIPAPAVnsISupports@@@Z ; 1195
-?GetSecurityInfo@nsCacheEntry@@QAEIPAPAVnsISupports@@@Z ; 1195
-??1nsDiskCacheEntry@@UAE@XZ ; 1193
-??0nsDiskCacheEntry@@QAE@PAVnsCacheEntry@@@Z ; 1193
-??_EnsDiskCacheEntry@@UAEPAXI@Z ; 1193
-?DeactivateEntry@nsDiskCacheDevice@@UAEIPAVnsCacheEntry@@@Z ; 1193
-?AddEntry@nsDiskCacheEntryHashTable@@QAEIPAVnsDiskCacheEntry@@@Z ; 1193
-?ClearEntry@nsDiskCacheEntryHashTable@@CAXPAUPLDHashTable@@PAUPLDHashEntryHdr@@@Z ; 1193
-?RemoveEntry@nsDiskCacheEntryHashTable@@QAEXPAVnsDiskCacheEntry@@@Z ; 1193
-?openInputStream@nsDiskCacheDevice@@SAIPAVnsIFile@@PAPAVnsIInputStream@@@Z ; 1191
-??1nsANSIInputStream@@UAE@XZ ; 1190
-?Read@MetaDataFile@@QAEIPAVnsIInputStream@@@Z ; 1190
-??0nsANSIInputStream@@QAE@PAU_iobuf@@@Z ; 1190
-??_EnsANSIInputStream@@UAEPAXI@Z ; 1190
-??0MetaDataHeader@@QAE@XZ ; 1190
-?OpenOutputStream@nsTransportWrapper@nsCacheEntryDescriptor@@UAGIIIIPAPAVnsIOutputStream@@@Z ; 1166
-?BindEntry@nsDiskCacheDevice@@UAEIPAVnsCacheEntry@@@Z ; 1166
-?IsAllowedOnDisk@nsCacheEntry@@QAEHXZ ; 1166
-??1nsOutputStreamWrapper@nsCacheEntryDescriptor@@UAE@XZ ; 1165
-?NewOutputStreamWrapper@nsCacheEntryDescriptor@@CAIPAPAVnsIOutputStream@@PAV1@PAV2@@Z ; 1165
-?GetAccessGranted@nsCacheEntryDescriptor@@UAGIPAH@Z ; 1165
-??0nsOutputStreamWrapper@nsCacheEntryDescriptor@@QAE@PAV1@PAVnsIOutputStream@@@Z ; 1165
-?Init@nsOutputStreamWrapper@nsCacheEntryDescriptor@@QAEIXZ ; 1165
-??_GnsOutputStreamWrapper@nsCacheEntryDescriptor@@UAEPAXI@Z ; 1165
-??0MetaDataFile@@QAE@XZ ; 1163
-?GetDataSize@nsDiskCacheEntryInfo@@UAGIPAI@Z ; 1163
-??_GnsDiskCacheEntryInfo@@UAEPAXI@Z ; 1163
-?Swap@nsDiskCacheRecord@@QAEXXZ ; 1123
-?Unswap@nsDiskCacheRecord@@QAEXXZ ; 1123
-?GetExpirationTime@nsCacheEntryDescriptor@@UAGIPAI@Z ; 1118
-?GetKey@nsDiskCacheEntryHashTable@@CAPBXPAUPLDHashTable@@PAUPLDHashEntryHdr@@@Z ; 395
-?MoveEntry@nsDiskCacheEntryHashTable@@CAXPAUPLDHashTable@@PBUPLDHashEntryHdr@@PAU3@@Z ; 395
-?DoomEntry_Locked@nsCacheService@@QAEIPAVnsCacheEntry@@@Z ; 106
-?DoomEntry@nsCacheService@@QAEIPAVnsCacheEntry@@@Z ; 104
-?Doom@nsCacheEntryDescriptor@@UAGIXZ ; 104
-?FreeCacheEntries@nsCacheEntryHashTable@@CA?AW4PLDHashOperator@@PAUPLDHashTable@@PAUPLDHashEntryHdr@@IPAX@Z ; 72
-?AsyncRead@nsTransportWrapper@nsCacheEntryDescriptor@@UAGIPAVnsIStreamListener@@PAVnsISupports@@IIIPAPAVnsIRequest@@@Z ; 32
-??_H@YGXPAXIHP6EX0@Z@Z ; 32
-?getFileForKey@nsDiskCacheDevice@@QAEIPBDHIPAPAVnsIFile@@@Z ; 27
-?UnflattenMetaData@nsCacheMetaData@@QAEIPADI@Z ; 27
-?UnflattenMetaData@nsCacheEntry@@QAEIPADI@Z ; 27
-?readDiskCacheEntry@nsDiskCacheDevice@@QAEIPBDPAPAVnsDiskCacheEntry@@@Z ; 27
-?GetLastModified@nsCacheEntryDescriptor@@UAGIPAI@Z ; 25
-?AddRef@nsDiskCacheObserver@@UAGKXZ ; 12
-?Release@nsDiskCacheObserver@@UAGKXZ ; 12
-?AddRef@nsCacheService@@UAGKXZ ; 9
-?Release@nsCacheService@@UAGKXZ ; 9
-?QueryInterface@nsDiskCacheObserver@@UAGIABUnsID@@PAPAX@Z ; 6
-?QueryInterface@nsCacheService@@UAGIABUnsID@@PAPAX@Z ; 6
-?do_GetService@@YA?BVnsGetServiceByContractID@@PBDPAI@Z ; 5
-?DeleteRecord@nsDiskCacheMap@@QAEXI@Z ; 3
-??0nsCacheSession@@QAE@PBDHH@Z ; 3
-??1nsCacheSession@@UAE@XZ ; 3
-??_EnsCacheSession@@UAEPAXI@Z ; 3
-?deleteDiskCacheEntry@nsDiskCacheDevice@@QAEIPAVnsDiskCacheEntry@@@Z ; 3
-?DoomEntry@nsDiskCacheDevice@@UAEXPAVnsCacheEntry@@@Z ; 3
-?CreateSession@nsCacheService@@UAGIPBDHHPAPAVnsICacheSession@@@Z ; 3
-?setPrefsObserver@nsDiskCacheDevice@@QAEXPAVnsIObserver@@@Z ; 2
-?VisitEntries@nsDiskCacheEntryHashTable@@QAEXPAVVisitor@1@@Z ; 2
-?DetachDescriptors@nsCacheEntry@@AAEXXZ ; 2
-?ClearPendingRequests@nsCacheService@@AAEXPAVnsCacheEntry@@@Z ; 2
-?SetDoomEntriesIfExpired@nsCacheSession@@UAGIH@Z ; 2
-?Finalize@nsCacheEntryHashTable@@CAXPAUPLDHashTable@@@Z ; 2
-?DeactivateAndClearEntry@nsCacheService@@CA?AW4PLDHashOperator@@PAUPLDHashTable@@PAUPLDHashEntryHdr@@IPAX@Z ; 2
-?Init@nsCacheEntryHashTable@@QAEIXZ ; 2
-?updateDiskCacheEntries@nsDiskCacheDevice@@QAEIXZ ; 2
-?scanDiskCacheEntries@nsDiskCacheDevice@@QAEIPAPAVnsISupportsArray@@@Z ; 2
-?AdjustMemoryLimits@nsMemoryCacheDevice@@AAEXII@Z ; 1
-_NSGetModule ; 1
-?Finalize@nsDiskCacheEntryHashTable@@CAXPAUPLDHashTable@@@Z ; 1
-??0nsMemoryCacheDevice@@QAE@XZ ; 1
-?evictDiskCacheEntries@nsDiskCacheDevice@@QAEIXZ ; 1
-??0nsDiskCacheMap@@QAE@XZ ; 1
-?ClearActiveEntries@nsCacheService@@AAEXXZ ; 1
-?setCacheCapacity@nsDiskCacheDevice@@QAEXI@Z ; 1
-?Init@nsDiskCacheEntryHashTable@@QAEIXZ ; 1
-?DoomEntry@nsMemoryCacheDevice@@UAEXPAVnsCacheEntry@@@Z ; 1
-?getPrefsObserver@nsDiskCacheDevice@@QAEXPAPAVnsIObserver@@@Z ; 1
-??_EnsMemoryCacheDevice@@UAEPAXI@Z ; 1
-?setCacheDirectory@nsDiskCacheDevice@@QAEXPAVnsILocalFile@@@Z ; 1
-?Shutdown@nsCacheService@@UAGIXZ ; 1
-??_GnsCacheService@@UAEPAXI@Z ; 1
-?ClearDoomList@nsCacheService@@AAEXXZ ; 1
-?QueryInterface@nsANSIOutputStream@@UAGIABUnsID@@PAPAX@Z ; 1
-?Init@nsCacheService@@UAGIXZ ; 1
-??0nsDiskCacheDevice@@QAE@XZ ; 1
-?Swap@nsDiskCacheHeader@@QAEXXZ ; 1
-?GetFileForEntry@nsCacheService@@QAEIPAVnsCacheEntry@@PAPAVnsIFile@@@Z ; 1
-??_GnsDiskCacheDevice@@UAEPAXI@Z ; 1
-??1nsCacheService@@UAE@XZ ; 1
-?GetFileForEntry@nsDiskCacheDevice@@UAEIPAVnsCacheEntry@@PAPAVnsIFile@@@Z ; 1
-?Init@nsMemoryCacheDevice@@UAEIXZ ; 1
-?GetFile@nsCacheEntryDescriptor@@UAGIPAPAVnsIFile@@@Z ; 1
-?Seek@nsANSIOutputStream@@UAGIHH@Z ; 1
-?MemoryCacheSizeChanged@nsMemoryCacheDevice@@SAHPBDPAX@Z ; 1
-?SetStoragePolicy@nsCacheEntryDescriptor@@UAGIH@Z ; 1
-??0nsCacheService@@QAE@XZ ; 1
-?Observe@nsCacheService@@UAGIPAVnsISupports@@PBG1@Z ; 1
-?writeCacheMap@nsDiskCacheDevice@@QAEIXZ ; 1
-?Init@nsDiskCacheDevice@@UAEIXZ ; 1
-?Create@nsCacheService@@SGIPAVnsISupports@@ABUnsID@@PAPAX@Z ; 1
-?NS_GetSpecialDirectory@@YAIPBDPAPAVnsIFile@@@Z ; 1
-??1nsDiskCacheDevice@@UAE@XZ ; 1
-?readCacheMap@nsDiskCacheDevice@@QAEIXZ ; 1
-??1nsDiskCacheMap@@QAE@XZ ; 1
-??_EnsDiskCacheObserver@@UAEPAXI@Z ; 1
-?Unswap@nsDiskCacheHeader@@QAEXXZ ; 1
-?CreateDiskDevice@nsCacheService@@AAEIXZ ; 1
-??1nsMemoryCacheDevice@@UAE@XZ ; 1
-?Shutdown@nsDiskCacheDevice@@UAEIXZ ; 1
-?Write@nsDiskCacheMap@@QAEIPAVnsIOutputStream@@@Z ; 1

mozilla/parser/htmlparser/src/nsAVLTree.cpp

@@ -0,0 +1,617 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsAVLTree.h"
+ 
+
+enum eLean      {eLeft,eNeutral,eRight};
+
+struct NS_COM nsAVLNode {
+public:
+
+  nsAVLNode(void* aValue) {
+    mLeft=0;
+    mRight=0;
+    mSkew=eNeutral;
+    mValue=aValue;
+  }
+
+  nsAVLNode*  mLeft;
+  nsAVLNode*  mRight;
+  eLean       mSkew;
+  void*       mValue;
+};
+
+
+/************************************************************
+  Now begin the tree class. Don't forget that the comparison
+  between nodes must occur via the comparitor function, 
+  otherwise all you're testing is pointer addresses.
+ ************************************************************/
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+nsAVLTree::nsAVLTree(nsAVLNodeComparitor& aComparitor, 
+                     nsAVLNodeFunctor* aDeallocator) :
+  mComparitor(aComparitor), mDeallocator(aDeallocator) {
+  mRoot=0;
+  mCount=0;
+}
+
+
+static void 
+avlDeleteTree(nsAVLNode* aNode){
+  if (aNode) {
+    avlDeleteTree(aNode->mLeft);
+    avlDeleteTree(aNode->mRight);
+    delete aNode;
+  }
+}
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+nsAVLTree::~nsAVLTree(){
+  if (mDeallocator) {
+    ForEachDepthFirst(*mDeallocator);
+  }
+  avlDeleteTree(mRoot);
+}
+
+
+class CDoesntExist: public nsAVLNodeFunctor {
+public:
+  CDoesntExist(const nsAVLTree& anotherTree) : mOtherTree(anotherTree) {
+  }
+  virtual void* operator()(void* anItem) {
+    void* result=mOtherTree.FindItem(anItem);
+    if(result)
+      return nsnull;
+    return anItem;
+  }
+protected:
+  const nsAVLTree& mOtherTree;
+};
+
+/**
+ * This method compares two trees (members by identity).
+ * @update	gess12/27/98
+ * @param   tree to compare against
+ * @return  true if they are identical (contain same stuff).
+ */
+PRBool nsAVLTree::operator==(const nsAVLTree& aCopy) const{
+  CDoesntExist functor(aCopy);
+  void* theItem=FirstThat(functor);
+  PRBool result=PRBool(!theItem);
+  return result;
+}
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateRight(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mRight;
+  if(ptr2->mSkew==eRight) {
+    aRootNode->mRight=ptr2->mLeft;
+    ptr2->mLeft=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mLeft;
+    ptr2->mLeft=ptr3->mRight;
+    ptr3->mRight=ptr2;
+    aRootNode->mRight=ptr3->mLeft;
+    ptr3->mLeft=aRootNode;
+    if(ptr3->mSkew==eLeft)
+      ptr2->mSkew=eRight;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eRight)
+      aRootNode->mSkew=eLeft;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateLeft(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mLeft;
+  if(ptr2->mSkew==eLeft) {
+    aRootNode->mLeft=ptr2->mRight;
+    ptr2->mRight=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mRight;
+    ptr2->mRight=ptr3->mLeft;
+    ptr3->mLeft=ptr2;
+    aRootNode->mLeft=ptr3->mRight;
+    ptr3->mRight=aRootNode;
+    if(ptr3->mSkew==eRight)
+      ptr2->mSkew=eLeft;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eLeft)
+      aRootNode->mSkew=eRight;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlInsert(nsAVLNode*& aRootNode, nsAVLNode* aNewNode, 
+          nsAVLNodeComparitor& aComparitor) {
+  eAVLStatus result=eAVL_unknown;
+  
+  if(!aRootNode) {
+    aRootNode = aNewNode;
+    return eAVL_ok;
+  }
+  
+  if(aNewNode==aRootNode->mValue) {
+    return eAVL_duplicate;
+  }
+
+  PRInt32 theCompareResult=aComparitor(aRootNode->mValue,aNewNode->mValue);
+  if(0 < theCompareResult) { //if(anItem<aRootNode->mValue)
+    result=avlInsert(aRootNode->mLeft,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          avlRotateLeft(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eRight:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eLeft;
+          break;
+      } //switch
+    }//if
+  } //if
+  else { 
+    result=avlInsert(aRootNode->mRight,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eRight:
+          avlRotateRight(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eRight;
+          break;
+      } //switch
+    }
+  } //if
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceLeft(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      ptr2=aRootNode->mLeft;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eRight) {
+        aRootNode->mLeft=ptr2->mRight;
+        ptr2->mRight=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eLeft;
+          ptr2->mSkew=eRight;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mRight;
+        balnc3=ptr3->mSkew;
+        ptr2->mRight=ptr3->mLeft;
+        ptr3->mLeft=ptr2;
+        aRootNode->mLeft=ptr3->mRight;
+        ptr3->mRight=aRootNode;
+        if(balnc3==eRight) {
+          ptr2->mSkew=eLeft;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eLeft) {
+          aRootNode->mSkew=eRight;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eRight:
+      aRootNode->mSkew=eNeutral;
+      break;
+    
+    case eNeutral:
+      aRootNode->mSkew=eLeft;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceRight(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      aRootNode->mSkew=eNeutral;
+      break;
+
+    case eRight:
+      ptr2=aRootNode->mRight;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eLeft) {
+        aRootNode->mRight=ptr2->mLeft;
+        ptr2->mLeft=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eRight;
+          ptr2->mSkew=eLeft;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mLeft;
+        balnc3=ptr3->mSkew;
+        ptr2->mLeft=ptr3->mRight;
+        ptr3->mRight=ptr2;
+        aRootNode->mRight=ptr3->mLeft;
+        ptr3->mLeft=aRootNode;
+        if(balnc3==eLeft) {
+          ptr2->mSkew=eRight;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eRight) {
+          aRootNode->mSkew=eLeft;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eNeutral:
+      aRootNode->mSkew=eRight;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemoveChildren(nsAVLNode*& aRootNode,nsAVLNode*& anotherNode, PRBool& delOk){
+  eAVLStatus result=eAVL_ok;
+  
+  if(!anotherNode->mRight){
+    aRootNode->mValue=anotherNode->mValue; //swap
+    anotherNode=anotherNode->mLeft;
+    delOk=PR_TRUE;
+  }
+  else{
+    avlRemoveChildren(aRootNode,anotherNode->mRight,delOk);
+    if(delOk)
+      avlBalanceLeft(anotherNode,delOk);
+  }
+
+  return result;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemove(nsAVLNode*& aRootNode, void* anItem, PRBool& delOk,
+          nsAVLNodeComparitor& aComparitor){
+  eAVLStatus result=eAVL_ok;
+
+  if(!aRootNode)
+    delOk=PR_FALSE;
+  else {
+    PRInt32 cmp=aComparitor(anItem,aRootNode->mValue);
+    if(cmp<0){
+      avlRemove(aRootNode->mLeft,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceRight(aRootNode,delOk);
+    }
+    else if(cmp>0){
+      avlRemove(aRootNode->mRight,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceLeft(aRootNode,delOk);
+    }
+    else{ //they match...
+      nsAVLNode* temp=aRootNode;
+      if(!aRootNode->mRight) {
+        aRootNode=aRootNode->mLeft;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else if(!aRootNode->mLeft) {
+        aRootNode=aRootNode->mRight;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else {
+        avlRemoveChildren(aRootNode,aRootNode->mLeft,delOk);
+        if(delOk)
+          avlBalanceRight(aRootNode,delOk);
+      }
+    }
+  }
+
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+eAVLStatus 
+nsAVLTree::AddItem(void* anItem){
+  eAVLStatus result=eAVL_ok;
+
+  nsAVLNode* theNewNode=new nsAVLNode(anItem);
+  result=avlInsert(mRoot,theNewNode,mComparitor);
+  if(eAVL_duplicate!=result)
+    mCount++;
+  else {
+    delete theNewNode;
+  }
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+void* nsAVLTree::FindItem(void* aValue) const{
+  nsAVLNode* result=mRoot;
+  PRInt32 count=0;
+  while(result) {
+    count++;
+    PRInt32 cmp=mComparitor(aValue,result->mValue);
+    if(0==cmp) {
+      //we matched...
+      break;
+    }
+    else if(0>cmp){
+      //theNode was greater...
+      result=result->mLeft;
+    }
+    else {
+      //aValue is greater...
+      result=result->mRight;
+    }
+  }
+  if(result) {
+    return result->mValue;
+  }
+  return nsnull;
+}
+
+
+/**
+ * 
+ * @update	gess12/30/98
+ * @param 
+ * @return
+ */
+eAVLStatus 
+nsAVLTree::RemoveItem(void* aValue){
+  PRBool delOk=PR_TRUE;
+  eAVLStatus result=avlRemove(mRoot,aValue,delOk,mComparitor);
+  if(eAVL_ok==result)
+    mCount--;
+  return result;
+} 
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEachDepthFirst(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor){
+  if(aNode) {
+    avlForEachDepthFirst(aNode->mLeft,aFunctor);
+    avlForEachDepthFirst(aNode->mRight,aFunctor);
+    aFunctor(aNode->mValue);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEachDepthFirst(mRoot,aFunctor);
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEach(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  if(aNode) {
+    avlForEach(aNode->mLeft,aFunctor);
+    aFunctor(aNode->mValue);
+    avlForEach(aNode->mRight,aFunctor);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEach(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEach(mRoot,aFunctor);
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void* 
+avlFirstThat(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  void* result=nsnull;
+  if(aNode) {
+    result = avlFirstThat(aNode->mLeft,aFunctor);
+    if (result) {
+      return result;
+    }
+    result = aFunctor(aNode->mValue);
+    if (result) {
+      return result;
+    }
+    result = avlFirstThat(aNode->mRight,aFunctor);
+  }
+  return result;
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void* 
+nsAVLTree::FirstThat(nsAVLNodeFunctor& aFunctor) const{
+  return ::avlFirstThat(mRoot,aFunctor);
+}
+

mozilla/parser/htmlparser/src/nsAVLTree.h

@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsAVLTree_h___
+#define nsAVLTree_h___
+
+
+#include "nscore.h"
+
+
+enum eAVLStatus {eAVL_unknown,eAVL_ok,eAVL_fail,eAVL_duplicate};
+
+
+struct nsAVLNode;
+
+/**
+ * 
+ * @update	gess12/26/98
+ * @param anObject1 is the first object to be compared
+ * @param anObject2 is the second object to be compared
+ * @return -1,0,1 if object1 is less, equal, greater than object2
+ */
+class NS_COM nsAVLNodeComparitor {
+public:
+  virtual PRInt32 operator()(void* anItem1,void* anItem2)=0;
+}; 
+
+class NS_COM nsAVLNodeFunctor {
+public:
+  virtual void* operator()(void* anItem)=0;
+};
+
+class NS_COM nsAVLTree {
+public:
+              nsAVLTree(nsAVLNodeComparitor& aComparitor, nsAVLNodeFunctor* aDeallocator);
+              ~nsAVLTree(void);
+
+  PRBool      operator==(const nsAVLTree& aOther) const;
+  PRInt32     GetCount(void) const {return mCount;}
+
+              //main functions...
+  eAVLStatus  AddItem(void* anItem);
+  eAVLStatus  RemoveItem(void* anItem);
+  void*       FindItem(void* anItem) const;
+  void        ForEach(nsAVLNodeFunctor& aFunctor) const;
+  void        ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const;
+  void*       FirstThat(nsAVLNodeFunctor& aFunctor) const;
+
+protected: 
+
+  nsAVLNode*  mRoot;
+  PRInt32     mCount;
+  nsAVLNodeComparitor&  mComparitor;
+  nsAVLNodeFunctor*     mDeallocator;
+};
+
+
+#endif /* nsAVLTree_h___ */
+

mozilla/string/obsolete/nsStr.cpp

@@ -0,0 +1,717 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL. 
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+  
+/******************************************************************************************
+  MODULE NOTES:
+
+  This file contains the nsStr data structure.
+  This general purpose buffer management class is used as the basis for our strings.
+  It's benefits include:
+    1. An efficient set of library style functions for manipulating nsStrs
+    2. Support for 1 and 2 byte character strings (which can easily be increased to n)
+    3. Unicode awareness and interoperability.
+
+*******************************************************************************************/
+
+#include "nsStr.h"
+#include "bufferRoutines.h"
+#include "stdio.h"  //only used for printf
+#include "nsCRT.h"
+#include "nsDeque.h"
+
+ 
+//static const char* kCallFindChar =  "For better performance, call FindChar() for targets whose length==1.";
+//static const char* kCallRFindChar = "For better performance, call RFindChar() for targets whose length==1.";
+
+static const PRUnichar gCommonEmptyBuffer[1] = {0};
+
+/**
+ * This method initializes all the members of the nsStr structure 
+ *
+ * @update	gess10/30/98
+ * @param 
+ * @return
+ */
+void nsStr::Initialize(nsStr& aDest,eCharSize aCharSize) {
+  aDest.mStr=(char*)gCommonEmptyBuffer;
+  aDest.mLength=0;
+  aDest.mCapacity=0;
+  aDest.mCharSize=aCharSize;
+  aDest.mOwnsBuffer=0;
+}
+
+/**
+ * This method initializes all the members of the nsStr structure
+ * @update	gess10/30/98
+ * @param 
+ * @return
+ */
+void nsStr::Initialize(nsStr& aDest,char* aCString,PRUint32 aCapacity,PRUint32 aLength,eCharSize aCharSize,PRBool aOwnsBuffer){
+  aDest.mStr=(aCString) ? aCString : (char*)gCommonEmptyBuffer;
+  aDest.mLength=aLength;
+  aDest.mCapacity=aCapacity;
+  aDest.mCharSize=aCharSize;
+  aDest.mOwnsBuffer=aOwnsBuffer;
+}
+
+
+/**
+ * This member destroys the memory buffer owned by an nsStr object (if it actually owns it)
+ * @update	gess10/30/98
+ * @param 
+ * @return
+ */
+void nsStr::Destroy(nsStr& aDest) {
+  if((aDest.mStr) && (aDest.mStr!=(char*)gCommonEmptyBuffer)) {
+    Free(aDest);
+  }
+}
+
+
+/**
+ * This method gets called when the internal buffer needs
+ * to grow to a given size. The original contents are not preserved.
+ * @update  gess 3/30/98
+ * @param   aNewLength -- new capacity of string in charSize units
+ * @return  void
+ */
+PRBool nsStr::EnsureCapacity(nsStr& aString,PRUint32 aNewLength) {
+  PRBool result=PR_TRUE;
+  if(aNewLength>aString.mCapacity) {
+    result=Realloc(aString,aNewLength);
+    if(aString.mStr)
+      AddNullTerminator(aString);
+  }
+  return result;
+}
+
+/**
+ * This method gets called when the internal buffer needs
+ * to grow to a given size. The original contents ARE preserved.
+ * @update  gess 3/30/98
+ * @param   aNewLength -- new capacity of string in charSize units
+ * @return  void
+ */
+PRBool nsStr::GrowCapacity(nsStr& aDest,PRUint32 aNewLength) {
+  PRBool result=PR_TRUE;
+  if(aNewLength>aDest.mCapacity) {
+    nsStr theTempStr;
+    nsStr::Initialize(theTempStr,aDest.mCharSize);
+
+    result=EnsureCapacity(theTempStr,aNewLength);
+    if(result) {
+      if(aDest.mLength) {
+        Append(theTempStr,aDest,0,aDest.mLength);        
+      } 
+      Free(aDest);
+      aDest.mStr = theTempStr.mStr;
+      theTempStr.mStr=0; //make sure to null this out so that you don't lose the buffer you just stole...
+      aDest.mLength=theTempStr.mLength;
+      aDest.mCapacity=theTempStr.mCapacity;
+      aDest.mOwnsBuffer=theTempStr.mOwnsBuffer;
+    }
+  }
+  return result;
+}
+
+/**
+ * Replaces the contents of aDest with aSource, up to aCount of chars.
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr that gets changed.
+ * @param   aSource is where chars are copied from
+ * @param   aCount is the number of chars copied from aSource
+ */
+void nsStr::Assign(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount){
+  if(&aDest!=&aSource){
+    Truncate(aDest,0);
+    Append(aDest,aSource,anOffset,aCount);
+  }
+}
+
+/**
+ * This method appends the given nsStr to this one. Note that we have to 
+ * pay attention to the underlying char-size of both structs.
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr to be manipulated
+ * @param   aSource is where char are copied from
+ * @aCount  is the number of bytes to be copied 
+ */
+void nsStr::Append(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount){
+  if(anOffset<aSource.mLength){
+    PRUint32 theRealLen=(aCount<0) ? aSource.mLength : MinInt(aCount,aSource.mLength);
+    PRUint32 theLength=(anOffset+theRealLen<aSource.mLength) ? theRealLen : (aSource.mLength-anOffset);
+    if(0<theLength){
+      
+      PRBool isBigEnough=PR_TRUE;
+      if(aDest.mLength+theLength > aDest.mCapacity) {
+        isBigEnough=GrowCapacity(aDest,aDest.mLength+theLength);
+      }
+
+      if(isBigEnough) {
+        //now append new chars, starting at offset
+        (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDest.mLength,aSource.mStr,anOffset,theLength);
+
+        aDest.mLength+=theLength;
+        AddNullTerminator(aDest);
+      }
+    }
+  }
+}
+
+
+/**
+ * This method inserts up to "aCount" chars from a source nsStr into a dest nsStr.
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr that gets changed
+ * @param   aDestOffset is where in aDest the insertion is to occur
+ * @param   aSource is where chars are copied from
+ * @param   aSrcOffset is where in aSource chars are copied from
+ * @param   aCount is the number of chars from aSource to be inserted into aDest
+ */
+void nsStr::Insert( nsStr& aDest,PRUint32 aDestOffset,const nsStr& aSource,PRUint32 aSrcOffset,PRInt32 aCount){
+  //there are a few cases for insert:
+  //  1. You're inserting chars into an empty string (assign)
+  //  2. You're inserting onto the end of a string (append)
+  //  3. You're inserting onto the 1..n-1 pos of a string (the hard case).
+  if(0<aSource.mLength){
+    if(aDest.mLength){
+      if(aDestOffset<aDest.mLength){
+        PRInt32 theRealLen=(aCount<0) ? aSource.mLength : MinInt(aCount,aSource.mLength);
+        PRInt32 theLength=(aSrcOffset+theRealLen<aSource.mLength) ? theRealLen : (aSource.mLength-aSrcOffset);
+
+        if(aSrcOffset<aSource.mLength) {
+            //here's the only new case we have to handle. 
+            //chars are really being inserted into our buffer...
+
+          if(aDest.mLength+theLength > aDest.mCapacity) {
+            nsStr theTempStr;
+            nsStr::Initialize(theTempStr,aDest.mCharSize);
+
+            PRBool isBigEnough=EnsureCapacity(theTempStr,aDest.mLength+theLength);  //grow the temp buffer to the right size
+
+            if(isBigEnough) {
+              if(aDestOffset) {
+                Append(theTempStr,aDest,0,aDestOffset); //first copy leftmost data...
+              } 
+              
+              Append(theTempStr,aSource,0,aSource.mLength); //next copy inserted (new) data
+            
+              PRUint32 theRemains=aDest.mLength-aDestOffset;
+              if(theRemains) {
+                Append(theTempStr,aDest,aDestOffset,theRemains); //next copy rightmost data
+              }
+
+              Free(aDest);
+              aDest.mStr = theTempStr.mStr;
+              theTempStr.mStr=0; //make sure to null this out so that you don't lose the buffer you just stole...
+              aDest.mCapacity=theTempStr.mCapacity;
+              aDest.mOwnsBuffer=theTempStr.mOwnsBuffer;
+            }
+
+          }
+
+          else {
+              //shift the chars right by theDelta...
+            (*gShiftChars[aDest.mCharSize][KSHIFTRIGHT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
+      
+            //now insert new chars, starting at offset
+            (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDestOffset,aSource.mStr,aSrcOffset,theLength);
+          }
+
+            //finally, make sure to update the string length...
+          aDest.mLength+=theLength;
+          AddNullTerminator(aDest);
+
+        }//if
+        //else nothing to do!
+      }
+      else Append(aDest,aSource,0,aCount);
+    }
+    else Append(aDest,aSource,0,aCount);
+  }
+}
+
+
+/**
+ * This method deletes up to aCount chars from aDest
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr to be manipulated
+ * @param   aDestOffset is where in aDest deletion is to occur
+ * @param   aCount is the number of chars to be deleted in aDest
+ */
+void nsStr::Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount){
+  if(aDestOffset<aDest.mLength){
+
+    PRUint32 theDelta=aDest.mLength-aDestOffset;
+    PRUint32 theLength=(theDelta<aCount) ? theDelta : aCount;
+
+    if(aDestOffset+theLength<aDest.mLength) {
+
+      //if you're here, it means we're cutting chars out of the middle of the string...
+      //so shift the chars left by theLength...
+      (*gShiftChars[aDest.mCharSize][KSHIFTLEFT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
+      aDest.mLength-=theLength;
+      AddNullTerminator(aDest);
+    }
+    else Truncate(aDest,aDestOffset);
+  }//if
+}
+
+/**
+ * This method truncates the given nsStr at given offset
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr to be truncated
+ * @param   aDestOffset is where in aDest truncation is to occur
+ */
+void nsStr::Truncate(nsStr& aDest,PRUint32 aDestOffset){
+  if(aDestOffset<aDest.mLength){
+    aDest.mLength=aDestOffset;
+    AddNullTerminator(aDest);
+  }
+}
+
+
+/**
+ * This method forces the given string to upper or lowercase
+ * @update	gess1/7/99
+ * @param   aDest is the string you're going to change
+ * @param   aToUpper: if TRUE, then we go uppercase, otherwise we go lowercase
+ * @return
+ */
+void nsStr::ChangeCase(nsStr& aDest,PRBool aToUpper) {
+  // somehow UnicharUtil return failed, fallback to the old ascii only code
+  gCaseConverters[aDest.mCharSize](aDest.mStr,aDest.mLength,aToUpper);
+}
+
+/**
+ * 
+ * @update	gess1/7/99
+ * @param 
+ * @return
+ */
+void nsStr::Trim(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing){
+
+  if((aDest.mLength>0) && aSet){
+    PRInt32 theIndex=-1;
+    PRInt32 theMax=aDest.mLength;
+    PRInt32 theSetLen=nsCRT::strlen(aSet);
+
+    if(aEliminateLeading) {
+      while(++theIndex<=theMax) {
+        PRUnichar theChar=GetCharAt(aDest,theIndex);
+        PRInt32 thePos=gFindChars[eOneByte](aSet,theSetLen,0,theChar,PR_FALSE);
+        if(kNotFound==thePos)
+          break;
+      }
+      if(0<theIndex) {
+        if(theIndex<theMax) {
+          Delete(aDest,0,theIndex);
+        }
+        else Truncate(aDest,0);
+      }
+    }
+
+    if(aEliminateTrailing) {
+      theIndex=aDest.mLength;
+      PRInt32 theNewLen=theIndex;
+      while(--theIndex>0) {
+        PRUnichar theChar=GetCharAt(aDest,theIndex);  //read at end now...
+        PRInt32 thePos=gFindChars[eOneByte](aSet,theSetLen,0,theChar,PR_FALSE);
+        if(kNotFound<thePos) 
+          theNewLen=theIndex;
+        else break;
+      }
+      if(theNewLen<theMax) {
+        Truncate(aDest,theNewLen);
+      }
+    }
+
+  }
+}
+
+/**
+ * 
+ * @update	gess1/7/99
+ * @param 
+ * @return
+ */
+void nsStr::CompressSet(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing){
+  Trim(aDest,aSet,aEliminateLeading,aEliminateTrailing);
+  PRUint32 aNewLen=gCompressChars[aDest.mCharSize](aDest.mStr,aDest.mLength,aSet);
+  aDest.mLength=aNewLen;
+}
+
+
+/**
+ * 
+ * @update	gess1/7/99
+ * @param 
+ * @return
+ */
+void nsStr::StripChars(nsStr& aDest,const char* aSet){
+  if((0<aDest.mLength) && (aSet)) {
+    PRUint32 aNewLen=gStripChars[aDest.mCharSize](aDest.mStr,aDest.mLength,aSet);
+    aDest.mLength=aNewLen;
+  }
+}
+
+
+  /**************************************************************
+    Searching methods...
+   **************************************************************/
+
+
+/**
+ *  This searches aDest for a given substring
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   aTarget is the substring you're trying to find.
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::FindSubstr(const nsStr& aDest,const nsStr& aTarget, PRBool aIgnoreCase,PRInt32 anOffset) {
+  // NS_PRECONDITION(aTarget.mLength!=1,kCallFindChar);
+
+  PRInt32 result=kNotFound;
+  
+  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
+    PRInt32 theMax=aDest.mLength-aTarget.mLength;
+    PRInt32 index=(0<=anOffset) ? anOffset : 0;
+    
+    if((aDest.mLength>=aTarget.mLength) && (aTarget.mLength>0) && (index>=0)){
+      PRInt32 theTargetMax=aTarget.mLength;
+      while(index<=theMax) {
+        PRInt32 theSubIndex=-1;
+        PRBool  matches=PR_TRUE;
+        while((++theSubIndex<theTargetMax) && (matches)){
+          PRUnichar theChar=(aIgnoreCase) ? nsCRT::ToLower(GetCharAt(aDest,index+theSubIndex)) : GetCharAt(aDest,index+theSubIndex);
+          PRUnichar theTargetChar=(aIgnoreCase) ? nsCRT::ToLower(GetCharAt(aTarget,theSubIndex)) : GetCharAt(aTarget,theSubIndex);
+          matches=PRBool(theChar==theTargetChar);
+        }
+        if(matches) { 
+          result=index;
+          break;
+        }
+        index++;
+      } //while
+    }//if
+  }//if
+  return result;
+}
+
+
+/**
+ *  This searches aDest for a given character 
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   char is the character you're trying to find.
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::FindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset) {
+  PRInt32 result=kNotFound;
+  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
+    PRUint32 index=(0<=anOffset) ? (PRUint32)anOffset : 0;
+    result=gFindChars[aDest.mCharSize](aDest.mStr,aDest.mLength,index,aChar,aIgnoreCase);
+  }
+  return result;
+}
+
+
+/**
+ *  This searches aDest for a character found in aSet. 
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   aSet contains a list of chars to be searched for
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::FindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset) {
+  //NS_PRECONDITION(aSet.mLength!=1,kCallFindChar);
+
+  PRInt32 index=(0<=anOffset) ? anOffset-1 : -1;
+  PRInt32 thePos;
+
+    //Note that the search is inverted here. We're scanning aDest, one char at a time
+    //but doing the search against the given set. That's why we use 0 as the offset below.
+  if((0<aDest.mLength) && (0<aSet.mLength)){
+    while(++index<(PRInt32)aDest.mLength) {
+      PRUnichar theChar=GetCharAt(aDest,index);
+      thePos=gFindChars[aSet.mCharSize](aSet.mStr,aSet.mLength,0,theChar,aIgnoreCase);
+      if(kNotFound!=thePos)
+        return index;
+    } //while
+  }
+  return kNotFound;
+}
+
+  /**************************************************************
+    Reverse Searching methods...
+   **************************************************************/
+
+
+/**
+ *  This searches aDest (in reverse) for a given substring
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   aTarget is the substring you're trying to find.
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search (counting from left)
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::RFindSubstr(const nsStr& aDest,const nsStr& aTarget, PRBool aIgnoreCase,PRInt32 anOffset) {
+  //NS_PRECONDITION(aTarget.mLength!=1,kCallRFindChar);
+
+  PRInt32 result=kNotFound;
+
+  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
+    PRInt32 index=(0<=anOffset) ? anOffset : aDest.mLength-1;
+
+    if((aDest.mLength>=aTarget.mLength) && (aTarget.mLength>0) && (index>=0)){
+
+      nsStr theCopy;
+      nsStr::Initialize(theCopy,eOneByte);
+      nsStr::Assign(theCopy,aTarget,0,aTarget.mLength);
+      if(aIgnoreCase){
+        nsStr::ChangeCase(theCopy,PR_FALSE); //force to lowercase
+      }
+    
+      PRInt32   theTargetMax=theCopy.mLength;
+      while(index>=0) {
+        PRInt32 theSubIndex=-1;
+        PRBool  matches=PR_FALSE;
+        if(index+theCopy.mLength<=aDest.mLength) {
+          matches=PR_TRUE;
+          while((++theSubIndex<theTargetMax) && (matches)){
+            PRUnichar theDestChar=(aIgnoreCase) ? nsCRT::ToLower(GetCharAt(aDest,index+theSubIndex)) : GetCharAt(aDest,index+theSubIndex);
+            PRUnichar theTargetChar=GetCharAt(theCopy,theSubIndex);
+            matches=PRBool(theDestChar==theTargetChar);
+          } //while
+        } //if
+        if(matches) {
+          result=index;
+          break;
+        }
+        index--;
+      } //while
+      nsStr::Destroy(theCopy);
+    }//if
+  }//if
+  return result;
+}
+ 
+
+/**
+ *  This searches aDest (in reverse) for a given character 
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   char is the character you're trying to find.
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::RFindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset) {
+  PRInt32 result=kNotFound;
+  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
+    PRUint32 index=(0<=anOffset) ? anOffset : aDest.mLength-1;
+    result=gRFindChars[aDest.mCharSize](aDest.mStr,aDest.mLength,index,aChar,aIgnoreCase);
+  }
+  return result;
+}
+
+/**
+ *  This searches aDest (in reverese) for a character found in aSet. 
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   aSet contains a list of chars to be searched for
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset) {
+  //NS_PRECONDITION(aSet.mLength!=1,kCallRFindChar);
+
+  PRInt32 index=(0<=anOffset) ? anOffset : aDest.mLength;
+  PRInt32 thePos;
+
+    //note that the search is inverted here. We're scanning aDest, one char at a time
+    //but doing the search against the given set. That's why we use 0 as the offset below.
+  if(0<aDest.mLength) {
+    while(--index>=0) {
+      PRUnichar theChar=GetCharAt(aDest,index);
+      thePos=gFindChars[aSet.mCharSize](aSet.mStr,aSet.mLength,0,theChar,aIgnoreCase);
+      if(kNotFound!=thePos)
+        return index;
+    } //while
+  }
+  return kNotFound;
+}
+
+
+/**
+ * Compare source and dest strings, up to an (optional max) number of chars
+ * @param   aDest is the first str to compare
+ * @param   aSource is the second str to compare
+ * @param   aCount -- if (-1), then we use length of longer string; if (0<aCount) then it gives the max # of chars to compare
+ * @param   aIgnorecase tells us whether to search with case sensitivity
+ * @return  aDest<aSource=-1;aDest==aSource==0;aDest>aSource=1
+ */
+PRInt32 nsStr::Compare(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase) {
+  PRInt32 result=0;
+
+  if(aCount) {
+    PRInt32 minlen=(aSource.mLength<aDest.mLength) ? aSource.mLength : aDest.mLength;
+
+    if(0==minlen) {
+      if ((aDest.mLength == 0) && (aSource.mLength == 0))
+        return 0;
+      if (aDest.mLength == 0)
+        return -1;
+      return 1;
+    }
+
+    PRInt32 maxlen=(aSource.mLength<aDest.mLength) ? aDest.mLength : aSource.mLength;
+    aCount = (aCount<0) ? maxlen : MinInt(aCount,maxlen);
+    result=(*gCompare[aDest.mCharSize][aSource.mCharSize])(aDest.mStr,aSource.mStr,aCount,aIgnoreCase);
+  }
+  return result;
+}
+
+//----------------------------------------------------------------------------------------
+
+PRBool nsStr::Alloc(nsStr& aDest,PRUint32 aCount) {
+
+  static int mAllocCount=0;
+  mAllocCount++;
+
+  //we're given the acount value in charunits; now scale up to next multiple.
+  PRUint32	theNewCapacity=kDefaultStringSize;
+  while(theNewCapacity<aCount){ 
+		theNewCapacity<<=1;
+  }
+
+  aDest.mCapacity=theNewCapacity++;
+  PRUint32 theSize=(theNewCapacity<<aDest.mCharSize);
+  aDest.mStr = (char*)nsAllocator::Alloc(theSize);
+
+  PRBool result=PR_FALSE;
+  if(aDest.mStr) {
+    aDest.mOwnsBuffer=1;
+    result=PR_TRUE;
+  }
+  return result;
+}
+
+PRBool nsStr::Free(nsStr& aDest){
+  if(aDest.mStr){
+    if(aDest.mOwnsBuffer){
+      nsAllocator::Free(aDest.mStr);
+    }
+    aDest.mStr=0;
+    aDest.mOwnsBuffer=0;
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+PRBool nsStr::Realloc(nsStr& aDest,PRUint32 aCount){
+
+  nsStr temp;
+  memcpy(&temp,&aDest,sizeof(aDest));
+
+  PRBool result=Alloc(temp,aCount);
+  if(result) {
+    Free(aDest);
+    aDest.mStr=temp.mStr;
+    aDest.mCapacity=temp.mCapacity;
+    aDest.mOwnsBuffer=temp.mOwnsBuffer;
+  }
+  return result;
+}
+
+//----------------------------------------------------------------------------------------
+
+CBufDescriptor::CBufDescriptor(char* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
+  mBuffer=aString;
+  mCharSize=eOneByte;
+  mStackBased=aStackBased;
+  mIsConst=PR_FALSE;
+  mLength=mCapacity=0;
+  if(aString && aCapacity>1) {
+    mCapacity=aCapacity-1;
+    mLength=(-1==aLength) ? strlen(aString) : aLength;
+    if(mLength>PRInt32(mCapacity))
+      mLength=mCapacity;
+  }
+}
+
+CBufDescriptor::CBufDescriptor(const char* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
+  mBuffer=(char*)aString;
+  mCharSize=eOneByte;
+  mStackBased=aStackBased;
+  mIsConst=PR_TRUE;
+  mLength=mCapacity=0;
+  if(aString && aCapacity>1) {
+    mCapacity=aCapacity-1;
+    mLength=(-1==aLength) ? strlen(aString) : aLength;
+    if(mLength>PRInt32(mCapacity))
+      mLength=mCapacity;
+  }
+}
+
+
+CBufDescriptor::CBufDescriptor(PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
+  mBuffer=(char*)aString;
+  mCharSize=eTwoByte;
+  mStackBased=aStackBased;
+  mLength=mCapacity=0;
+  mIsConst=PR_FALSE;
+  if(aString && aCapacity>1) {
+    mCapacity=aCapacity-1;
+    mLength=(-1==aLength) ? nsCRT::strlen(aString) : aLength;
+    if(mLength>PRInt32(mCapacity))
+      mLength=mCapacity;
+  }
+}
+
+CBufDescriptor::CBufDescriptor(const PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
+  mBuffer=(char*)aString;
+  mCharSize=eTwoByte;
+  mStackBased=aStackBased;
+  mLength=mCapacity=0;
+  mIsConst=PR_TRUE;
+  if(aString && aCapacity>1) {
+    mCapacity=aCapacity-1;
+    mLength=(-1==aLength) ? nsCRT::strlen(aString) : aLength;
+    if(mLength>PRInt32(mCapacity))
+      mLength=mCapacity;
+  }
+}
+
+//----------------------------------------------------------------------------------------
+
+

mozilla/string/obsolete/nsStr.h

@@ -0,0 +1,450 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+/***********************************************************************
+  MODULE NOTES:
+
+    1. There are two philosophies to building string classes:
+        A. Hide the underlying buffer & offer API's allow indirect iteration
+        B. Reveal underlying buffer, risk corruption, but gain performance
+        
+       We chose the option B for performance reasons. 
+
+    2  Our internal buffer always holds capacity+1 bytes.
+
+    The nsStr struct is a simple structure (no methods) that contains
+    the necessary info to be described as a string. This simple struct
+    is manipulated by the static methods provided in this class. 
+    (Which effectively makes this a library that works on structs).
+
+    There are also object-based versions called nsString and nsAutoString
+    which use nsStr but makes it look at feel like an object. 
+
+ ***********************************************************************/
+
+/***********************************************************************
+  ASSUMPTIONS:
+
+    1. nsStrings and nsAutoString are always null terminated. 
+    2. If you try to set a null char (via SetChar()) a new length is set
+    3. nsCStrings can be upsampled into nsString without data loss
+    4. Char searching is faster than string searching. Use char interfaces
+       if your needs will allow it.
+    5. It's easy to use the stack for nsAutostring buffer storage (fast too!).
+       See the CBufDescriptor class in this file.
+    6. It's ONLY ok to provide non-null-terminated buffers to Append() and Insert()
+       provided you specify a 0<n value for the optional count argument.
+    7. Downsampling from nsString to nsCString is lossy -- avoid it if possible!
+    8. Calls to ToNewCString() and ToNewUnicode() should be matched with calls to Recycle().
+
+ ***********************************************************************/
+
+
+/**********************************************************************************
+  
+ AND NOW FOR SOME GENERAL DOCUMENTATION ON STRING USAGE...
+
+    The fundamental datatype in the string library is nsStr. It's a structure that
+    provides the buffer storage and meta-info. It also provides a C-style library
+    of functions for direct manipulation (for those of you who prefer K&R to Bjarne). 
+
+    Here's a diagram of the class hierarchy: 
+
+      nsStr
+        |___nsString
+        |      |
+        |      ------nsAutoString
+        |
+        |___nsCString
+               |
+               ------nsCAutoString
+
+    Why so many string classes? The 4 variants give you the control you need to 
+    determine the best class for your purpose. There are 2 dimensions to this 
+    flexibility: 1) stack vs. heap; and 2) 1-byte chars vs. 2-byte chars.
+
+    Note: While nsAutoString and nsCAutoString begin life using stack-based storage,
+          they may not stay that way. Like all nsString classes, autostrings will
+          automatically grow to contain the data you provide. When autostrings
+          grow beyond their intrinsic buffer, they switch to heap based allocations.
+          (We avoid alloca to avoid considerable platform difficulties; see the 
+           GNU documentation for more details).
+
+    I should also briefly mention that all the string classes use a "memory agent" 
+    object to perform memory operations. This class proxies the standard nsAllocator
+    for actual memory calls, but knows the structure of nsStr making heap operations
+    more localized.
+    
+
+  CHOOSING A STRING CLASS:
+
+    In order to choose a string class for you purpose, use this handy table:
+
+                        heap-based    stack-based
+                    -----------------------------------
+        ascii data  |   nsCString     nsCAutoString   |
+                    |----------------------------------
+      unicode data  |    nsString      nsAutoString   |
+                    ----------------------------------- 
+    
+  
+    Note: The i18n folks will stenuously object if we get too carried away with the
+          use of nsCString's that pass interface boundaries. Try to limit your
+          use of these to external interfaces that demand them, or for your own
+          private purposes in cases where they'll never be seen by humans. 
+
+    
+  PERFORMANCE CONSIDERATIONS:
+
+    Here are a few tricks to know in order to get better string performance: 
+    
+      1) Try to limit conversions between ascii and unicode; By sticking with nsString
+         wherever possible your code will be i18n-compliant.
+
+
+      2) Preallocating your string buffer cuts down trips to the allocator. So if you
+         have need for an arbitrarily large buffer, pre-size it like this:
+
+         {
+           nsString mBuffer;
+           mBuffer.SetCapacity(aReasonableSize);
+         }
+
+      3) Allocating nsAutoString or nsCAutoString on the heap is memory inefficient
+         (after all, the whole point is to avoid a heap allocation of the buffer).
+
+
+      4) Consider using an autoString to write into your arbitrarily-sized stack buffers, rather
+         than it's own buffers.
+
+         For example, let's say you're going to call printf() to emit pretty-printed debug output 
+         of your object. You know from experience that the pretty-printed version of your object 
+         exceeds the capacity of an autostring. Ignoring memory considerations, you could simply 
+         use nsCString, appending the stringized version of each of your class's data members. 
+         This will probably result in calls to the heap manager. 
+
+         But there's a way to do this without necessarily having to call the heap manager.
+         All you do is declare a stack based buffer and instruct nsCString to use that instead 
+         of it's own internal buffer by using the CBufDescriptor class:
+         
+         {
+           char theBuffer[256];
+           CBufDescritor theBufDecriptor( theBuffer, PR_TRUE, sizeof(theBuffer), 0);
+           nsCAutoString s3( theBufDescriptor );
+           s3="HELLO, my name is inigo montoya, you killed my father, prepare to die!.";
+         }
+
+         The assignment statment to s3 will cause the given string to be written to your
+         stack-based buffer via the normal nsString/nsCString interfaces. Cool, huh?  
+         Note however that just like any other nsStringXXX use, if you write more data 
+         than will fit in the buffer, a visit to the heap manager will be in order. 
+     
+
+ **********************************************************************************/
+
+
+#ifndef _nsStr
+#define _nsStr
+
+#include "nscore.h"
+#include "nsIAllocator.h"
+#include <string.h>
+
+//----------------------------------------------------------------------------------------
+
+enum  eCharSize {eOneByte=0,eTwoByte=1};
+#define kDefaultCharSize eTwoByte
+#define kRadix10        (10)
+#define kRadix16        (16)
+#define kAutoDetect     (100)
+#define kRadixUnknown   (kAutoDetect+1)
+const   PRInt32 kDefaultStringSize = 64;
+const   PRInt32 kNotFound = -1;
+
+
+//----------------------------------------------------------------------------------------
+
+class NS_COM CBufDescriptor {
+public:
+  CBufDescriptor(char* aString,           PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
+  CBufDescriptor(const char* aString,     PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
+  CBufDescriptor(PRUnichar* aString,      PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
+  CBufDescriptor(const PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
+
+  char*     mBuffer;
+  eCharSize mCharSize;
+  PRUint32  mCapacity;
+  PRInt32   mLength;
+  PRBool    mStackBased;
+  PRBool    mIsConst;
+};
+
+//----------------------------------------------------------------------------------------
+
+
+struct NS_COM nsStr {  
+
+//----------------------------------------------------------------------------------------
+
+  nsStr() {
+    MOZ_COUNT_CTOR(nsStr);
+  }
+
+  ~nsStr() {
+    MOZ_COUNT_DTOR(nsStr);
+  }
+
+ /**
+  * This method initializes an nsStr for use
+  *
+  * @update	gess 01/04/99
+  * @param  aString is the nsStr to be initialized
+  * @param  aCharSize tells us the requested char size (1 or 2 bytes)
+  */
+  static void Initialize(nsStr& aDest,eCharSize aCharSize);
+
+ /**
+  * This method initializes an nsStr for use
+  *
+  * @update	gess 01/04/99
+  * @param  aString is the nsStr to be initialized
+  * @param  aCharSize tells us the requested char size (1 or 2 bytes)
+  */
+  static void Initialize(nsStr& aDest,char* aCString,PRUint32 aCapacity,PRUint32 aLength,eCharSize aCharSize,PRBool aOwnsBuffer);
+
+ /**
+  * This method destroys the given nsStr, and *MAY* 
+  * deallocate it's memory depending on the setting
+  * of the internal mOwnsBUffer flag.
+  *
+  * @update	gess 01/04/99
+  * @param  aString is the nsStr to be manipulated
+  * @param  anAgent is the allocator to be used to the nsStr
+  */
+  static void Destroy(nsStr& aDest); 
+
+ /**
+  * These methods are where memory allocation/reallocation occur. 
+  *
+  * @update	gess 01/04/99
+  * @param  aString is the nsStr to be manipulated
+  * @param  anAgent is the allocator to be used on the nsStr
+  * @return  
+  */
+  static PRBool EnsureCapacity(nsStr& aString,PRUint32 aNewLength);
+  static PRBool GrowCapacity(nsStr& aString,PRUint32 aNewLength);
+
+ /**
+  * These methods are used to append content to the given nsStr
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be appended to
+  * @param  aSource is the buffer to be copied from
+  * @param  anOffset tells us where in source to start copying
+  * @param  aCount tells us the (max) # of chars to copy
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Append(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount);
+
+ /**
+  * These methods are used to assign contents of a source string to dest string
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be appended to
+  * @param  aSource is the buffer to be copied from
+  * @param  anOffset tells us where in source to start copying
+  * @param  aCount tells us the (max) # of chars to copy
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Assign(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount);
+
+ /**
+  * These methods are used to insert content from source string to the dest nsStr
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be appended to
+  * @param  aDestOffset tells us where in dest to start insertion
+  * @param  aSource is the buffer to be copied from
+  * @param  aSrcOffset tells us where in source to start copying
+  * @param  aCount tells us the (max) # of chars to insert
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Insert( nsStr& aDest,PRUint32 aDestOffset,const nsStr& aSource,PRUint32 aSrcOffset,PRInt32 aCount);
+
+ /**
+  * This method deletes chars from the given str. 
+  * The given allocator may choose to resize the str as well.
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be deleted from
+  * @param  aDestOffset tells us where in dest to start deleting
+  * @param  aCount tells us the (max) # of chars to delete
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount);
+
+ /**
+  * This method is used to truncate the given string.
+  * The given allocator may choose to resize the str as well (but it's not likely).
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be appended to
+  * @param  aDestOffset tells us where in dest to start insertion
+  * @param  aSource is the buffer to be copied from
+  * @param  aSrcOffset tells us where in source to start copying
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Truncate(nsStr& aDest,PRUint32 aDestOffset);
+
+ /**
+  * This method is used to perform a case conversion on the given string
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be case shifted
+  * @param  toUpper tells us to go upper vs. lower
+  */
+  static void ChangeCase(nsStr& aDest,PRBool aToUpper);
+
+
+  /**
+   * This method trims chars (given in aSet) from the edges of given buffer 
+   *
+   * @update	gess 01/04/99
+   * @param   aDest is the buffer to be manipulated
+   * @param   aSet tells us which chars to remove from given buffer
+   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+   */
+  static void Trim(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing);
+  
+  /**
+   * This method compresses duplicate runs of a given char from the given buffer 
+   *
+   * @update	gess 01/04/99
+   * @param   aDest is the buffer to be manipulated
+   * @param   aSet tells us which chars to compress from given buffer
+   * @param   aChar is the replacement char
+   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+   */
+  static void CompressSet(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing);
+
+  /**
+   * This method removes all occurances of chars in given set from aDest 
+   *
+   * @update	gess 01/04/99
+   * @param   aDest is the buffer to be manipulated
+   * @param   aSet tells us which chars to compress from given buffer
+   * @param   aChar is the replacement char
+   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+   */
+  static void StripChars(nsStr& aDest,const char* aSet);
+
+  /**
+   * This method compares the data bewteen two nsStr's 
+   *
+   * @update	gess 01/04/99
+   * @param   aStr1 is the first buffer to be compared
+   * @param   aStr2 is the 2nd buffer to be compared
+   * @param   aCount is the number of chars to compare
+   * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+   * @return  -1,0,1 depending on <,==,>
+   */
+  static PRInt32  Compare(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase);
+
+ /**
+  * These methods scan the given string for 1 or more chars in a given direction
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be searched to
+  * @param  aSource (or aChar) is the substr we're looking to find
+  * @param  aIgnoreCase tells us whether to search in a case-sensitive manner
+  * @param  anOffset tells us where in the dest string to start searching
+  * @return the index of the source (substr) in dest, or -1 (kNotFound) if not found.
+  */
+  static PRInt32 FindSubstr(const nsStr& aDest,const nsStr& aSource, PRBool aIgnoreCase,PRInt32 anOffset);
+  static PRInt32 FindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset);
+  static PRInt32 FindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset);
+
+  static PRInt32 RFindSubstr(const nsStr& aDest,const nsStr& aSource, PRBool aIgnoreCase,PRInt32 anOffset);
+  static PRInt32 RFindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset);
+  static PRInt32 RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset);
+
+
+  PRUint32        mLength;
+  PRUint32        mCapacity;
+  eCharSize       mCharSize;
+  PRBool          mOwnsBuffer;
+
+  union { 
+    char*         mStr;
+    PRUnichar*    mUStr;
+  };
+
+private:
+  static PRBool Alloc(nsStr& aString,PRUint32 aCount);
+  static PRBool Realloc(nsStr& aString,PRUint32 aCount);
+  static PRBool Free(nsStr& aString);
+
+};
+
+/**************************************************************
+  A couple of tiny helper methods used in the string classes.
+ **************************************************************/
+
+inline PRInt32 MinInt(PRInt32 anInt1,PRInt32 anInt2){
+  return (anInt1<anInt2) ? anInt1 : anInt2;
+}
+
+inline PRInt32 MaxInt(PRInt32 anInt1,PRInt32 anInt2){
+  return (anInt1<anInt2) ? anInt2 : anInt1;
+}
+
+inline void AddNullTerminator(nsStr& aDest) {
+  if(eTwoByte==aDest.mCharSize) 
+    aDest.mUStr[aDest.mLength]=0;
+  else aDest.mStr[aDest.mLength]=0;
+}
+
+/**
+ * Return the given buffer to the heap manager. Calls allocator::Free()
+ * @return string length
+ */
+inline void Recycle( char* aBuffer) { nsAllocator::Free(aBuffer); }
+inline void Recycle( PRUnichar* aBuffer) { nsAllocator::Free(aBuffer); }
+
+/**
+* This method is used to access a given char in the given string
+*
+* @update	gess 01/04/99
+* @param  aDest is the nsStr to be appended to
+* @param  anIndex tells us where in dest to get the char from
+* @return the given char, or 0 if anIndex is out of range
+*/
+inline PRUnichar GetCharAt(const nsStr& aDest,PRUint32 anIndex){
+  if(anIndex<aDest.mLength)  {
+    return (eTwoByte==aDest.mCharSize) ? aDest.mUStr[anIndex] : aDest.mStr[anIndex];
+  }//if
+  return 0;
+}
+
+
+#endif
+

mozilla/string/obsolete/nsString.h

@@ -0,0 +1,747 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+/***********************************************************************
+  MODULE NOTES:
+
+  See nsStr.h for a more general description of string classes.
+
+  This version of the nsString class offers many improvements over the
+  original version:
+    1. Wide and narrow chars
+    2. Allocators
+    3. Much smarter autostrings
+    4. Subsumable strings
+ ***********************************************************************/
+
+
+#ifndef _nsCString_
+#define _nsCString_
+
+#include "nsString2.h"
+#include "prtypes.h"
+#include "nscore.h"
+#include <stdio.h>
+#include "nsStr.h"
+#include "nsIAtom.h"
+
+
+class NS_COM nsSubsumeCStr;
+
+class NS_COM nsCString : public nsStr {
+
+public: 
+
+  /**
+   * Default constructor. 
+   */
+  nsCString();
+
+  /**
+   * This constructor accepts an isolatin string
+   * @param   aCString is a ptr to a 1-byte cstr
+   */
+  nsCString(const char* aCString,PRInt32 aLength=-1);
+
+  /**
+   * This constructor accepts a unichar string
+   * @param   aCString is a ptr to a 2-byte cstr
+   */
+  nsCString(const PRUnichar* aString,PRInt32 aLength=-1);
+
+  /**
+   * This is a copy constructor that accepts an nsStr
+   * @param   reference to another nsCString
+   */
+  nsCString(const nsStr&);
+
+  /**
+   * This is our copy constructor 
+   * @param   reference to another nsCString
+   */
+  nsCString(const nsCString& aString);   
+
+  /**
+   * This constructor takes a subsumestr
+   * @param   reference to subsumestr
+   */
+  nsCString(nsSubsumeCStr& aSubsumeStr);   
+
+  /**
+   * Destructor
+   * 
+   */
+  virtual ~nsCString();    
+
+  /**
+   * Retrieve the length of this string
+   * @return string length
+   */
+  inline PRInt32 Length() const { return (PRInt32)mLength; }
+
+  /**
+   * Retrieve the size of this string
+   * @return string length
+   */
+  virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
+
+
+  /**
+   * Call this method if you want to force a different string capacity
+   * @update  gess7/30/98
+   * @param   aLength -- contains new length for mStr
+   * @return
+   */
+  void SetLength(PRUint32 aLength) { 
+    Truncate(aLength);
+  }
+
+  /**
+   * Sets the new length of the string.
+   * @param   aLength is new string length.
+   * @return  nada
+   */
+  void SetCapacity(PRUint32 aLength);
+  /**
+   * This method truncates this string to given length.
+   *
+   * @param   anIndex -- new length of string
+   * @return  nada
+   */
+  void Truncate(PRInt32 anIndex=0);
+
+
+  /**
+   *  Determine whether or not the characters in this
+   *  string are in sorted order.
+   *  
+   *  @return  TRUE if ordered.
+   */
+  PRBool IsOrdered(void) const;
+
+
+  /**
+   *  Determine whether or not this string has a length of 0
+   *  
+   *  @return  TRUE if empty.
+   */
+  PRBool IsEmpty(void) const {
+    return PRBool(0==mLength);
+  }
+
+  /**********************************************************************
+    Accessor methods...
+   *********************************************************************/
+
+
+   /**
+     * Retrieve const ptr to internal buffer; DO NOT TRY TO FREE IT!
+     */
+  const char* GetBuffer(void) const;
+
+
+   /**
+     * Get nth character.
+     */
+  PRUnichar operator[](PRUint32 anIndex) const;
+  PRUnichar CharAt(PRUint32 anIndex) const;
+  PRUnichar First(void) const;
+  PRUnichar Last(void) const;
+
+  PRBool SetCharAt(PRUnichar aChar,PRUint32 anIndex);
+
+
+  /**********************************************************************
+    String creation methods...
+   *********************************************************************/
+
+  /**
+   * Create a new string by appending given string to this
+   * @param   aString -- 2nd string to be appended
+   * @return  new string
+   */
+  nsSubsumeCStr operator+(const nsCString& aString);
+
+  /**
+   * create a new string by adding this to the given char*.
+   * @param   aCString is a ptr to cstring to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeCStr operator+(const char* aCString);
+
+
+  /**
+   * create a new string by adding this to the given char.
+   * @param   aChar is a char to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeCStr operator+(PRUnichar aChar);
+  nsSubsumeCStr operator+(char aChar);
+
+
+  /**********************************************************************
+    Lexomorphic transforms...
+   *********************************************************************/
+
+  /**
+   * Converts chars in this to lowercase
+   * @update  gess 7/27/98
+   */
+  void ToLowerCase();
+
+
+  /**
+   * Converts chars in this to lowercase, and
+   * stores them in aOut
+   * @update  gess 7/27/98
+   * @param   aOut is a string to contain result
+   */
+  void ToLowerCase(nsCString& aString) const;
+
+  /**
+   * Converts chars in this to uppercase
+   * @update  gess 7/27/98
+   */
+  void ToUpperCase();
+
+  /**
+   * Converts chars in this to lowercase, and
+   * stores them in a given output string
+   * @update  gess 7/27/98
+   * @param   aOut is a string to contain result
+   */
+  void ToUpperCase(nsCString& aString) const;
+
+
+  /**
+   *  This method is used to remove all occurances of the
+   *  characters found in aSet from this string.
+   *  
+   *  @param  aSet -- characters to be cut from this
+   *  @return *this 
+   */
+  nsCString& StripChars(const char* aSet);
+  nsCString& StripChar(char aChar);
+
+  /**
+   *  This method strips whitespace throughout the string
+   *  
+   *  @return  this
+   */
+  nsCString& StripWhitespace();
+
+  /**
+   *  swaps occurence of 1 string for another
+   *  
+   *  @return  this
+   */
+  nsCString& ReplaceChar(PRUnichar aOldChar,PRUnichar aNewChar);
+  nsCString& ReplaceChar(const char* aSet,PRUnichar aNewChar);
+
+  PRInt32 CountChar(PRUnichar aChar);
+
+  /**
+   *  This method trims characters found in aTrimSet from
+   *  either end of the underlying string.
+   *  
+   *  @param   aTrimSet -- contains chars to be trimmed from
+   *           both ends
+   *  @return  this
+   */
+  nsCString& Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**
+   *  This method strips whitespace from string.
+   *  You can control whether whitespace is yanked from
+   *  start and end of string as well.
+   *  
+   *  @param   aEliminateLeading controls stripping of leading ws
+   *  @param   aEliminateTrailing controls stripping of trailing ws
+   *  @return  this
+   */
+  nsCString& CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**
+   *  This method strips whitespace from string.
+   *  You can control whether whitespace is yanked from
+   *  start and end of string as well.
+   *  
+   *  @param   aEliminateLeading controls stripping of leading ws
+   *  @param   aEliminateTrailing controls stripping of trailing ws
+   *  @return  this
+   */
+  nsCString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**********************************************************************
+    string conversion methods...
+   *********************************************************************/
+
+      operator char*() {return mStr;}
+      operator const char*() const {return (const char*)mStr;}
+
+  /**
+   * This method constructs a new nsCString that is a clone
+   * of this string.
+   * 
+   */
+  nsCString* ToNewString() const;
+
+  /**
+   * Creates an ISOLatin1 clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new isolatin1 string
+   */
+  char* ToNewCString() const;
+
+  /**
+   * Creates a unicode clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new unicode string
+   */
+  PRUnichar* ToNewUnicode() const;
+
+  /**
+   * Copies data from internal buffer onto given char* buffer
+   * NOTE: This only copies as many chars as will fit in given buffer (clips)
+   * @param aBuf is the buffer where data is stored
+   * @param aBuflength is the max # of chars to move to buffer
+   * @return ptr to given buffer
+   */
+  char* ToCString(char* aBuf,PRUint32 aBufLength,PRUint32 anOffset=0) const;
+
+  /**
+   * Perform string to float conversion.
+   * @param   aErrorCode will contain error if one occurs
+   * @return  float rep of string value
+   */
+  float ToFloat(PRInt32* aErrorCode) const;
+
+  /**
+   * Try to derive the radix from the value contained in this string
+   * @return  kRadix10, kRadix16 or kAutoDetect (meaning unknown)
+   */
+  PRUint32  DetermineRadix(void);
+
+  /**
+   * Perform string to int conversion.
+   * @param   aErrorCode will contain error if one occurs
+   * @return  int rep of string value
+   */
+  PRInt32   ToInteger(PRInt32* aErrorCode,PRUint32 aRadix=kRadix10) const;
+
+
+  /**********************************************************************
+    String manipulation methods...                
+   *********************************************************************/
+
+  /**
+   * Functionally equivalent to assign or operator=
+   * 
+   */
+  nsCString& SetString(const char* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+  nsCString& SetString(const nsStr& aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+
+  /**
+   * assign given string to this string
+   * @param   aStr: buffer to be assigned to this 
+   * @param   alength is the length of the given str (or -1)
+              if you want me to determine its length
+   * @return  this
+   */
+  nsCString& Assign(const nsStr& aString,PRInt32 aCount=-1);
+  nsCString& Assign(const char* aString,PRInt32 aCount=-1);
+  nsCString& Assign(const PRUnichar* aString,PRInt32 aCount=-1);
+  nsCString& Assign(PRUnichar aChar);
+  nsCString& Assign(char aChar);
+
+  /**
+   * here come a bunch of assignment operators...
+   * @param   aString: string to be added to this
+   * @return  this
+   */
+  nsCString& operator=(const nsCString& aString) {return Assign(aString);}
+  nsCString& operator=(const nsStr& aString) {return Assign(aString);}
+  nsCString& operator=(PRUnichar aChar) {return Assign(aChar);}
+  nsCString& operator=(char aChar) {return Assign(aChar);}
+  nsCString& operator=(const char* aCString) {return Assign(aCString);}
+  nsCString& operator=(const PRUnichar* aString) {return Assign(aString);}
+  #ifdef AIX
+  nsCString& operator=(const nsSubsumeCStr& aSubsumeString);  // AIX requires a const here
+  #else
+  nsCString& operator=(nsSubsumeCStr& aSubsumeString);
+  #endif
+
+  /**
+   * Here's a bunch of methods that append varying types...
+   * @param   various...
+   * @return  this
+   */
+  nsCString& operator+=(const nsCString& aString){return Append(aString,aString.mLength);}
+  nsCString& operator+=(const char* aCString) {return Append(aCString);}
+  nsCString& operator+=(PRUnichar aChar){return Append(aChar);}
+  nsCString& operator+=(char aChar){return Append(aChar);}
+
+  /*
+   *  Appends n characters from given string to this,
+   *  This version computes the length of your given string
+   *  
+   *  @param   aString is the source to be appended to this
+   *  @return  number of chars copied
+   */
+  nsCString& Append(const nsCString& aString) {return Append(aString,aString.mLength);}
+ 
+
+  /*
+   *  Appends n characters from given string to this,
+   *  
+   *  @param   aString is the source to be appended to this
+   *  @param   aCount -- number of chars to copy; -1 tells us to compute the strlen for you
+   *  @return  number of chars copied
+   */
+  nsCString& Append(const nsCString& aString,PRInt32 aCount);
+  nsCString& Append(const nsStr& aString,PRInt32 aCount=-1);
+  nsCString& Append(const char* aString,PRInt32 aCount=-1);
+  nsCString& Append(PRUnichar aChar);
+  nsCString& Append(char aChar);
+  nsCString& Append(PRInt32 aInteger,PRInt32 aRadix=10); //radix=8,10 or 16
+  nsCString& Append(float aFloat);
+             
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at the leftmost offset.
+   *  
+   *  
+   *  @param   aCopy -- Receiving string
+   *  @param   aCount -- number of chars to copy
+   *  @return  number of chars copied
+   */
+  PRUint32 Left(nsCString& aCopy,PRInt32 aCount) const;
+
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at the given offset.
+   *  
+   *  
+   *  @param   aCopy -- Receiving string
+   *  @param   aCount -- number of chars to copy
+   *  @param   anOffset -- position where copying begins
+   *  @return  number of chars copied
+   */
+  PRUint32 Mid(nsCString& aCopy,PRUint32 anOffset,PRInt32 aCount) const;
+
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at rightmost char.
+   *  
+   *  
+   *  @param  aCopy -- Receiving string
+   *  @param  aCount -- number of chars to copy
+   *  @return number of chars copied
+   */
+  PRUint32 Right(nsCString& aCopy,PRInt32 aCount) const;
+
+  /*
+   *  This method inserts n chars from given string into this
+   *  string at str[anOffset].
+   *  
+   *  @param  aCopy -- String to be inserted into this
+   *  @param  anOffset -- insertion position within this str
+   *  @param  aCount -- number of chars to be copied from aCopy
+   *  @return number of chars inserted into this.
+   */
+  nsCString& Insert(const nsCString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
+
+  /**
+   * Insert a given string into this string at
+   * a specified offset.
+   *
+   * @param   aString* to be inserted into this string
+   * @param   anOffset is insert pos in str 
+   * @return  the number of chars inserted into this string
+   */
+  nsCString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+
+  /**
+   * Insert a single char into this string at
+   * a specified offset.
+   *
+   * @param   character to be inserted into this string
+   * @param   anOffset is insert pos in str 
+   * @return  the number of chars inserted into this string
+   */
+  nsCString& Insert(PRUnichar aChar,PRUint32 anOffset);
+  nsCString& Insert(char aChar,PRUint32 anOffset);
+
+  /*
+   *  This method is used to cut characters in this string
+   *  starting at anOffset, continuing for aCount chars.
+   *  
+   *  @param  anOffset -- start pos for cut operation
+   *  @param  aCount -- number of chars to be cut
+   *  @return *this
+   */
+  nsCString& Cut(PRUint32 anOffset,PRInt32 aCount);
+
+
+  /**********************************************************************
+    Searching methods...                
+   *********************************************************************/
+ 
+  /**
+   *  Search for given character within this string.
+   *  This method does so by using a binary search,
+   *  so your string HAD BETTER BE ORDERED!
+   *  
+   *  @param   aChar is the unicode char to be found
+   *  @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 BinarySearch(PRUnichar aChar) const;
+
+  /**
+   *  Search for given substring within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 Find(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   *  Search for given char within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @return  find pos in string, or -1 (kNotFound)
+   */
+  PRInt32 FindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   * This method searches this string for the first character
+   * found in the given charset
+   * @param aString contains set of chars to be found
+   * @param anOffset tells us where to start searching in this
+   * @return -1 if not found, else the offset in this
+   */
+  PRInt32 FindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
+  PRInt32 FindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
+  PRInt32 FindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
+
+
+  /**
+   * This methods scans the string backwards, looking for the given string
+   * @param   aString is substring to be sought in this
+   * @param   aIgnoreCase tells us whether or not to do caseless compare
+   * @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 RFind(const char* aCString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+
+  /**
+   *  Search for given char within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @return  find pos in string, or -1 (kNotFound)
+   */
+  PRInt32 RFindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   * This method searches this string for the last character
+   * found in the given string
+   * @param aString contains set of chars to be found
+   * @param anOffset tells us where to start searching in this
+   * @return -1 if not found, else the offset in this
+   */
+  PRInt32 RFindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
+  PRInt32 RFindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
+  PRInt32 RFindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
+
+
+
+  /**********************************************************************
+    Comparison methods...                
+   *********************************************************************/
+
+  /**
+   * Compares a given string type to this string. 
+   * @update  gess 7/27/98
+   * @param   S is the string to be compared
+   * @param   aIgnoreCase tells us how to treat case
+   * @param   aCount tells us how many chars to compare
+   * @return  -1,0,1
+   */
+  virtual PRInt32 Compare(const nsStr &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+
+  /**
+   * These methods compare a given string type to this one
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator==(const nsStr &aString) const;
+  PRBool  operator==(const char* aString) const;
+  PRBool  operator==(const PRUnichar* aString) const;
+
+  /**
+   * These methods perform a !compare of a given string type to this 
+   * @param aString is the string to be compared to this
+   * @return  TRUE 
+   */
+  PRBool  operator!=(const nsStr &aString) const;
+  PRBool  operator!=(const char* aString) const;
+  PRBool  operator!=(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is < than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator<(const nsStr &aString) const;
+  PRBool  operator<(const char* aString) const;
+  PRBool  operator<(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is > than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator>(const nsStr &S) const;
+  PRBool  operator>(const char* aString) const;
+  PRBool  operator>(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is <= than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator<=(const nsStr &S) const;
+  PRBool  operator<=(const char* aString) const;
+  PRBool  operator<=(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is >= than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator>=(const nsStr &S) const;
+  PRBool  operator>=(const char* aString) const;
+  PRBool  operator>=(const PRUnichar* aString) const;
+
+  /**
+   * Compare this to given string; note that we compare full strings here.
+   * The optional length argument just lets us know how long the given string is.
+   * If you provide a length, it is compared to length of this string as an
+   * optimization.
+   * 
+   * @param  aString -- the string to compare to this
+   * @param  aCount  -- number of chars in given string you want to compare
+   * @return TRUE if equal
+   */
+  PRBool  Equals(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+
+  PRBool  EqualsIgnoreCase(const nsStr& aString) const;
+  PRBool  EqualsIgnoreCase(const char* aString,PRInt32 aCount=-1) const;
+  PRBool  EqualsIgnoreCase(const PRUnichar* aString,PRInt32 aCount=-1) const;
+
+
+  static  void        Recycle(nsCString* aString);
+  static  nsCString*  CreateString(void);
+
+};
+
+extern NS_COM int fputs(const nsCString& aString, FILE* out);
+//ostream& operator<<(ostream& aStream,const nsCString& aString);
+//virtual void  DebugDump(ostream& aStream) const;
+
+
+/**************************************************************
+  Here comes the AutoString class which uses internal memory
+  (typically found on the stack) for its default buffer.
+  If the buffer needs to grow, it gets reallocated on the heap.
+ **************************************************************/
+
+class NS_COM nsCAutoString : public nsCString {
+public: 
+
+    nsCAutoString();
+    nsCAutoString(const char* aString,PRInt32 aLength=-1);
+    nsCAutoString(const CBufDescriptor& aBuffer);
+    nsCAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
+    nsCAutoString(const nsStr& aString);
+    nsCAutoString(const nsCAutoString& aString);
+
+#ifdef AIX
+    nsCAutoString(const nsSubsumeCStr& aSubsumeStr);  // AIX requires a const
+#else
+    nsCAutoString(nsSubsumeCStr& aSubsumeStr);
+#endif // AIX
+    nsCAutoString(PRUnichar aChar);
+    virtual ~nsCAutoString();
+
+    nsCAutoString& operator=(const nsCString& aString) {nsCString::Assign(aString); return *this;}
+    nsCAutoString& operator=(const char* aCString) {nsCString::Assign(aCString); return *this;}
+    nsCAutoString& operator=(PRUnichar aChar) {nsCString::Assign(aChar); return *this;}
+    nsCAutoString& operator=(char aChar) {nsCString::Assign(aChar); return *this;}
+
+    /**
+     * Retrieve the size of this string
+     * @return string length
+     */
+    virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
+    
+    char mBuffer[kDefaultStringSize];
+};
+
+
+/***************************************************************
+  The subsumestr class is very unusual. 
+  It differs from a normal string in that it doesn't use normal
+  copy semantics when another string is assign to this. 
+  Instead, it "steals" the contents of the source string.
+
+  This is very handy for returning nsString classes as part of
+  an operator+(...) for example, in that it cuts down the number
+  of copy operations that must occur. 
+
+  You should probably not use this class unless you really know
+  what you're doing.
+ ***************************************************************/
+class NS_COM nsSubsumeCStr : public nsCString {
+public:
+  nsSubsumeCStr(nsStr& aString);
+  nsSubsumeCStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
+  nsSubsumeCStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
+
+};
+
+
+#endif
+
+

mozilla/string/obsolete/nsString2.h

@@ -0,0 +1,840 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+
+/***********************************************************************
+  MODULE NOTES:
+
+  See nsStr.h for a more general description of string classes.
+
+  This version of the nsString class offers many improvements over the
+  original version:
+    1. Wide and narrow chars
+    2. Allocators
+    3. Much smarter autostrings
+    4. Subsumable strings
+ ***********************************************************************/
+
+
+#ifndef _nsString_
+#define _nsString_
+
+#include "prtypes.h"
+#include "nscore.h"
+#include <stdio.h>
+#include "nsString.h"
+#include "nsIAtom.h"
+#include "nsStr.h"
+#include "nsCRT.h"
+
+class nsISizeOfHandler;
+
+
+#define nsString2     nsString
+#define nsAutoString2 nsAutoString
+
+
+class NS_COM nsSubsumeStr;
+class NS_COM nsString : public nsStr {
+
+public: 
+
+  /**
+   * Default constructor. 
+   */
+  nsString();
+
+
+  /**
+   * This constructor accepts an isolatin string
+   * @param   aCString is a ptr to a 1-byte cstr
+   */
+  nsString(const char* aCString);
+
+  /**
+   * This constructor accepts a unichar string
+   * @param   aCString is a ptr to a 2-byte cstr
+   */
+  nsString(const PRUnichar* aString);
+
+  /**
+   * This is a copy constructor that accepts an nsStr
+   * @param   reference to another nsString
+   */
+  nsString(const nsStr&);
+
+  /**
+   * This is our copy constructor 
+   * @param   reference to another nsString
+   */
+  nsString(const nsString& aString);   
+
+  /**
+   * This constructor takes a subsumestr
+   * @param   reference to subsumestr
+   */
+  nsString(nsSubsumeStr& aSubsumeStr);   
+
+  /**
+   * Destructor
+   * 
+   */
+  virtual ~nsString();    
+
+  /**
+   * Retrieve the length of this string
+   * @return string length
+   */
+  inline PRInt32 Length() const { return (PRInt32)mLength; }
+
+  /**
+   * Retrieve the size of this string
+   * @return string length
+   */
+  virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
+
+
+  /**
+   * Call this method if you want to force a different string length
+   * @update  gess7/30/98
+   * @param   aLength -- contains new length for mStr
+   * @return
+   */
+  void SetLength(PRUint32 aLength) { 
+    Truncate(aLength);
+  }
+
+  /**
+   * Sets the new length of the string.
+   * @param   aLength is new string length.
+   * @return  nada
+   */
+  void SetCapacity(PRUint32 aLength);
+
+  /**
+   * This method truncates this string to given length.
+   *
+   * @param   anIndex -- new length of string
+   * @return  nada
+   */
+  void Truncate(PRInt32 anIndex=0);
+
+
+  /**
+   *  Determine whether or not the characters in this
+   *  string are in sorted order.
+   *  
+   *  @return  TRUE if ordered.
+   */
+  PRBool IsOrdered(void) const;
+
+  /**
+   *  Determine whether or not the characters in this
+   *  string are in store as 1 or 2 byte (unicode) strings.
+   *  
+   *  @return  TRUE if ordered.
+   */
+  PRBool IsUnicode(void) const {
+    PRBool result=PRBool(mCharSize==eTwoByte);
+    return result;
+  }
+
+  /**
+   *  Determine whether or not this string has a length of 0
+   *  
+   *  @return  TRUE if empty.
+   */
+  PRBool IsEmpty(void) const {
+    return PRBool(0==mLength);
+  }
+
+  /**********************************************************************
+    Getters/Setters...
+   *********************************************************************/
+
+   /**
+     * Retrieve const ptr to internal buffer; DO NOT TRY TO FREE IT!
+     */
+  const char* GetBuffer(void) const;
+  const PRUnichar* GetUnicode(void) const;
+
+
+   /**
+     * Get nth character.
+     */
+  PRUnichar operator[](PRUint32 anIndex) const;
+  PRUnichar CharAt(PRUint32 anIndex) const;
+  PRUnichar First(void) const;
+  PRUnichar Last(void) const;
+
+   /**
+     * Set nth character.
+     */
+  PRBool SetCharAt(PRUnichar aChar,PRUint32 anIndex);
+
+
+  /**********************************************************************
+    String concatenation methods...
+   *********************************************************************/
+
+  /**
+   * Create a new string by appending given string to this
+   * @param   aString -- 2nd string to be appended
+   * @return  new subsumable string
+   */
+  nsSubsumeStr operator+(const nsStr& aString);
+  nsSubsumeStr operator+(const nsString& aString);
+
+  /**
+   * create a new string by adding this to the given cstring
+   * @param   aCString is a ptr to cstring to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeStr operator+(const char* aCString);
+
+  /**
+   * create a new string by adding this to the given prunichar*.
+   * @param   aString is a ptr to UC-string to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeStr operator+(const PRUnichar* aString);
+
+  /**
+   * create a new string by adding this to the given char.
+   * @param   aChar is a char to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeStr operator+(char aChar);
+
+  /**
+   * create a new string by adding this to the given char.
+   * @param   aChar is a unichar to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeStr operator+(PRUnichar aChar);
+
+  /**********************************************************************
+    Lexomorphic transforms...
+   *********************************************************************/
+
+
+  /**
+   * Converts chars in this to lowercase
+   * @update  gess 7/27/98
+   */
+  void ToLowerCase();
+
+
+  /**
+   * Converts chars in this to lowercase, and
+   * stores them in aOut
+   * @update  gess 7/27/98
+   * @param   aOut is a string to contain result
+   */
+  void ToLowerCase(nsString& aString) const;
+
+  /**
+   * Converts chars in this to uppercase
+   * @update  gess 7/27/98
+   */
+  void ToUpperCase();
+
+  /**
+   * Converts chars in this to lowercase, and
+   * stores them in a given output string
+   * @update  gess 7/27/98
+   * @param   aOut is a string to contain result
+   */
+  void ToUpperCase(nsString& aString) const;
+
+
+  /**
+   *  This method is used to remove all occurances of the
+   *  characters found in aSet from this string.
+   *  
+   *  @param  aSet -- characters to be cut from this
+   *  @return *this 
+   */
+  nsString& StripChars(const char* aSet);
+  nsString& StripChar(char aChar);
+
+  /**
+   *  This method strips whitespace throughout the string
+   *  
+   *  @return  this
+   */
+  nsString& StripWhitespace();
+
+  /**
+   *  swaps occurence of 1 string for another
+   *  
+   *  @return  this
+   */
+  nsString& ReplaceChar(PRUnichar anOldChar,PRUnichar aNewChar);
+  nsString& ReplaceChar(const char* aSet,PRUnichar aNewChar);
+
+  PRInt32 CountChar(PRUnichar aChar);
+
+  /**
+   *  This method trims characters found in aTrimSet from
+   *  either end of the underlying string.
+   *  
+   *  @param   aTrimSet -- contains chars to be trimmed from
+   *           both ends
+   *  @return  this
+   */
+  nsString& Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**
+   *  This method strips whitespace from string.
+   *  You can control whether whitespace is yanked from
+   *  start and end of string as well.
+   *  
+   *  @param   aEliminateLeading controls stripping of leading ws
+   *  @param   aEliminateTrailing controls stripping of trailing ws
+   *  @return  this
+   */
+  nsString& CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**
+   *  This method strips whitespace from string.
+   *  You can control whether whitespace is yanked from
+   *  start and end of string as well.
+   *  
+   *  @param   aEliminateLeading controls stripping of leading ws
+   *  @param   aEliminateTrailing controls stripping of trailing ws
+   *  @return  this
+   */
+  nsString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**********************************************************************
+    string conversion methods...
+   *********************************************************************/
+
+  /**
+   * This method constructs a new nsString is a clone of this string.
+   * 
+   */
+  nsString* ToNewString() const;
+
+  /**
+   * Creates an ISOLatin1 clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new isolatin1 string
+   */
+  char* ToNewCString() const;
+
+  /**
+   * Creates an UTF8 clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new isolatin1 string
+   */
+  char* ToNewUTF8String() const;
+
+  /**
+   * Creates a unicode clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new unicode string
+   */
+  PRUnichar* ToNewUnicode() const;
+
+  /**
+   * Copies data from internal buffer onto given char* buffer
+   * NOTE: This only copies as many chars as will fit in given buffer (clips)
+   * @param aBuf is the buffer where data is stored
+   * @param aBuflength is the max # of chars to move to buffer
+   * @return ptr to given buffer
+   */
+  char* ToCString(char* aBuf,PRUint32 aBufLength,PRUint32 anOffset=0) const;
+
+  /**
+   * Perform string to float conversion.
+   * @param   aErrorCode will contain error if one occurs
+   * @return  float rep of string value
+   */
+  float ToFloat(PRInt32* aErrorCode) const;
+
+  /**
+   * Try to derive the radix from the value contained in this string
+   * @return  kRadix10, kRadix16 or kAutoDetect (meaning unknown)
+   */
+  PRUint32  DetermineRadix(void);
+
+  /**
+   * Perform string to int conversion.
+   * @param   aErrorCode will contain error if one occurs
+   * @return  int rep of string value
+   */
+  PRInt32   ToInteger(PRInt32* aErrorCode,PRUint32 aRadix=kRadix10) const;
+
+
+  /**********************************************************************
+    String manipulation methods...                
+   *********************************************************************/
+
+  /**
+   * Functionally equivalent to assign or operator=
+   * 
+   */
+  nsString& SetString(const char* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+  nsString& SetString(const PRUnichar* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+  nsString& SetString(const nsString& aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+
+  /**
+   * assign given string to this string
+   * @param   aStr: buffer to be assigned to this 
+   * @param   alength is the length of the given str (or -1)
+              if you want me to determine its length
+   * @return  this
+   */
+  nsString& Assign(const nsStr& aString,PRInt32 aCount=-1);
+  nsString& Assign(const char* aString,PRInt32 aCount=-1);
+  nsString& Assign(const PRUnichar* aString,PRInt32 aCount=-1);
+  nsString& Assign(char aChar);
+  nsString& Assign(PRUnichar aChar);
+
+  /**
+   * here come a bunch of assignment operators...
+   * @param   aString: string to be added to this
+   * @return  this
+   */
+  nsString& operator=(const nsString& aString) {return Assign(aString);}
+  nsString& operator=(const nsStr& aString) {return Assign(aString);}
+  nsString& operator=(char aChar) {return Assign(aChar);}
+  nsString& operator=(PRUnichar aChar) {return Assign(aChar);}
+  nsString& operator=(const char* aCString) {return Assign(aCString);}
+  nsString& operator=(const PRUnichar* aString) {return Assign(aString);}
+  #ifdef AIX
+  nsString& operator=(const nsSubsumeStr& aSubsumeString);  // AIX requires a const here
+  #else
+  nsString& operator=(nsSubsumeStr& aSubsumeString);
+  #endif
+
+  /**
+   * Here's a bunch of methods that append varying types...
+   * @param   various...
+   * @return  this
+   */
+  nsString& operator+=(const nsStr& aString){return Append(aString,aString.mLength);}
+  nsString& operator+=(const nsString& aString){return Append(aString,aString.mLength);}
+  nsString& operator+=(const char* aCString) {return Append(aCString);}
+  //nsString& operator+=(char aChar){return Append(aChar);}
+  nsString& operator+=(const PRUnichar* aUCString) {return Append(aUCString);}
+  nsString& operator+=(PRUnichar aChar){return Append(aChar);}
+
+  /*
+   *  Appends n characters from given string to this,
+   *  This version computes the length of your given string
+   *  
+   *  @param   aString is the source to be appended to this
+   *  @return  number of chars copied
+   */
+  nsString& Append(const nsStr& aString) {return Append(aString,aString.mLength);}
+  nsString& Append(const nsString& aString) {return Append(aString,aString.mLength);}
+ 
+
+  /*
+   *  Appends n characters from given string to this,
+   *  
+   *  @param   aString is the source to be appended to this
+   *  @param   aCount -- number of chars to copy; -1 tells us to compute the strlen for you
+   *  @return  number of chars copied
+   */
+  nsString& Append(const nsStr& aString,PRInt32 aCount);
+  nsString& Append(const nsString& aString,PRInt32 aCount);
+  nsString& Append(const char* aString,PRInt32 aCount=-1);
+  nsString& Append(const PRUnichar* aString,PRInt32 aCount=-1);
+  nsString& Append(char aChar);
+  nsString& Append(PRUnichar aChar);
+  nsString& Append(PRInt32 aInteger,PRInt32 aRadix=10); //radix=8,10 or 16
+  nsString& Append(float aFloat);
+             
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at the leftmost offset.
+   *  
+   *  
+   *  @param   aCopy -- Receiving string
+   *  @param   aCount -- number of chars to copy
+   *  @return  number of chars copied
+   */
+  PRUint32 Left(nsString& aCopy,PRInt32 aCount) const;
+
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at the given offset.
+   *  
+   *  
+   *  @param   aCopy -- Receiving string
+   *  @param   aCount -- number of chars to copy
+   *  @param   anOffset -- position where copying begins
+   *  @return  number of chars copied
+   */
+  PRUint32 Mid(nsString& aCopy,PRUint32 anOffset,PRInt32 aCount) const;
+
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at rightmost char.
+   *  
+   *  
+   *  @param  aCopy -- Receiving string
+   *  @param  aCount -- number of chars to copy
+   *  @return number of chars copied
+   */
+  PRUint32 Right(nsString& aCopy,PRInt32 aCount) const;
+
+  /*
+   *  This method inserts n chars from given string into this
+   *  string at str[anOffset].
+   *  
+   *  @param  aCopy -- String to be inserted into this
+   *  @param  anOffset -- insertion position within this str
+   *  @param  aCount -- number of chars to be copied from aCopy
+   *  @return number of chars inserted into this.
+   */
+  nsString& Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
+
+  /**
+   * Insert a given string into this string at
+   * a specified offset.
+   *
+   * @param   aString* to be inserted into this string
+   * @param   anOffset is insert pos in str 
+   * @return  the number of chars inserted into this string
+   */
+  nsString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+  nsString& Insert(const PRUnichar* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+
+  /**
+   * Insert a single char into this string at
+   * a specified offset.
+   *
+   * @param   character to be inserted into this string
+   * @param   anOffset is insert pos in str 
+   * @return  the number of chars inserted into this string
+   */
+  //nsString& Insert(char aChar,PRUint32 anOffset);
+  nsString& Insert(PRUnichar aChar,PRUint32 anOffset);
+
+  /*
+   *  This method is used to cut characters in this string
+   *  starting at anOffset, continuing for aCount chars.
+   *  
+   *  @param  anOffset -- start pos for cut operation
+   *  @param  aCount -- number of chars to be cut
+   *  @return *this
+   */
+  nsString& Cut(PRUint32 anOffset,PRInt32 aCount);
+
+
+  /**********************************************************************
+    Searching methods...                
+   *********************************************************************/
+ 
+  /**
+   *  Search for given character within this string.
+   *  This method does so by using a binary search,
+   *  so your string HAD BETTER BE ORDERED!
+   *  
+   *  @param   aChar is the unicode char to be found
+   *  @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 BinarySearch(PRUnichar aChar) const;
+
+  /**
+   *  Search for given substring within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 Find(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+
+  /**
+   *  Search for given char within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @return  find pos in string, or -1 (kNotFound)
+   */
+  //PRInt32 Find(PRUnichar aChar,PRInt32 offset=-1,PRBool aIgnoreCase=PR_FALSE) const;
+  PRInt32 FindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   * This method searches this string for the first character
+   * found in the given charset
+   * @param aString contains set of chars to be found
+   * @param anOffset tells us where to start searching in this
+   * @return -1 if not found, else the offset in this
+   */
+  PRInt32 FindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
+  PRInt32 FindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
+  PRInt32 FindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
+
+
+  /**
+   * This methods scans the string backwards, looking for the given string
+   * @param   aString is substring to be sought in this
+   * @param   aIgnoreCase tells us whether or not to do caseless compare
+   *  @param   anOffset tells us where in this strig to start searching (counting from left)
+   */
+  PRInt32 RFind(const char* aCString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+
+  /**
+   *  Search for given char within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   anOffset tells us where in this strig to start searching (counting from left)
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @return  find pos in string, or -1 (kNotFound)
+   */
+  //PRInt32 RFind(PRUnichar aChar,PRInt32 offset=-1,PRBool aIgnoreCase=PR_FALSE) const;
+  PRInt32 RFindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   * This method searches this string for the last character
+   * found in the given string
+   * @param aString contains set of chars to be found
+   *  @param   anOffset tells us where in this strig to start searching (counting from left)
+   * @return -1 if not found, else the offset in this
+   */
+  PRInt32 RFindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
+  PRInt32 RFindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
+  PRInt32 RFindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
+
+
+  /**********************************************************************
+    Comparison methods...                
+   *********************************************************************/
+
+  /**
+   * Compares a given string type to this string. 
+   * @update  gess 7/27/98
+   * @param   S is the string to be compared
+   * @param   aIgnoreCase tells us how to treat case
+   * @param   aCount tells us how many chars to compare
+   * @return  -1,0,1
+   */
+  virtual PRInt32 Compare(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const nsStr &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+
+  /**
+   * These methods compare a given string type to this one
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator==(const nsString &aString) const;
+  PRBool  operator==(const nsStr &aString) const;
+  PRBool  operator==(const char *aString) const;
+  PRBool  operator==(const PRUnichar* aString) const;
+
+  /**
+   * These methods perform a !compare of a given string type to this 
+   * @param aString is the string to be compared to this
+   * @return  TRUE 
+   */
+  PRBool  operator!=(const nsString &aString) const;
+  PRBool  operator!=(const nsStr &aString) const;
+  PRBool  operator!=(const char* aString) const;
+  PRBool  operator!=(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is < than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator<(const nsString &aString) const;
+  PRBool  operator<(const nsStr &aString) const;
+  PRBool  operator<(const char* aString) const;
+  PRBool  operator<(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is > than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator>(const nsString &aString) const;
+  PRBool  operator>(const nsStr &S) const;
+  PRBool  operator>(const char* aString) const;
+  PRBool  operator>(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is <= than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator<=(const nsString &aString) const;
+  PRBool  operator<=(const nsStr &S) const;
+  PRBool  operator<=(const char* aString) const;
+  PRBool  operator<=(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is >= than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator>=(const nsString &aString) const;
+  PRBool  operator>=(const nsStr &S) const;
+  PRBool  operator>=(const char* aString) const;
+  PRBool  operator>=(const PRUnichar* aString) const;
+
+  /**
+   * Compare this to given string; note that we compare full strings here.
+   * The optional length argument just lets us know how long the given string is.
+   * If you provide a length, it is compared to length of this string as an
+   * optimization.
+   * 
+   * @param  aString -- the string to compare to this
+   * @param  aCount  -- number of chars to be compared.
+   * @return TRUE if equal
+   */
+  PRBool  Equals(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(/*FIX: const */nsIAtom* anAtom,PRBool aIgnoreCase) const;   
+  PRBool  Equals(const PRUnichar* s1, const PRUnichar* s2,PRBool aIgnoreCase=PR_FALSE) const;
+
+  PRBool  EqualsIgnoreCase(const nsString& aString) const;
+  PRBool  EqualsIgnoreCase(const char* aString,PRInt32 aCount=-1) const;
+  PRBool  EqualsIgnoreCase(/*FIX: const */nsIAtom *aAtom) const;
+  PRBool  EqualsIgnoreCase(const PRUnichar* s1, const PRUnichar* s2) const;
+
+  /**
+   *  Determine if given buffer is plain ascii
+   *  
+   *  @param   aBuffer -- if null, then we test *this, otherwise we test given buffer
+   *  @return  TRUE if is all ascii chars or if strlen==0
+   */
+  PRBool IsASCII(const PRUnichar* aBuffer=0);
+
+
+  /**
+   *  Determine if given char is a valid space character
+   *  
+   *  @param   aChar is character to be tested
+   *  @return  TRUE if is valid space char
+   */
+  static  PRBool IsSpace(PRUnichar ch);
+
+  /**
+   *  Determine if given char in valid alpha range
+   *  
+   *  @param   aChar is character to be tested
+   *  @return  TRUE if in alpha range
+   */
+  static  PRBool IsAlpha(PRUnichar ch);
+
+  /**
+   *  Determine if given char is valid digit
+   *  
+   *  @param   aChar is character to be tested
+   *  @return  TRUE if char is a valid digit
+   */
+  static  PRBool IsDigit(PRUnichar ch);
+
+  static  void        Recycle(nsString* aString);
+  static  nsString*  CreateString(void);
+
+};
+
+extern NS_COM int fputs(const nsString& aString, FILE* out);
+//ostream& operator<<(ostream& aStream,const nsString& aString);
+//virtual void  DebugDump(ostream& aStream) const;
+
+
+/**************************************************************
+  Here comes the AutoString class which uses internal memory
+  (typically found on the stack) for its default buffer.
+  If the buffer needs to grow, it gets reallocated on the heap.
+ **************************************************************/
+
+class NS_COM nsAutoString : public nsString {
+public: 
+
+    nsAutoString();
+    nsAutoString(const char* aCString,PRInt32 aLength=-1);
+    nsAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
+
+    nsAutoString(const CBufDescriptor& aBuffer);    
+    nsAutoString(const nsStr& aString);
+    nsAutoString(const nsAutoString& aString);
+#ifdef AIX
+    nsAutoString(const nsSubsumeStr& aSubsumeStr);  // AIX requires a const
+#else
+    nsAutoString(nsSubsumeStr& aSubsumeStr);
+#endif // AIX
+    nsAutoString(PRUnichar aChar);
+    virtual ~nsAutoString();
+
+    nsAutoString& operator=(const nsStr& aString) {nsString::Assign(aString); return *this;}
+    nsAutoString& operator=(const nsAutoString& aString) {nsString::Assign(aString); return *this;}
+    nsAutoString& operator=(const char* aCString) {nsString::Assign(aCString); return *this;}
+    nsAutoString& operator=(char aChar) {nsString::Assign(aChar); return *this;}
+    nsAutoString& operator=(const PRUnichar* aBuffer) {nsString::Assign(aBuffer); return *this;}
+    nsAutoString& operator=(PRUnichar aChar) {nsString::Assign(aChar); return *this;}
+
+    /**
+     * Retrieve the size of this string
+     * @return string length
+     */
+    virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
+    
+    char mBuffer[kDefaultStringSize<<eTwoByte];
+};
+
+
+
+/***************************************************************
+  The subsumestr class is very unusual. 
+  It differs from a normal string in that it doesn't use normal
+  copy semantics when another string is assign to this. 
+  Instead, it "steals" the contents of the source string.
+
+  This is very handy for returning nsString classes as part of
+  an operator+(...) for example, in that it cuts down the number
+  of copy operations that must occur. 
+
+  You should probably not use this class unless you really know
+  what you're doing.
+ ***************************************************************/
+class NS_COM nsSubsumeStr : public nsString {
+public:
+  nsSubsumeStr(nsStr& aString);
+  nsSubsumeStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
+  nsSubsumeStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
+};
+
+
+
+#endif
+
+

mozilla/string/obsolete/nsXPIDLString.cpp

@@ -0,0 +1,179 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsDebug.h"
+#include "nsIAllocator.h"
+#include "nsXPIDLString.h"
+#include "plstr.h"
+
+// If the allocator changes, fix it here.
+#define XPIDL_STRING_ALLOC(__len)  ((PRUnichar*) nsAllocator::Alloc((__len) * sizeof(PRUnichar)))
+#define XPIDL_CSTRING_ALLOC(__len) ((char*) nsAllocator::Alloc((__len) * sizeof(char)))
+#define XPIDL_FREE(__ptr)          (nsAllocator::Free(__ptr))
+
+////////////////////////////////////////////////////////////////////////
+// nsXPIDLString
+
+nsXPIDLString::nsXPIDLString()
+    : mBuf(0),
+      mBufOwner(PR_FALSE)
+{
+}
+
+
+nsXPIDLString::~nsXPIDLString()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+}
+
+
+nsXPIDLString::operator const PRUnichar*()
+{
+    return mBuf;
+}
+
+
+PRUnichar*
+nsXPIDLString::Copy(const PRUnichar* aString)
+{
+    NS_ASSERTION(aString, "null ptr");
+    if (! aString)
+        return 0;
+
+    PRInt32 len = 0;
+
+    {
+        const PRUnichar* p = aString;
+        while (*p++)
+            len++;
+    }
+
+    PRUnichar* result = XPIDL_STRING_ALLOC(len + 1);
+    if (result) {
+        PRUnichar* q = result;
+        while (*aString) {
+            *q = *aString;
+            q++;
+            aString++;
+        }
+        *q = '\0';
+    }
+    return result;
+}
+
+
+PRUnichar**
+nsXPIDLString::StartAssignmentByValue()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+
+    mBuf = 0;
+    mBufOwner = PR_TRUE;
+    return &mBuf;
+}
+
+
+const PRUnichar**
+nsXPIDLString::StartAssignmentByReference()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+
+    mBuf = 0;
+    mBufOwner = PR_FALSE;
+    return (const PRUnichar**) &mBuf;
+}
+
+
+////////////////////////////////////////////////////////////////////////
+// nsXPIDLCString
+
+nsXPIDLCString::nsXPIDLCString()
+    : mBuf(0),
+      mBufOwner(PR_FALSE)
+{
+}
+
+
+nsXPIDLCString::~nsXPIDLCString()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+}
+
+
+nsXPIDLCString& nsXPIDLCString::operator =(const char* aCString)
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+	
+    mBuf = Copy(aCString);
+    mBufOwner = PR_TRUE;
+    
+    return *this;
+}
+
+
+nsXPIDLCString::operator const char*()
+{
+    return mBuf;
+}
+
+
+char*
+nsXPIDLCString::Copy(const char* aCString)
+{
+    NS_ASSERTION(aCString, "null ptr");
+    if (! aCString)
+        return 0;
+
+    PRInt32 len = PL_strlen(aCString);
+    char* result = XPIDL_CSTRING_ALLOC(len + 1);
+    if (result)
+        PL_strcpy(result, aCString);
+
+    return result;
+}
+
+
+char**
+nsXPIDLCString::StartAssignmentByValue()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+
+    mBuf = 0;
+    mBufOwner = PR_TRUE;
+    return &mBuf;
+}
+
+
+const char**
+nsXPIDLCString::StartAssignmentByReference()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+
+    mBuf = 0;
+    mBufOwner = PR_FALSE;
+    return (const char**) &mBuf;
+}
+
+

mozilla/string/obsolete/nsXPIDLString.h

@@ -0,0 +1,302 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+
+  A set of string wrapper classes that ease transition to use of XPIDL
+  interfaces. nsXPIDLString and nsXPIDLCString are to XPIDL `wstring'
+  and `string' out params as nsCOMPtr is to generic XPCOM interface
+  pointers. They help you deal with object ownership.
+
+  Consider the following interface:
+
+    interface nsIFoo {
+      attribute string Bar;
+    };
+
+  This will generate the following C++ header file:
+
+    class nsIFoo {
+      NS_IMETHOD SetBar(const PRUnichar* aValue);
+      NS_IMETHOD GetBar(PRUnichar* *aValue);
+    };
+
+  The GetBar() method will allocate a copy of the nsIFoo object's
+  "bar" attribute, and leave you to deal with freeing it:
+
+    nsIFoo* aFoo; // assume we get this somehow
+    PRUnichar* bar;
+    aFoo->GetFoo(&bar);
+    // Use bar here...
+    printf("bar is %s!\n", bar);
+    nsAllocator::Free(bar);
+
+  This makes your life harder, because you need to convolute your code
+  to ensure that you don't leak `bar'.
+
+  Enter nsXPIDLString, which manages the ownership of the allocated
+  string, and automatically destroys it when the nsXPIDLString goes
+  out of scope:
+
+    nsIFoo* aFoo;
+    nsXPIDLString bar;
+    aFoo->GetFoo( getter_Copies(bar) );
+    // Use bar here...
+    printf("bar is %s!\n", (const char*) bar);
+    // no need to remember to nsAllocator::Free().
+
+  Like nsCOMPtr, nsXPIDLString uses some syntactic sugar to make it
+  painfully clear exactly what the code expects. You need to wrap an
+  nsXPIDLString object with either `getter_Copies()' or
+  `getter_Shares()' before passing it to a getter: these tell the
+  nsXPIDLString how ownership is being handled.
+
+  In the case of `getter_Copies()', the callee is allocating a copy
+  (which is usually the case). In the case of `getter_Shares()', the
+  callee is returning a const reference to `the real deal' (this can
+  be done using the [shared] attribute in XPIDL).
+
+ */
+
+#ifndef nsXPIDLString_h__
+#define nsXPIDLString_h__
+
+#include "nsCom.h"
+#include "prtypes.h"
+
+#ifndef __PRUNICHAR__
+#define __PRUNICHAR__
+typedef PRUint16 PRUnichar;
+#endif /* __PRUNICHAR__ */
+
+////////////////////////////////////////////////////////////////////////
+// nsXPIDLString
+//
+//   A wrapper for Unicode strings. With the |getter_Copies()| and
+//   |getter_Shares()| helper functions, this can be used instead of
+//   the "naked" |PRUnichar*| interface for |wstring| parameters in
+//   XPIDL interfaces.
+//
+
+class NS_COM nsXPIDLString {
+private:
+    PRUnichar* mBuf;
+    PRBool     mBufOwner;
+
+    PRUnichar** StartAssignmentByValue();
+    const PRUnichar** StartAssignmentByReference();
+
+public:
+    /**
+     * Construct a new, uninitialized wrapper for a Unicode string.
+     */
+    nsXPIDLString();
+
+    virtual ~nsXPIDLString();
+
+    /**
+     * Return a reference to the immutable Unicode string.
+     */
+    operator const PRUnichar*();
+
+    /**
+     * Make a copy of the Unicode string. Use this function in the
+     * callee to ensure that the correct memory allocator is used.
+     */
+    static PRUnichar* Copy(const PRUnichar* aString);
+
+    // A helper class for assignment-by-value. This class is an
+    // implementation detail and should not be considered part of the
+    // public interface.
+    class NS_COM GetterCopies {
+    private:
+        nsXPIDLString& mXPIDLString;
+
+    public:
+        GetterCopies(nsXPIDLString& aXPIDLString)
+            : mXPIDLString(aXPIDLString) {}
+
+        operator PRUnichar**() {
+            return mXPIDLString.StartAssignmentByValue();
+        }
+
+        friend GetterCopies getter_Copies(nsXPIDLString& aXPIDLString);
+    };
+
+    friend class GetterCopies;
+
+    // A helper class for assignment-by-reference. This class is an
+    // implementation detail and should not be considered part of the
+    // public interface.
+    class NS_COM GetterShares {
+    private:
+        nsXPIDLString& mXPIDLString;
+
+    public:
+        GetterShares(nsXPIDLString& aXPIDLString)
+            : mXPIDLString(aXPIDLString) {}
+
+        operator const PRUnichar**() {
+            return mXPIDLString.StartAssignmentByReference();
+        }
+
+        friend GetterShares getter_Shares(nsXPIDLString& aXPIDLString);
+    };
+
+    friend class GetterShares;
+
+private:
+    // not to be implemented
+    nsXPIDLString(nsXPIDLString& /* aXPIDLString */) {}
+    nsXPIDLString& operator =(nsXPIDLString& /* aXPIDLString */) { return *this; }
+};
+
+
+/**
+ * Use this function to "wrap" the nsXPIDLString object that is to
+ * receive an |out| value.
+ */
+inline nsXPIDLString::GetterCopies
+getter_Copies(nsXPIDLString& aXPIDLString)
+{
+    return nsXPIDLString::GetterCopies(aXPIDLString);
+}
+
+/**
+ * Use this function to "wrap" the nsXPIDLString object that is to
+ * receive a |[shared] out| value.
+ */
+inline nsXPIDLString::GetterShares
+getter_Shares(nsXPIDLString& aXPIDLString)
+{
+    return nsXPIDLString::GetterShares(aXPIDLString);
+}
+
+
+
+////////////////////////////////////////////////////////////////////////
+// nsXPIDLCString
+//
+//   A wrapper for Unicode strings. With the |getter_Copies()| and
+//   |getter_Shares()| helper functions, this can be used instead of
+//   the "naked" |char*| interface for |string| parameters in XPIDL
+//   interfaces.
+//
+
+class NS_COM nsXPIDLCString {
+private:
+    char*  mBuf;
+    PRBool mBufOwner;
+
+    char** StartAssignmentByValue();
+    const char** StartAssignmentByReference();
+
+public:
+    /**
+     * Construct a new, uninitialized wrapper for a single-byte string.
+     */
+    nsXPIDLCString();
+
+    virtual ~nsXPIDLCString();
+
+	/**
+	 * Assign a single-byte string to this wrapper. Copies and owns the result.
+	 */
+	nsXPIDLCString& operator =(const char* aString);
+
+    /**
+     * Return a reference to the immutable single-byte string.
+     */
+    operator const char*();
+
+    /**
+     * Make a copy of the single-byte string. Use this function in the
+     * callee to ensure that the correct memory allocator is used.
+     */
+    static char* Copy(const char* aString);
+
+    // A helper class for assignment-by-value. This class is an
+    // implementation detail and should not be considered part of the
+    // public interface.
+    class NS_COM GetterCopies {
+    private:
+        nsXPIDLCString& mXPIDLString;
+
+    public:
+        GetterCopies(nsXPIDLCString& aXPIDLString)
+            : mXPIDLString(aXPIDLString) {}
+
+        operator char**() {
+            return mXPIDLString.StartAssignmentByValue();
+        }
+
+        friend GetterCopies getter_Copies(nsXPIDLCString& aXPIDLString);
+    };
+
+    friend class GetterCopies;
+
+    // A helper class for assignment-by-reference. This class is an
+    // implementation detail and should not be considered part of the
+    // public interface.
+    class NS_COM GetterShares {
+    private:
+        nsXPIDLCString& mXPIDLString;
+
+    public:
+        GetterShares(nsXPIDLCString& aXPIDLString)
+            : mXPIDLString(aXPIDLString) {}
+
+        operator const char**() {
+            return mXPIDLString.StartAssignmentByReference();
+        }
+
+        friend GetterShares getter_Shares(nsXPIDLCString& aXPIDLString);
+    };
+
+    friend class GetterShares;
+
+private:
+    // not to be implemented
+    nsXPIDLCString(nsXPIDLCString& /* aXPIDLString */) {}
+    nsXPIDLCString& operator =(nsXPIDLCString& /* aXPIDLCString */) { return *this; }
+};
+
+/**
+ * Use this function to "wrap" the nsXPIDLCString object that is to
+ * receive an |out| value.
+ */
+inline nsXPIDLCString::GetterCopies
+getter_Copies(nsXPIDLCString& aXPIDLString)
+{
+    return nsXPIDLCString::GetterCopies(aXPIDLString);
+}
+
+
+/**
+ * Use this function to "wrap" the nsXPIDLCString object that is to
+ * receive a |[shared] out| value.
+ */
+inline nsXPIDLCString::GetterShares
+getter_Shares(nsXPIDLCString& aXPIDLString)
+{
+    return nsXPIDLCString::GetterShares(aXPIDLString);
+}
+
+
+
+#endif // nsXPIDLString_h__

mozilla/xpcom/ds/MANIFEST

@@ -0,0 +1,30 @@
+nsAVLTree.h
+nsCppSharedAllocator.h
+nsCRT.h
+nsDeque.h
+nsEnumeratorUtils.h
+nsHashtable.h
+nsHashtableEnumerator.h
+nsIArena.h
+nsIBuffer.h
+nsIByteBuffer.h
+nsIObserverList.h
+nsIPageManager.h
+nsIProperties.h
+nsISimpleEnumerator.h
+nsISizeOfHandler.h
+nsIUnicharBuffer.h
+nsIVariant.h
+nsInt64.h
+nsQuickSort.h
+nsStr.h
+nsString.h
+nsString2.h
+nsSupportsPrimitives.h
+nsTime.h
+nsUnitConversion.h
+nsVector.h
+nsVoidArray.h
+nsXPIDLString.h
+plvector.h
+nsTextFormater.h

mozilla/xpcom/ds/MANIFEST_IDL

@@ -0,0 +1,6 @@
+nsIAtom.idl
+nsICollection.idl
+nsIEnumerator.idl
+nsIObserver.idl
+nsIObserverService.idl
+nsISupportsArray.idl

mozilla/xpcom/ds/Makefile.in

@@ -0,0 +1,113 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= xpcom
+XPIDL_MODULE	= xpcom_ds
+LIBRARY_NAME	= xpcomds_s
+
+REQUIRES	= xpcom uconv unicharutil
+
+CPPSRCS		= \
+		nsArena.cpp \
+		nsAtomTable.cpp \
+		nsAVLTree.cpp \
+		nsByteBuffer.cpp \
+		nsCRT.cpp \
+		nsConjoiningEnumerator.cpp \
+		nsDeque.cpp \
+		nsEmptyEnumerator.cpp \
+		nsEnumeratorUtils.cpp \
+		nsHashtable.cpp \
+		nsHashtableEnumerator.cpp \
+		nsObserver.cpp \
+		nsObserverList.cpp \
+		nsObserverService.cpp \
+		nsProperties.cpp \
+		nsQuickSort.cpp \
+		nsSizeOfHandler.cpp \
+		nsStr.cpp \
+		nsString.cpp \
+		nsString2.cpp \
+		nsSupportsArray.cpp \
+		nsSupportsArrayEnumerator.cpp \
+		nsSupportsPrimitives.cpp \
+		nsUnicharBuffer.cpp \
+		nsVariant.cpp \
+		nsVoidArray.cpp \
+		nsXPIDLString.cpp \
+		plvector.cpp \
+		nsTextFormater.cpp \
+		$(NULL)
+
+EXPORTS		= \
+		nsAVLTree.h \
+		nsCppSharedAllocator.h \
+		nsCRT.h \
+		nsDeque.h \
+		nsEnumeratorUtils.h \
+		nsHashtable.h \
+		nsHashtableEnumerator.h \
+		nsIArena.h \
+		nsIByteBuffer.h \
+		nsIObserverList.h \
+		nsIProperties.h \
+		nsISimpleEnumerator.h \
+		nsISizeOfHandler.h \
+		nsIUnicharBuffer.h \
+		nsIVariant.h \
+		nsInt64.h \
+		nsQuickSort.h \
+		nsStr.h \
+		nsString.h \
+		nsString2.h \
+		nsSupportsPrimitives.h \
+		nsTime.h \
+		nsUnitConversion.h \
+		nsVector.h \
+		nsVoidArray.h \
+		nsXPIDLString.h \
+		plvector.h \
+		nsTextFormater.h \
+		$(NULL)			
+
+XPIDLSRCS	= \
+		nsIAtom.idl \
+		nsICollection.idl \
+		nsIEnumerator.idl \
+		nsIObserver.idl \
+		nsIObserverService.idl \
+		nsISupportsArray.idl \
+		nsISupportsPrimitives.idl \
+		$(NULL)
+
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
+

mozilla/xpcom/ds/bufferRoutines.h

@@ -0,0 +1,758 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/******************************************************************************************
+  MODULE NOTES:
+
+  This file contains the workhorse copy and shift functions used in nsStrStruct.
+  Ultimately, I plan to make the function pointers in this system available for 
+  use by external modules. They'll be able to install their own "handlers".
+  Not so, today though.
+
+*******************************************************************************************/
+
+#ifndef _BUFFERROUTINES_H
+#define _BUFFERROUTINES_H
+
+#include "nsCRT.h"
+
+#ifndef RICKG_TESTBED
+#include "nsUnicharUtilCIID.h"
+#include "nsIServiceManager.h"
+#include "nsICaseConversion.h"
+#endif
+
+#define KSHIFTLEFT  (0)
+#define KSHIFTRIGHT (1)
+
+
+inline PRUnichar GetUnicharAt(const char* aString,PRUint32 anIndex) {
+  return ((PRUnichar*)aString)[anIndex];
+}
+
+inline PRUnichar GetCharAt(const char* aString,PRUint32 anIndex) {
+  return (PRUnichar)aString[anIndex];
+}
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to shift the contents of a char buffer.
+//  The functions are differentiated by shift direction and the underlying charsize.
+//
+
+/**
+ * This method shifts single byte characters left by a given amount from an given offset.
+ * @update	gess 01/04/99
+ * @param   aDest is a ptr to a cstring where left-shift is to be performed
+ * @param   aLength is the known length of aDest
+ * @param   anOffset is the index into aDest where shifting shall begin
+ * @param   aCount is the number of chars to be "cut"
+ */
+void ShiftCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
+  char*   dst = aDest+anOffset;
+  char*   src = aDest+anOffset+aCount;
+
+  memmove(dst,src,aLength-(aCount+anOffset));
+}
+
+/**
+ * This method shifts single byte characters right by a given amount from an given offset.
+ * @update	gess 01/04/99
+ * @param   aDest is a ptr to a cstring where the shift is to be performed
+ * @param   aLength is the known length of aDest
+ * @param   anOffset is the index into aDest where shifting shall begin
+ * @param   aCount is the number of chars to be "inserted"
+ */
+void ShiftCharsRight(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
+  char* src = aDest+anOffset;
+  char* dst = aDest+anOffset+aCount;
+
+  memmove(dst,src,aLength-anOffset);
+}
+
+/**
+ * This method shifts unicode characters by a given amount from an given offset.
+ * @update	gess 01/04/99
+ * @param   aDest is a ptr to a cstring where the shift is to be performed
+ * @param   aLength is the known length of aDest
+ * @param   anOffset is the index into aDest where shifting shall begin
+ * @param   aCount is the number of chars to be "cut"
+ */
+void ShiftDoubleCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
+  PRUnichar* root=(PRUnichar*)aDest;
+  PRUnichar* dst = root+anOffset;
+  PRUnichar* src = root+anOffset+aCount;
+
+  memmove(dst,src,(aLength-(aCount+anOffset))*sizeof(PRUnichar));
+}
+
+
+/**
+ * This method shifts unicode characters by a given amount from an given offset.
+ * @update	gess 01/04/99
+ * @param   aDest is a ptr to a cstring where the shift is to be performed
+ * @param   aLength is the known length of aDest
+ * @param   anOffset is the index into aDest where shifting shall begin
+ * @param   aCount is the number of chars to be "inserted"
+ */
+void ShiftDoubleCharsRight(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
+  PRUnichar* root=(PRUnichar*)aDest;
+  PRUnichar* src = root+anOffset;
+  PRUnichar* dst = root+anOffset+aCount;
+
+  memmove(dst,src,sizeof(PRUnichar)*(aLength-anOffset));
+}
+
+
+typedef void (*ShiftChars)(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount);
+ShiftChars gShiftChars[2][2]= {
+  {&ShiftCharsLeft,&ShiftCharsRight},
+  {&ShiftDoubleCharsLeft,&ShiftDoubleCharsRight}
+};
+
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to copy one buffer onto another.
+//  The functions are differentiated by the size of source and dest character sizes.
+//  WARNING: Your destination buffer MUST be big enough to hold all the source bytes.
+//           We don't validate these ranges here (this should be done in higher level routines).
+//
+
+
+/**
+ * Going 1 to 1 is easy, since we assume ascii. No conversions are necessary.
+ * @update	gess 01/04/99
+ * @param aDest is the destination buffer
+ * @param aDestOffset is the pos to start copy to in the dest buffer
+ * @param aSource is the source buffer
+ * @param anOffset is the offset to start copying from in the source buffer
+ * @param aCount is the (max) number of chars to copy
+ */
+void CopyChars1To1(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
+
+  char* dst = aDest+anDestOffset;
+  char* src = (char*)aSource+anOffset;
+
+  memcpy(dst,src,aCount);
+} 
+
+/**
+ * Going 1 to 2 requires a conversion from ascii to unicode. This can be expensive.
+ * @param aDest is the destination buffer
+ * @param aDestOffset is the pos to start copy to in the dest buffer
+ * @param aSource is the source buffer
+ * @param anOffset is the offset to start copying from in the source buffer
+ * @param aCount is the (max) number of chars to copy
+ */
+void CopyChars1To2(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
+
+  PRUnichar* theDest=(PRUnichar*)aDest;
+  PRUnichar* to   = theDest+anDestOffset;
+  const unsigned char* first= (const unsigned char*)aSource+anOffset;
+  const unsigned char* last = first+aCount;
+
+  //now loop over characters, shifting them left...
+  while(first<last) {
+    *to=(PRUnichar)(*first);  
+    to++;
+    first++;
+  }
+}
+ 
+
+/**
+ * Going 2 to 1 requires a conversion from unicode down to ascii. This can be lossy.
+ * @update	gess 01/04/99
+ * @param aDest is the destination buffer
+ * @param aDestOffset is the pos to start copy to in the dest buffer
+ * @param aSource is the source buffer
+ * @param anOffset is the offset to start copying from in the source buffer
+ * @param aCount is the (max) number of chars to copy
+ */
+void CopyChars2To1(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
+  char*             to   = aDest+anDestOffset;
+  PRUnichar*        theSource=(PRUnichar*)aSource;
+  const PRUnichar*  first= theSource+anOffset;
+  const PRUnichar*  last = first+aCount;
+
+  //now loop over characters, shifting them left...
+  while(first<last) {
+    if(*first<256)
+      *to=(char)*first;  
+    else *to='.';
+    to++;
+    first++;
+  }
+}
+
+/**
+ * Going 2 to 2 is fast and efficient.
+ * @update	gess 01/04/99
+ * @param aDest is the destination buffer
+ * @param aDestOffset is the pos to start copy to in the dest buffer
+ * @param aSource is the source buffer
+ * @param anOffset is the offset to start copying from in the source buffer
+ * @param aCount is the (max) number of chars to copy
+ */
+void CopyChars2To2(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
+  PRUnichar* theDest=(PRUnichar*)aDest;
+  PRUnichar* to   = theDest+anDestOffset;
+  PRUnichar* theSource=(PRUnichar*)aSource;
+  PRUnichar* from= theSource+anOffset;
+
+  memcpy((void*)to,(void*)from,aCount*sizeof(PRUnichar));
+}
+
+
+//--------------------------------------------------------------------------------------
+
+
+typedef void (*CopyChars)(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount);
+
+CopyChars gCopyChars[2][2]={
+  {&CopyChars1To1,&CopyChars1To2},
+  {&CopyChars2To1,&CopyChars2To2}
+};
+
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to search a buffer looking for a char.
+//
+
+
+/**
+ *  This methods cans the given buffer for the given char
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest is the buffer to be searched
+ *  @param   aLength is the size (in char-units, not bytes) of the buffer
+ *  @param   anOffset is the start pos to begin searching
+ *  @param   aChar is the target character we're looking for
+ *  @param   aIgnorecase tells us whether to use a case sensitive search
+ *  @return  index of pos if found, else -1 (kNotFound)
+ */
+inline PRInt32 FindChar1(const char* aDest,PRUint32 aLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
+
+  if(aIgnoreCase) {
+    char theChar=(char)nsCRT::ToUpper(aChar);
+    const char* ptr=aDest+(anOffset-1);
+    const char* last=aDest+aLength;
+    while(++ptr<last){
+      if(nsCRT::ToUpper(*ptr)==theChar)
+        return ptr-aDest;
+    }
+  }
+  else {
+
+    const char* ptr = aDest+anOffset;
+    char theChar=(char)aChar;
+    const char* result=(const char*)memchr(ptr, theChar,aLength-anOffset);
+    if(result) {
+      return result-aDest;
+    }
+  }
+  return kNotFound;
+}
+
+/**
+ *  This methods cans the given buffer for the given char
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest is the buffer to be searched
+ *  @param   aLength is the size (in char-units, not bytes) of the buffer
+ *  @param   anOffset is the start pos to begin searching
+ *  @param   aChar is the target character we're looking for
+ *  @param   aIgnorecase tells us whether to use a case sensitive search
+ *  @return  index of pos if found, else -1 (kNotFound)
+ */
+inline PRInt32 FindChar2(const char* aDest,PRUint32 aLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
+  const PRUnichar*  root=(PRUnichar*)aDest;
+  const PRUnichar*  ptr=root+(anOffset-1);
+  const PRUnichar*  last=root+aLength;
+
+  if(aIgnoreCase) {
+    PRUnichar theChar=nsCRT::ToUpper(aChar);
+    while(++ptr<last){
+      if(nsCRT::ToUpper(*ptr)==theChar)
+        return ptr-root;
+    }
+  }
+  else {
+    while(++ptr<last){
+      if(*ptr==aChar)
+        return (ptr-root);
+    }
+  }
+
+  return kNotFound;
+}
+
+
+/**
+ *  This methods cans the given buffer (in reverse) for the given char
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest is the buffer to be searched
+ *  @param   aLength is the size (in char-units, not bytes) of the buffer
+ *  @param   anOffset is the start pos to begin searching
+ *  @param   aChar is the target character we're looking for
+ *  @param   aIgnorecase tells us whether to use a case sensitive search
+ *  @return  index of pos if found, else -1 (kNotFound)
+ */
+inline PRInt32 RFindChar1(const char* aDest,PRUint32 aDestLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
+  PRInt32 theIndex=0;
+
+  if(aIgnoreCase) {
+    PRUnichar theChar=nsCRT::ToUpper(aChar);
+    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
+      if(nsCRT::ToUpper(aDest[theIndex])==theChar)
+        return theIndex;
+    }
+  }
+  else {
+    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
+      if(aDest[theIndex]==aChar)
+        return theIndex;
+    }
+  }
+
+  return kNotFound;
+}
+
+
+/**
+ *  This methods cans the given buffer for the given char
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest is the buffer to be searched
+ *  @param   aLength is the size (in char-units, not bytes) of the buffer
+ *  @param   anOffset is the start pos to begin searching
+ *  @param   aChar is the target character we're looking for
+ *  @param   aIgnorecase tells us whether to use a case sensitive search
+ *  @return  index of pos if found, else -1 (kNotFound)
+ */
+inline PRInt32 RFindChar2(const char* aDest,PRUint32 aDestLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
+
+  PRInt32 theIndex=0;
+  PRUnichar*  theBuf=(PRUnichar*)aDest;
+
+  if(aIgnoreCase) {
+    PRUnichar theChar=nsCRT::ToUpper(aChar);
+    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
+      if(nsCRT::ToUpper(theBuf[theIndex])==theChar)
+        return theIndex;
+    }
+  }
+  else {
+    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
+      if(theBuf[theIndex]==aChar)
+        return theIndex;
+    }
+  }
+
+  return kNotFound;
+}
+
+typedef PRInt32 (*FindChars)(const char* aDest,PRUint32 aDestLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase);
+FindChars gFindChars[]={&FindChar1,&FindChar2};
+FindChars gRFindChars[]={&RFindChar1,&RFindChar2};
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to compare one buffer onto another.
+//  The functions are differentiated by the size of source and dest character sizes.
+//  WARNING: Your destination buffer MUST be big enough to hold all the source bytes.
+//           We don't validate these ranges here (this should be done in higher level routines).
+//
+
+
+/**
+ * This method compares the data in one buffer with another
+ * @update	gess 01/04/99
+ * @param   aStr1 is the first buffer to be compared
+ * @param   aStr2 is the 2nd buffer to be compared
+ * @param   aCount is the number of chars to compare
+ * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @return  -1,0,1 depending on <,==,>
+ */
+PRInt32 Compare1To1(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
+  PRInt32 result=0;
+  if(aIgnoreCase)
+    result=nsCRT::strncasecmp(aStr1,aStr2,aCount);
+  else result=strncmp(aStr1,aStr2,aCount);
+  return result;
+}
+
+/**
+ * This method compares the data in one buffer with another
+ * @update	gess 01/04/99
+ * @param   aStr1 is the first buffer to be compared
+ * @param   aStr2 is the 2nd buffer to be compared
+ * @param   aCount is the number of chars to compare
+ * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @return  -1,0,1 depending on <,==,>
+ */
+PRInt32 Compare2To2(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
+  PRInt32 result=0;
+  if(aIgnoreCase)
+    result=nsCRT::strncasecmp((PRUnichar*)aStr1,(PRUnichar*)aStr2,aCount);
+  else result=nsCRT::strncmp((PRUnichar*)aStr1,(PRUnichar*)aStr2,aCount);
+  return result;
+}
+
+
+/**
+ * This method compares the data in one buffer with another
+ * @update	gess 01/04/99
+ * @param   aStr1 is the first buffer to be compared
+ * @param   aStr2 is the 2nd buffer to be compared
+ * @param   aCount is the number of chars to compare
+ * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @return  -1,0,1 depending on <,==,>
+ */
+PRInt32 Compare2To1(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
+  PRInt32 result;
+  if(aIgnoreCase)
+    result=nsCRT::strncasecmp((PRUnichar*)aStr1,aStr2,aCount);
+  else result=nsCRT::strncmp((PRUnichar*)aStr1,aStr2,aCount);
+  return result;
+}
+
+
+/**
+ * This method compares the data in one buffer with another
+ * @update	gess 01/04/99
+ * @param   aStr1 is the first buffer to be compared
+ * @param   aStr2 is the 2nd buffer to be compared
+ * @param   aCount is the number of chars to compare
+ * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @return  -1,0,1 depending on <,==,>
+ */
+PRInt32 Compare1To2(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
+  PRInt32 result;
+  if(aIgnoreCase)
+    result=nsCRT::strncasecmp((PRUnichar*)aStr2,aStr1,aCount)*-1;
+  else result=nsCRT::strncmp((PRUnichar*)aStr2,aStr1,aCount)*-1;
+  return result;
+}
+
+
+typedef PRInt32 (*CompareChars)(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase);
+CompareChars gCompare[2][2]={
+  {&Compare1To1,&Compare1To2},
+  {&Compare2To1,&Compare2To2},
+};
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to convert the case of strings...
+//
+
+
+/**
+ * This method performs a case conversion the data in the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be case shifted
+ * @param   aCount is the number of chars to compare
+ * @param   aToUpper tells us whether to convert to upper or lower
+ * @return  0
+ */
+PRInt32 ConvertCase1(char* aString,PRUint32 aCount,PRBool aToUpper){ 
+  PRInt32 result=0;
+
+  typedef char  chartype;
+  chartype* cp = (chartype*)aString;
+  chartype* end = cp + aCount-1;
+  while (cp <= end) {
+    chartype ch = *cp;
+    if(aToUpper) {
+      if ((ch >= 'a') && (ch <= 'z')) {
+        *cp = 'A' + (ch - 'a');
+      }
+    }
+    else {
+      if ((ch >= 'A') && (ch <= 'Z')) {
+        *cp = 'a' + (ch - 'A');
+      }
+    }
+    cp++;
+  }
+  return result;
+}
+
+//----------------------------------------------------------------------------------------
+
+#ifndef RICKG_TESTBED
+class HandleCaseConversionShutdown3 : public nsIShutdownListener {
+public :
+   NS_IMETHOD OnShutdown(const nsCID& cid, nsISupports* service);
+   HandleCaseConversionShutdown3(void) { NS_INIT_REFCNT(); }
+   virtual ~HandleCaseConversionShutdown3(void) {}
+   NS_DECL_ISUPPORTS
+};
+
+static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
+static NS_DEFINE_IID(kICaseConversionIID, NS_ICASECONVERSION_IID);
+static NS_DEFINE_IID(kIShutdownListenerIID, NS_ISHUTDOWNLISTENER_IID);
+static nsICaseConversion * gCaseConv = 0; 
+
+NS_IMPL_ISUPPORTS(HandleCaseConversionShutdown3, kIShutdownListenerIID);
+
+nsresult HandleCaseConversionShutdown3::OnShutdown(const nsCID& cid, nsISupports* service) {
+    if (cid.Equals(kUnicharUtilCID)) {
+        NS_ASSERTION(service == gCaseConv, "wrong service!");
+        if(gCaseConv){
+          gCaseConv->Release();
+          gCaseConv = 0;
+        }
+    }
+    return NS_OK;
+}
+
+
+class CCaseConversionServiceInitializer {
+public:
+  CCaseConversionServiceInitializer(){
+    mListener = new HandleCaseConversionShutdown3();
+    if(mListener){
+      mListener->AddRef();
+      nsServiceManager::GetService(kUnicharUtilCID, kICaseConversionIID,(nsISupports**) &gCaseConv, mListener);
+    }
+  }
+protected:
+  HandleCaseConversionShutdown3* mListener;
+};
+
+#endif
+
+//----------------------------------------------------------------------------------------
+
+/**
+ * This method performs a case conversion the data in the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be case shifted
+ * @param   aCount is the number of chars to compare
+ * @param   aToUpper tells us whether to convert to upper or lower
+ * @return  0
+ */
+PRInt32 ConvertCase2(char* aString,PRUint32 aCount,PRBool aToUpper){ 
+  PRUnichar* cp = (PRUnichar*)aString;
+  PRUnichar* end = cp + aCount-1;
+  PRInt32 result=0;
+
+#ifndef RICKG_TESTBED
+  static CCaseConversionServiceInitializer  gCaseConversionServiceInitializer;
+
+  // I18N code begin
+  if(gCaseConv) {
+    nsresult err=(aToUpper) ? gCaseConv->ToUpper(cp, cp, aCount) : gCaseConv->ToLower(cp, cp, aCount);
+    if(NS_SUCCEEDED(err))
+      return 0;
+  }
+  // I18N code end
+#endif
+
+
+  while (cp <= end) {
+    PRUnichar ch = *cp;
+    if(aToUpper) {
+      if ((ch >= 'a') && (ch <= 'z')) {
+        *cp = 'A' + (ch - 'a');
+      }
+    }
+    else {
+      if ((ch >= 'A') && (ch <= 'Z')) {
+        *cp = 'a' + (ch - 'A');
+      }
+    }
+    cp++;
+  }
+
+  return result;
+}
+
+typedef PRInt32 (*CaseConverters)(char*,PRUint32,PRBool);
+CaseConverters gCaseConverters[]={&ConvertCase1,&ConvertCase2};
+
+
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used compress char sequences in a buffer...
+//
+
+
+/**
+ * This method compresses duplicate runs of a given char from the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be manipulated
+ * @param   aLength is the length of the buffer
+ * @param   aSet tells us which chars to compress from given buffer
+ * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+ * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+ * @return  the new length of the given buffer
+ */
+PRInt32 CompressChars1(char* aString,PRUint32 aLength,const char* aSet){ 
+
+  typedef char  chartype;
+  chartype*  from = aString;
+  chartype*  end =  aString + aLength-1;
+  chartype*  to = from;
+
+    //this code converts /n, /t, /r into normal space ' ';
+    //it also compresses runs of whitespace down to a single char...
+  if(aSet && aString && (0 < aLength)){
+    PRUint32 aSetLen=strlen(aSet);
+    while (from <= end) {
+      chartype theChar = *from++;
+      if(kNotFound!=FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+        *to++=theChar;
+        while (from <= end) {
+          theChar = *from++;
+          if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+            *to++ = theChar;
+            break;
+          }
+        }
+      } else {
+        *to++ = theChar;
+      }
+    }
+    *to = 0;
+  }
+  return to - (chartype*)aString;
+}
+
+
+/**
+ * This method compresses duplicate runs of a given char from the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be manipulated
+ * @param   aLength is the length of the buffer
+ * @param   aSet tells us which chars to compress from given buffer
+ * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+ * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+ * @return  the new length of the given buffer
+ */
+PRInt32 CompressChars2(char* aString,PRUint32 aLength,const char* aSet){ 
+
+  typedef PRUnichar  chartype;
+  chartype*  from = (chartype*)aString;
+  chartype*  end =  from + aLength-1;
+  chartype*  to = from;
+
+    //this code converts /n, /t, /r into normal space ' ';
+    //it also compresses runs of whitespace down to a single char...
+  if(aSet && aString && (0 < aLength)){
+    PRUint32 aSetLen=strlen(aSet);
+    while (from <= end) {
+      chartype theChar = *from++;
+      if(kNotFound!=FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+        *to++=theChar;
+        while (from <= end) {
+          theChar = *from++;
+          if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+            *to++ = theChar;
+            break;
+          }
+        }
+      } else {
+        *to++ = theChar;
+      }
+    }
+    *to = 0;
+  }
+  return to - (chartype*)aString;
+}
+
+typedef PRInt32 (*CompressChars)(char* aString,PRUint32 aCount,const char* aSet);
+CompressChars gCompressChars[]={&CompressChars1,&CompressChars2};
+
+/**
+ * This method strips chars in a given set from the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be manipulated
+ * @param   aLength is the length of the buffer
+ * @param   aSet tells us which chars to compress from given buffer
+ * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+ * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+ * @return  the new length of the given buffer
+ */
+PRInt32 StripChars1(char* aString,PRUint32 aLength,const char* aSet){ 
+
+  typedef char  chartype;
+  chartype*  to   = aString;
+  chartype*  from = aString-1;
+  chartype*  end  = aString + aLength;
+
+  if(aSet && aString && (0 < aLength)){
+    PRUint32 aSetLen=strlen(aSet);
+    while (++from < end) {
+      chartype theChar = *from;
+      if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+        *to++ = theChar;
+      }
+    }
+    *to = 0;
+  }
+  return to - (chartype*)aString;
+}
+
+
+/**
+ * This method strips chars in a given set from the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be manipulated
+ * @param   aLength is the length of the buffer
+ * @param   aSet tells us which chars to compress from given buffer
+ * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+ * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+ * @return  the new length of the given buffer
+ */
+PRInt32 StripChars2(char* aString,PRUint32 aLength,const char* aSet){ 
+
+  typedef PRUnichar  chartype;
+  chartype*  to   = (chartype*)aString;
+  chartype*  from = (chartype*)aString-1;
+  chartype*  end  = to + aLength;
+
+  if(aSet && aString && (0 < aLength)){
+    PRUint32 aSetLen=strlen(aSet);
+    while (++from < end) {
+      chartype theChar = *from;
+      if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+        *to++ = theChar;
+      }
+    }
+    *to = 0;
+  }
+  return to - (chartype*)aString;
+}
+
+typedef PRInt32 (*StripChars)(char* aString,PRUint32 aCount,const char* aSet);
+StripChars gStripChars[]={&StripChars1,&StripChars2};
+
+#endif

mozilla/xpcom/ds/makefile.win

@@ -0,0 +1,120 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+
+
+DEPTH=..\..
+MODULE = xpcom 
+
+################################################################################
+## exports
+
+EXPORTS =                          \
+        nsTextFormater.h           \
+        nsAVLTree.h                \
+        nsCppSharedAllocator.h     \
+        nsCRT.h                    \
+        nsDeque.h                  \
+        nsEnumeratorUtils.h        \
+        nsHashtable.h              \
+        nsHashtableEnumerator.h    \
+        nsIArena.h                 \
+        nsIByteBuffer.h            \
+        nsIObserverList.h          \
+        nsIProperties.h            \
+        nsISimpleEnumerator.h      \
+        nsISizeOfHandler.h         \
+        nsIUnicharBuffer.h         \
+        nsIVariant.h               \
+        nsInt64.h                  \
+        nsQuickSort.h              \
+        nsStr.h                    \
+        nsString.h                 \
+        nsString2.h                \
+        nsSupportsPrimitives.h     \
+        nsTime.h                   \
+        nsUnitConversion.h         \
+        nsVector.h                 \
+        nsVoidArray.h              \
+        nsXPIDLString.h            \
+        plvector.h                 \
+        $(NULL)			
+
+XPIDL_MODULE = xpcom_ds
+
+XPIDLSRCS =                         \
+        .\nsIAtom.idl               \
+        .\nsICollection.idl         \
+        .\nsIEnumerator.idl         \
+	.\nsIObserver.idl           \
+	.\nsIObserverService.idl    \
+	.\nsISupportsArray.idl	    \
+	.\nsISupportsPrimitives.idl \
+        $(NULL)
+
+################################################################################
+## library
+
+LIBRARY_NAME=xpcomds_s
+
+LINCS =                         \
+	-I$(PUBLIC)\xpcom       \
+        -I$(PUBLIC)\uconv       \
+        -I$(PUBLIC)\unicharutil \
+	$(NULL)
+
+LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
+
+CPP_OBJS =                                        \
+        .\$(OBJDIR)\nsTextFormater.obj            \
+        .\$(OBJDIR)\nsArena.obj                   \
+        .\$(OBJDIR)\nsAtomTable.obj               \
+        .\$(OBJDIR)\nsAVLTree.obj                 \
+        .\$(OBJDIR)\nsByteBuffer.obj              \
+        .\$(OBJDIR)\nsCRT.obj                     \
+        .\$(OBJDIR)\nsConjoiningEnumerator.obj    \
+        .\$(OBJDIR)\nsDeque.obj                   \
+        .\$(OBJDIR)\nsEmptyEnumerator.obj         \
+        .\$(OBJDIR)\nsEnumeratorUtils.obj         \
+        .\$(OBJDIR)\nsHashtable.obj               \
+        .\$(OBJDIR)\nsHashtableEnumerator.obj     \
+        .\$(OBJDIR)\nsObserver.obj                \
+        .\$(OBJDIR)\nsObserverList.obj            \
+        .\$(OBJDIR)\nsObserverService.obj         \
+        .\$(OBJDIR)\nsProperties.obj              \
+        .\$(OBJDIR)\nsQuickSort.obj               \
+        .\$(OBJDIR)\nsSizeOfHandler.obj           \
+        .\$(OBJDIR)\nsStr.obj                     \
+        .\$(OBJDIR)\nsString.obj                  \
+        .\$(OBJDIR)\nsString2.obj                 \
+        .\$(OBJDIR)\nsSupportsArray.obj           \
+        .\$(OBJDIR)\nsSupportsArrayEnumerator.obj \
+        .\$(OBJDIR)\nsSupportsPrimitives.obj      \
+        .\$(OBJDIR)\nsUnicharBuffer.obj           \
+        .\$(OBJDIR)\nsVariant.obj                 \
+        .\$(OBJDIR)\nsVoidArray.obj               \
+        .\$(OBJDIR)\nsXPIDLString.obj             \
+        .\$(OBJDIR)\plvector.obj                  \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+libs:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/xpcom/ds/nsAVLTree.cpp

@@ -0,0 +1,617 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsAVLTree.h"
+ 
+
+enum eLean      {eLeft,eNeutral,eRight};
+
+struct NS_COM nsAVLNode {
+public:
+
+  nsAVLNode(void* aValue) {
+    mLeft=0;
+    mRight=0;
+    mSkew=eNeutral;
+    mValue=aValue;
+  }
+
+  nsAVLNode*  mLeft;
+  nsAVLNode*  mRight;
+  eLean       mSkew;
+  void*       mValue;
+};
+
+
+/************************************************************
+  Now begin the tree class. Don't forget that the comparison
+  between nodes must occur via the comparitor function, 
+  otherwise all you're testing is pointer addresses.
+ ************************************************************/
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+nsAVLTree::nsAVLTree(nsAVLNodeComparitor& aComparitor, 
+                     nsAVLNodeFunctor* aDeallocator) :
+  mComparitor(aComparitor), mDeallocator(aDeallocator) {
+  mRoot=0;
+  mCount=0;
+}
+
+
+static void 
+avlDeleteTree(nsAVLNode* aNode){
+  if (aNode) {
+    avlDeleteTree(aNode->mLeft);
+    avlDeleteTree(aNode->mRight);
+    delete aNode;
+  }
+}
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+nsAVLTree::~nsAVLTree(){
+  if (mDeallocator) {
+    ForEachDepthFirst(*mDeallocator);
+  }
+  avlDeleteTree(mRoot);
+}
+
+
+class CDoesntExist: public nsAVLNodeFunctor {
+public:
+  CDoesntExist(const nsAVLTree& anotherTree) : mOtherTree(anotherTree) {
+  }
+  virtual void* operator()(void* anItem) {
+    void* result=mOtherTree.FindItem(anItem);
+    if(result)
+      return nsnull;
+    return anItem;
+  }
+protected:
+  const nsAVLTree& mOtherTree;
+};
+
+/**
+ * This method compares two trees (members by identity).
+ * @update	gess12/27/98
+ * @param   tree to compare against
+ * @return  true if they are identical (contain same stuff).
+ */
+PRBool nsAVLTree::operator==(const nsAVLTree& aCopy) const{
+  CDoesntExist functor(aCopy);
+  void* theItem=FirstThat(functor);
+  PRBool result=PRBool(!theItem);
+  return result;
+}
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateRight(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mRight;
+  if(ptr2->mSkew==eRight) {
+    aRootNode->mRight=ptr2->mLeft;
+    ptr2->mLeft=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mLeft;
+    ptr2->mLeft=ptr3->mRight;
+    ptr3->mRight=ptr2;
+    aRootNode->mRight=ptr3->mLeft;
+    ptr3->mLeft=aRootNode;
+    if(ptr3->mSkew==eLeft)
+      ptr2->mSkew=eRight;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eRight)
+      aRootNode->mSkew=eLeft;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateLeft(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mLeft;
+  if(ptr2->mSkew==eLeft) {
+    aRootNode->mLeft=ptr2->mRight;
+    ptr2->mRight=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mRight;
+    ptr2->mRight=ptr3->mLeft;
+    ptr3->mLeft=ptr2;
+    aRootNode->mLeft=ptr3->mRight;
+    ptr3->mRight=aRootNode;
+    if(ptr3->mSkew==eRight)
+      ptr2->mSkew=eLeft;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eLeft)
+      aRootNode->mSkew=eRight;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlInsert(nsAVLNode*& aRootNode, nsAVLNode* aNewNode, 
+          nsAVLNodeComparitor& aComparitor) {
+  eAVLStatus result=eAVL_unknown;
+  
+  if(!aRootNode) {
+    aRootNode = aNewNode;
+    return eAVL_ok;
+  }
+  
+  if(aNewNode==aRootNode->mValue) {
+    return eAVL_duplicate;
+  }
+
+  PRInt32 theCompareResult=aComparitor(aRootNode->mValue,aNewNode->mValue);
+  if(0 < theCompareResult) { //if(anItem<aRootNode->mValue)
+    result=avlInsert(aRootNode->mLeft,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          avlRotateLeft(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eRight:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eLeft;
+          break;
+      } //switch
+    }//if
+  } //if
+  else { 
+    result=avlInsert(aRootNode->mRight,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eRight:
+          avlRotateRight(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eRight;
+          break;
+      } //switch
+    }
+  } //if
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceLeft(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      ptr2=aRootNode->mLeft;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eRight) {
+        aRootNode->mLeft=ptr2->mRight;
+        ptr2->mRight=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eLeft;
+          ptr2->mSkew=eRight;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mRight;
+        balnc3=ptr3->mSkew;
+        ptr2->mRight=ptr3->mLeft;
+        ptr3->mLeft=ptr2;
+        aRootNode->mLeft=ptr3->mRight;
+        ptr3->mRight=aRootNode;
+        if(balnc3==eRight) {
+          ptr2->mSkew=eLeft;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eLeft) {
+          aRootNode->mSkew=eRight;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eRight:
+      aRootNode->mSkew=eNeutral;
+      break;
+    
+    case eNeutral:
+      aRootNode->mSkew=eLeft;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceRight(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      aRootNode->mSkew=eNeutral;
+      break;
+
+    case eRight:
+      ptr2=aRootNode->mRight;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eLeft) {
+        aRootNode->mRight=ptr2->mLeft;
+        ptr2->mLeft=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eRight;
+          ptr2->mSkew=eLeft;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mLeft;
+        balnc3=ptr3->mSkew;
+        ptr2->mLeft=ptr3->mRight;
+        ptr3->mRight=ptr2;
+        aRootNode->mRight=ptr3->mLeft;
+        ptr3->mLeft=aRootNode;
+        if(balnc3==eLeft) {
+          ptr2->mSkew=eRight;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eRight) {
+          aRootNode->mSkew=eLeft;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eNeutral:
+      aRootNode->mSkew=eRight;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemoveChildren(nsAVLNode*& aRootNode,nsAVLNode*& anotherNode, PRBool& delOk){
+  eAVLStatus result=eAVL_ok;
+  
+  if(!anotherNode->mRight){
+    aRootNode->mValue=anotherNode->mValue; //swap
+    anotherNode=anotherNode->mLeft;
+    delOk=PR_TRUE;
+  }
+  else{
+    avlRemoveChildren(aRootNode,anotherNode->mRight,delOk);
+    if(delOk)
+      avlBalanceLeft(anotherNode,delOk);
+  }
+
+  return result;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemove(nsAVLNode*& aRootNode, void* anItem, PRBool& delOk,
+          nsAVLNodeComparitor& aComparitor){
+  eAVLStatus result=eAVL_ok;
+
+  if(!aRootNode)
+    delOk=PR_FALSE;
+  else {
+    PRInt32 cmp=aComparitor(anItem,aRootNode->mValue);
+    if(cmp<0){
+      avlRemove(aRootNode->mLeft,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceRight(aRootNode,delOk);
+    }
+    else if(cmp>0){
+      avlRemove(aRootNode->mRight,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceLeft(aRootNode,delOk);
+    }
+    else{ //they match...
+      nsAVLNode* temp=aRootNode;
+      if(!aRootNode->mRight) {
+        aRootNode=aRootNode->mLeft;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else if(!aRootNode->mLeft) {
+        aRootNode=aRootNode->mRight;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else {
+        avlRemoveChildren(aRootNode,aRootNode->mLeft,delOk);
+        if(delOk)
+          avlBalanceRight(aRootNode,delOk);
+      }
+    }
+  }
+
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+eAVLStatus 
+nsAVLTree::AddItem(void* anItem){
+  eAVLStatus result=eAVL_ok;
+
+  nsAVLNode* theNewNode=new nsAVLNode(anItem);
+  result=avlInsert(mRoot,theNewNode,mComparitor);
+  if(eAVL_duplicate!=result)
+    mCount++;
+  else {
+    delete theNewNode;
+  }
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+void* nsAVLTree::FindItem(void* aValue) const{
+  nsAVLNode* result=mRoot;
+  PRInt32 count=0;
+  while(result) {
+    count++;
+    PRInt32 cmp=mComparitor(aValue,result->mValue);
+    if(0==cmp) {
+      //we matched...
+      break;
+    }
+    else if(0>cmp){
+      //theNode was greater...
+      result=result->mLeft;
+    }
+    else {
+      //aValue is greater...
+      result=result->mRight;
+    }
+  }
+  if(result) {
+    return result->mValue;
+  }
+  return nsnull;
+}
+
+
+/**
+ * 
+ * @update	gess12/30/98
+ * @param 
+ * @return
+ */
+eAVLStatus 
+nsAVLTree::RemoveItem(void* aValue){
+  PRBool delOk=PR_TRUE;
+  eAVLStatus result=avlRemove(mRoot,aValue,delOk,mComparitor);
+  if(eAVL_ok==result)
+    mCount--;
+  return result;
+} 
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEachDepthFirst(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor){
+  if(aNode) {
+    avlForEachDepthFirst(aNode->mLeft,aFunctor);
+    avlForEachDepthFirst(aNode->mRight,aFunctor);
+    aFunctor(aNode->mValue);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEachDepthFirst(mRoot,aFunctor);
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEach(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  if(aNode) {
+    avlForEach(aNode->mLeft,aFunctor);
+    aFunctor(aNode->mValue);
+    avlForEach(aNode->mRight,aFunctor);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEach(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEach(mRoot,aFunctor);
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void* 
+avlFirstThat(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  void* result=nsnull;
+  if(aNode) {
+    result = avlFirstThat(aNode->mLeft,aFunctor);
+    if (result) {
+      return result;
+    }
+    result = aFunctor(aNode->mValue);
+    if (result) {
+      return result;
+    }
+    result = avlFirstThat(aNode->mRight,aFunctor);
+  }
+  return result;
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void* 
+nsAVLTree::FirstThat(nsAVLNodeFunctor& aFunctor) const{
+  return ::avlFirstThat(mRoot,aFunctor);
+}
+

mozilla/xpcom/ds/nsAVLTree.h

@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsAVLTree_h___
+#define nsAVLTree_h___
+
+
+#include "nscore.h"
+
+
+enum eAVLStatus {eAVL_unknown,eAVL_ok,eAVL_fail,eAVL_duplicate};
+
+
+struct nsAVLNode;
+
+/**
+ * 
+ * @update	gess12/26/98
+ * @param anObject1 is the first object to be compared
+ * @param anObject2 is the second object to be compared
+ * @return -1,0,1 if object1 is less, equal, greater than object2
+ */
+class NS_COM nsAVLNodeComparitor {
+public:
+  virtual PRInt32 operator()(void* anItem1,void* anItem2)=0;
+}; 
+
+class NS_COM nsAVLNodeFunctor {
+public:
+  virtual void* operator()(void* anItem)=0;
+};
+
+class NS_COM nsAVLTree {
+public:
+              nsAVLTree(nsAVLNodeComparitor& aComparitor, nsAVLNodeFunctor* aDeallocator);
+              ~nsAVLTree(void);
+
+  PRBool      operator==(const nsAVLTree& aOther) const;
+  PRInt32     GetCount(void) const {return mCount;}
+
+              //main functions...
+  eAVLStatus  AddItem(void* anItem);
+  eAVLStatus  RemoveItem(void* anItem);
+  void*       FindItem(void* anItem) const;
+  void        ForEach(nsAVLNodeFunctor& aFunctor) const;
+  void        ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const;
+  void*       FirstThat(nsAVLNodeFunctor& aFunctor) const;
+
+protected: 
+
+  nsAVLNode*  mRoot;
+  PRInt32     mCount;
+  nsAVLNodeComparitor&  mComparitor;
+  nsAVLNodeFunctor*     mDeallocator;
+};
+
+
+#endif /* nsAVLTree_h___ */
+

mozilla/xpcom/ds/nsArena.cpp

@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsArena.h"
+#include "nsCRT.h"
+
+ArenaImpl::ArenaImpl(void)
+  : mInitialized(PR_FALSE)
+{
+  NS_INIT_REFCNT();
+  nsCRT::memset(&mPool, 0, sizeof(PLArenaPool));
+}
+
+NS_IMETHODIMP
+ArenaImpl::Init(PRUint32 aBlockSize)
+{
+  if (aBlockSize < NS_MIN_ARENA_BLOCK_SIZE) {
+    aBlockSize = NS_DEFAULT_ARENA_BLOCK_SIZE;
+  }
+  PL_INIT_ARENA_POOL(&mPool, "nsIArena", aBlockSize);
+  mBlockSize = aBlockSize;
+  mInitialized = PR_TRUE;
+  return NS_OK;
+}
+
+NS_IMPL_ISUPPORTS1(ArenaImpl, nsIArena)
+
+ArenaImpl::~ArenaImpl()
+{
+  if (mInitialized)
+    PL_FinishArenaPool(&mPool);
+
+  mInitialized = PR_FALSE;
+}
+
+NS_IMETHODIMP_(void*)
+ArenaImpl::Alloc(PRUint32 size)
+{
+  // Adjust size so that it's a multiple of sizeof(double)
+  PRUint32 align = size & (sizeof(double) - 1);
+  if (0 != align) {
+    size += sizeof(double) - align;
+  }
+
+  void* p;
+  PL_ARENA_ALLOCATE(p, &mPool, size);
+  return p;
+}
+
+NS_METHOD
+ArenaImpl::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+  if (aOuter)
+    return NS_ERROR_NO_AGGREGATION;
+  
+  ArenaImpl* it = new ArenaImpl();
+  if (nsnull == it)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(it);
+  nsresult rv = it->QueryInterface(aIID, aResult);
+  NS_RELEASE(it);
+  return rv;
+}
+
+NS_COM nsresult NS_NewHeapArena(nsIArena** aInstancePtrResult,
+                                 PRUint32 aArenaBlockSize)
+{
+  nsresult rv;
+  nsIArena* arena;
+  rv = ArenaImpl::Create(NULL, nsIArena::GetIID(), (void**)&arena);
+  if (NS_FAILED(rv)) return rv;
+    
+  rv = arena->Init(aArenaBlockSize);
+  if (NS_FAILED(rv)) {
+    NS_RELEASE(arena);
+    return rv;
+  }    
+  
+  *aInstancePtrResult = arena;
+  return rv;
+}

mozilla/xpcom/ds/nsArena.h

@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsArena_h__
+#define nsArena_h__
+
+#include "nsIArena.h"
+
+#define PL_ARENA_CONST_ALIGN_MASK 7
+#include "plarena.h"
+
+// Simple arena implementation layered on plarena
+class ArenaImpl : public nsIArena {
+public:
+  ArenaImpl(void);
+  virtual ~ArenaImpl();
+
+  NS_DECL_ISUPPORTS
+
+  static NS_METHOD
+  Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+  NS_IMETHOD Init(PRUint32 arenaBlockSize);
+
+  NS_IMETHOD_(void*) Alloc(PRUint32 size);
+
+protected:
+  PLArenaPool mPool;
+  PRUint32 mBlockSize;
+
+private:
+  PRBool mInitialized;
+};
+
+#endif // nsArena_h__

mozilla/xpcom/ds/nsAtomTable.cpp

@@ -0,0 +1,172 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsAtomTable.h"
+#include "nsString.h"
+#include "nsCRT.h"
+#include "plhash.h"
+#include "nsISizeOfHandler.h"
+
+/**
+ * The shared hash table for atom lookups.
+ */
+static nsrefcnt gAtoms;
+static struct PLHashTable* gAtomHashTable;
+
+#if defined(DEBUG) && (defined(XP_UNIX) || defined(XP_PC))
+static PRIntn
+DumpAtomLeaks(PLHashEntry *he, PRIntn index, void *arg)
+{
+  AtomImpl* atom = (AtomImpl*) he->value;
+  if (atom) {
+    nsAutoString tmp;
+    atom->ToString(tmp);
+    fputs(tmp, stdout);
+    fputs("\n", stdout);
+  }
+  return HT_ENUMERATE_NEXT;
+}
+#endif
+
+NS_COM void NS_PurgeAtomTable(void)
+{
+  if (gAtomHashTable) {
+#if defined(DEBUG) && (defined(XP_UNIX) || defined(XP_PC))
+    if (gAtoms) {
+      if (getenv("MOZ_DUMP_ATOM_LEAKS")) {
+        printf("*** leaking %d atoms\n", gAtoms);
+        PL_HashTableEnumerateEntries(gAtomHashTable, DumpAtomLeaks, 0);
+      }
+    }
+#endif
+    PL_HashTableDestroy(gAtomHashTable);
+    gAtomHashTable = nsnull;
+  }
+}
+
+AtomImpl::AtomImpl()
+{
+  NS_INIT_REFCNT();
+  // Every live atom holds a reference on the atom hashtable
+  gAtoms++;
+}
+
+AtomImpl::~AtomImpl()
+{
+  NS_PRECONDITION(nsnull != gAtomHashTable, "null atom hashtable");
+  if (nsnull != gAtomHashTable) {
+    PL_HashTableRemove(gAtomHashTable, mString);
+    nsrefcnt cnt = --gAtoms;
+    if (0 == cnt) {
+      // When the last atom is destroyed, the atom arena is destroyed
+      NS_ASSERTION(0 == gAtomHashTable->nentries, "bad atom table");
+      PL_HashTableDestroy(gAtomHashTable);
+      gAtomHashTable = nsnull;
+    }
+  }
+}
+
+NS_IMPL_ISUPPORTS1(AtomImpl, nsIAtom)
+
+void* AtomImpl::operator new(size_t size, const PRUnichar* us, PRInt32 uslen)
+{
+  size = size + uslen * sizeof(PRUnichar);
+  AtomImpl* ii = (AtomImpl*) ::operator new(size);
+  nsCRT::memcpy(ii->mString, us, uslen * sizeof(PRUnichar));
+  ii->mString[uslen] = 0;
+  return ii;
+}
+
+NS_IMETHODIMP 
+AtomImpl::ToString(nsString& aBuf) /*FIX: const */
+{
+  aBuf.SetLength(0);
+  aBuf.Append(mString, nsCRT::strlen(mString));
+  return NS_OK;
+}
+
+NS_IMETHODIMP 
+AtomImpl::GetUnicode(const PRUnichar **aResult) /*FIX: const */
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+  *aResult = mString;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+AtomImpl::SizeOf(nsISizeOfHandler* aHandler, PRUint32* _retval) /*FIX: const */
+{
+  NS_ENSURE_ARG_POINTER(_retval);
+  PRUint32 sum = sizeof(*this) + nsCRT::strlen(mString) * sizeof(PRUnichar);
+  *_retval = sum;
+  return NS_OK;
+}
+
+//----------------------------------------------------------------------
+
+static PLHashNumber HashKey(const PRUnichar* k)
+{
+  return (PLHashNumber) nsCRT::HashValue(k);
+}
+
+static PRIntn CompareKeys(const PRUnichar* k1, const PRUnichar* k2)
+{
+  return nsCRT::strcmp(k1, k2) == 0;
+}
+
+NS_COM nsIAtom* NS_NewAtom(const char* isolatin1)
+{
+  nsAutoString tmp(isolatin1);
+  return NS_NewAtom(tmp.GetUnicode());
+}
+
+NS_COM nsIAtom* NS_NewAtom(const nsString& aString)
+{
+  return NS_NewAtom(aString.GetUnicode());
+}
+
+NS_COM nsIAtom* NS_NewAtom(const PRUnichar* us)
+{
+  if (nsnull == gAtomHashTable) {
+    gAtomHashTable = PL_NewHashTable(8, (PLHashFunction) HashKey,
+                                     (PLHashComparator) CompareKeys,
+                                     (PLHashComparator) nsnull,
+                                     nsnull, nsnull);
+  }
+  PRUint32 uslen;
+  PRUint32 hashCode = nsCRT::HashValue(us, &uslen);
+  PLHashEntry** hep = PL_HashTableRawLookup(gAtomHashTable, hashCode, us);
+  PLHashEntry* he = *hep;
+  if (nsnull != he) {
+    nsIAtom* id = (nsIAtom*) he->value;
+    NS_ADDREF(id);
+    return id;
+  }
+  AtomImpl* id = new(us, uslen) AtomImpl();
+  PL_HashTableRawAdd(gAtomHashTable, hep, hashCode, id->mString, id);
+  NS_ADDREF(id);
+  return id;
+}
+
+NS_COM nsrefcnt NS_GetNumberOfAtoms(void)
+{
+  if (nsnull != gAtomHashTable) {
+    NS_PRECONDITION(nsrefcnt(gAtomHashTable->nentries) == gAtoms, "bad atom table");
+  }
+  return gAtoms;
+}

mozilla/xpcom/ds/nsAtomTable.h

@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsAtomTable_h__
+#define nsAtomTable_h__
+
+#include "nsIAtom.h"
+
+class AtomImpl : public nsIAtom {
+public:
+  AtomImpl();
+  virtual ~AtomImpl();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIATOM
+
+  void* operator new(size_t size, const PRUnichar* us, PRInt32 uslen);
+
+  void operator delete(void* ptr) {
+    ::operator delete(ptr);
+  }
+
+  // Actually more; 0 terminated. This slot is reserved for the
+  // terminating zero.
+  PRUnichar mString[1];
+};
+
+#endif // nsAtomTable_h__

mozilla/xpcom/ds/nsBuffer.cpp

@@ -0,0 +1,723 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsBuffer.h"
+#include "nsAutoLock.h"
+#include "nsCRT.h"
+#include "nsIInputStream.h"
+#include "nsIServiceManager.h"
+#include "nsIPageManager.h"
+
+////////////////////////////////////////////////////////////////////////////////
+
+nsBuffer::nsBuffer()
+    : mGrowBySize(0),
+      mMaxSize(0),
+      mAllocator(nsnull),
+      mObserver(nsnull),
+      mBufferSize(0),
+      mReadSegment(nsnull),
+      mReadCursor(0),
+      mWriteSegment(nsnull),
+      mWriteCursor(0),
+      mReaderClosed(PR_FALSE),
+      mCondition(NS_OK)
+{
+    NS_INIT_REFCNT();
+    PR_INIT_CLIST(&mSegments);
+}
+
+NS_IMETHODIMP
+nsBuffer::Init(PRUint32 growBySize, PRUint32 maxSize,
+               nsIBufferObserver* observer, nsIAllocator* allocator)
+{
+    NS_ASSERTION(sizeof(PRCList) <= SEGMENT_OVERHEAD,
+                 "need to change SEGMENT_OVERHEAD size");
+    NS_ASSERTION(growBySize > SEGMENT_OVERHEAD, "bad growBySize");
+    mGrowBySize = growBySize;
+    mMaxSize = maxSize;
+    mObserver = observer;
+    NS_IF_ADDREF(mObserver);
+    mAllocator = allocator;
+    NS_ADDREF(mAllocator);
+    return NS_OK;
+}
+
+nsBuffer::~nsBuffer()
+{
+    // Free any allocated pages...
+    while (!PR_CLIST_IS_EMPTY(&mSegments)) {
+        PRCList* header = (PRCList*)mSegments.next;
+        char* segment = (char*)header;
+
+        PR_REMOVE_LINK(header);     // unlink from mSegments
+        (void) mAllocator->Free(segment);
+    }
+
+    NS_IF_RELEASE(mObserver);
+    NS_IF_RELEASE(mAllocator);
+}
+
+NS_IMPL_ISUPPORTS1(nsBuffer, nsIBuffer)
+
+NS_METHOD
+nsBuffer::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+    if (aOuter)
+        return NS_ERROR_NO_AGGREGATION;
+
+    nsBuffer* buf = new nsBuffer();
+    if (buf == nsnull)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(buf);
+    nsresult rv = buf->QueryInterface(aIID, aResult);
+    NS_RELEASE(buf);
+    return rv;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+nsresult
+nsBuffer::PushWriteSegment()
+{
+    nsAutoCMonitor mon(this);        // protect mSegments
+
+    if (mBufferSize >= mMaxSize) {
+        if (mObserver) {
+            nsresult rv = mObserver->OnFull(this);
+            if (NS_FAILED(rv)) return rv;
+        }
+        return NS_BASE_STREAM_WOULD_BLOCK;
+    }
+
+    // allocate a new segment to write into
+    PRCList* header;
+
+    header = (PRCList*)mAllocator->Alloc(mGrowBySize);
+    if (header == nsnull) 
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    mBufferSize += mGrowBySize;
+
+    PR_INSERT_BEFORE(header, &mSegments);       // insert at end
+
+    // initialize the write segment
+    mWriteSegment = header;
+    mWriteSegmentEnd = (char*)mWriteSegment + mGrowBySize;
+    mWriteCursor = (char*)mWriteSegment + sizeof(PRCList);
+
+    return NS_OK;
+}
+
+nsresult
+nsBuffer::PopReadSegment()
+{
+    nsresult rv;
+    nsAutoCMonitor mon(this);        // protect mSegments
+
+    PRCList* header = (PRCList*)mSegments.next;
+    char* segment = (char*)header;
+
+    NS_ASSERTION(mReadSegment == header, "wrong segment");
+
+    // make sure that the writer isn't still in this segment (that the
+    // reader is removing)
+    NS_ASSERTION(!(segment <= mWriteCursor && mWriteCursor < segment + mGrowBySize),
+                 "removing writer's segment");
+
+    PR_REMOVE_LINK(header);     // unlink from mSegments
+
+    mBufferSize -= mGrowBySize;
+
+    rv = mAllocator->Free(segment);
+    if (NS_FAILED(rv)) return rv;
+
+    // initialize the read segment
+    if (PR_CLIST_IS_EMPTY(&mSegments)) {
+        mReadSegment = nsnull;
+        mReadSegmentEnd = nsnull;
+        mReadCursor = nsnull;
+        if (mObserver) {
+            rv = mObserver->OnEmpty(this);
+            if (NS_FAILED(rv)) return rv;
+        }
+        return NS_BASE_STREAM_WOULD_BLOCK;
+    }
+    else {
+        mReadSegment = mSegments.next;
+        mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
+        mReadCursor = (char*)mReadSegment + sizeof(PRCList);
+    }
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// nsIBuffer methods:
+
+NS_IMETHODIMP
+nsBuffer::ReadSegments(nsWriteSegmentFun writer, void* closure, PRUint32 count,
+                       PRUint32 *readCount)
+{
+    NS_ASSERTION(!mReaderClosed, "state change error");
+
+    nsAutoCMonitor mon(this);
+    nsresult rv = NS_OK;
+    PRUint32 readBufferLen;
+    const char* readBuffer;
+
+    *readCount = 0;
+    while (count > 0) {
+        rv = GetReadSegment(0, &readBuffer, &readBufferLen);
+        if (NS_FAILED(rv) || readBufferLen == 0) {
+            return *readCount == 0 ? rv : NS_OK;
+        }
+
+        readBufferLen = PR_MIN(readBufferLen, count);
+        while (readBufferLen > 0) {
+            PRUint32 writeCount;
+            rv = writer(closure, readBuffer, *readCount, readBufferLen, &writeCount);
+			NS_ASSERTION(rv != NS_BASE_STREAM_EOF, "Write should not return EOF");
+            if (rv == NS_BASE_STREAM_WOULD_BLOCK || NS_FAILED(rv) || writeCount == 0) {
+                // if we failed to write just report what we were
+                // able to read so far
+                return *readCount == 0 ? rv : NS_OK;
+            }
+            NS_ASSERTION(writeCount <= readBufferLen, "writer returned bad writeCount");
+            readBuffer += writeCount;
+            readBufferLen -= writeCount;
+            *readCount += writeCount;
+            count -= writeCount;
+
+            if (mReadCursor + writeCount == mReadSegmentEnd) {
+                rv = PopReadSegment();
+                if (NS_FAILED(rv)) {
+                    return *readCount == 0 ? rv : NS_OK;
+                }
+            }
+            else {
+                mReadCursor += writeCount;
+            }
+        }
+    }
+    return NS_OK;
+}
+
+static NS_METHOD
+nsWriteToRawBuffer(void* closure,
+                   const char* fromRawSegment,
+                   PRUint32 offset,
+                   PRUint32 count,
+                   PRUint32 *writeCount)
+{
+    char* toBuf = (char*)closure;
+    nsCRT::memcpy(&toBuf[offset], fromRawSegment, count);
+    *writeCount = count;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::Read(char* toBuf, PRUint32 bufLen, PRUint32 *readCount)
+{
+    return ReadSegments(nsWriteToRawBuffer, toBuf, bufLen, readCount);
+}
+
+NS_IMETHODIMP
+nsBuffer::GetReadSegment(PRUint32 segmentLogicalOffset, 
+                         const char* *resultSegment,
+                         PRUint32 *resultSegmentLen)
+{
+    nsAutoCMonitor mon(this);
+
+    // set the read segment and cursor if not already set
+    if (mReadSegment == nsnull) {
+        if (PR_CLIST_IS_EMPTY(&mSegments)) {
+            *resultSegmentLen = 0;
+            *resultSegment = nsnull;
+            return mCondition;
+        }
+        else {
+            mReadSegment = mSegments.next;
+            mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
+            mReadCursor = (char*)mReadSegment + sizeof(PRCList);
+        }
+    }
+
+    // now search for the segment starting from segmentLogicalOffset and return it
+    PRCList* curSeg = mReadSegment;
+    char* curSegStart = mReadCursor;
+    char* curSegEnd = mReadSegmentEnd;
+    PRInt32 amt;
+    PRInt32 offset = (PRInt32)segmentLogicalOffset;
+    while (offset >= 0) {
+        // snapshot the write cursor into a local variable -- this allows
+        // a writer to freely change it while we're reading while avoiding
+        // using a lock
+        char* snapshotWriteCursor = mWriteCursor;   // atomic
+
+        // next check if the write cursor is in our segment
+        if (curSegStart <= snapshotWriteCursor &&
+            snapshotWriteCursor < curSegEnd) {
+            // same segment -- read up to the snapshotWriteCursor
+            curSegEnd = snapshotWriteCursor;
+
+            amt = curSegEnd - curSegStart;
+            if (offset < amt) {
+                // segmentLogicalOffset is in this segment, so read up to its end
+                *resultSegmentLen = amt - offset;
+                *resultSegment = curSegStart + offset;
+                return NS_OK;
+            }
+            else {
+                // don't continue past the write segment
+                *resultSegmentLen = 0;
+                *resultSegment = nsnull;
+                return mCondition;
+            }
+        }
+        else {
+            amt = curSegEnd - curSegStart;
+            if (offset < amt) {
+                // segmentLogicalOffset is in this segment, so read up to its end
+                *resultSegmentLen = amt - offset;
+                *resultSegment = curSegStart + offset;
+                return NS_OK;
+            }
+            else {
+                curSeg = PR_NEXT_LINK(curSeg);
+                if (curSeg == mReadSegment) {
+                    // been all the way around
+                    *resultSegmentLen = 0;
+                    *resultSegment = nsnull;
+                    return mCondition;
+                }
+                curSegEnd = (char*)curSeg + mGrowBySize;
+                curSegStart = (char*)curSeg + sizeof(PRCList);
+                offset -= amt;
+            }
+        }
+    }
+    NS_NOTREACHED("nsBuffer::GetReadSegment failed");
+    return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsBuffer::GetReadableAmount(PRUint32 *result)
+{
+    NS_ASSERTION(!mReaderClosed, "state change error");
+
+    nsAutoCMonitor mon(this);
+    *result = 0; 
+
+    // first set the read segment and cursor if not already set
+    if (mReadSegment == nsnull) {
+        if (PR_CLIST_IS_EMPTY(&mSegments)) {
+            return NS_OK;
+        }
+        else {
+            mReadSegment = mSegments.next;
+            mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
+            mReadCursor = (char*)mReadSegment + sizeof(PRCList);
+        }
+    }
+
+    // now search for the segment starting from segmentLogicalOffset and return it
+    PRCList* curSeg = mReadSegment;
+    char* curSegStart = mReadCursor;
+    char* curSegEnd = mReadSegmentEnd;
+    PRInt32 amt;
+    while (PR_TRUE) {
+        // snapshot the write cursor into a local variable -- this allows
+        // a writer to freely change it while we're reading while avoiding
+        // using a lock
+        char* snapshotWriteCursor = mWriteCursor;   // atomic
+
+        // next check if the write cursor is in our segment
+        if (curSegStart <= snapshotWriteCursor &&
+            snapshotWriteCursor < curSegEnd) {
+            // same segment -- read up to the snapshotWriteCursor
+            curSegEnd = snapshotWriteCursor;
+
+            amt = curSegEnd - curSegStart;
+            *result += amt;
+            return NS_OK;
+        }
+        else {
+            amt = curSegEnd - curSegStart;
+            *result += amt;
+            curSeg = PR_NEXT_LINK(curSeg);
+            if (curSeg == mReadSegment) {
+                // been all the way around
+                return NS_OK;
+            }
+            curSegEnd = (char*)curSeg + mGrowBySize;
+            curSegStart = (char*)curSeg + sizeof(PRCList);
+        }
+    }
+    return NS_ERROR_FAILURE;
+}
+
+#define COMPARE(s1, s2, i)	ignoreCase ? nsCRT::strncasecmp((const char *)s1, (const char *)s2, (PRUint32)i) : nsCRT::strncmp((const char *)s1, (const char *)s2, (PRUint32)i)
+
+NS_IMETHODIMP
+nsBuffer::Search(const char* string, PRBool ignoreCase, 
+                 PRBool *found, PRUint32 *offsetSearchedTo)
+{
+    NS_ASSERTION(!mReaderClosed, "state change error");
+
+    nsresult rv;
+    const char* bufSeg1;
+    PRUint32 bufSegLen1;
+    PRUint32 segmentPos = 0;
+    PRUint32 strLen = nsCRT::strlen(string);
+
+    rv = GetReadSegment(segmentPos, &bufSeg1, &bufSegLen1);
+    if (NS_FAILED(rv) || bufSegLen1 == 0) {
+        *found = PR_FALSE;
+        *offsetSearchedTo = segmentPos;
+        return NS_OK;
+    }
+
+    while (PR_TRUE) {
+        PRUint32 i;
+        // check if the string is in the buffer segment
+        for (i = 0; i < bufSegLen1 - strLen + 1; i++) {
+            if (COMPARE(&bufSeg1[i], string, strLen) == 0) {
+                *found = PR_TRUE;
+                *offsetSearchedTo = segmentPos + i;
+                return NS_OK;
+            }
+        }
+
+        // get the next segment
+        const char* bufSeg2;
+        PRUint32 bufSegLen2;
+        segmentPos += bufSegLen1;
+        rv = GetReadSegment(segmentPos, &bufSeg2, &bufSegLen2);
+        if (NS_FAILED(rv) || bufSegLen2 == 0) {
+            *found = PR_FALSE;
+            if (mCondition != NS_OK)    // XXX NS_FAILED?
+                *offsetSearchedTo = segmentPos - bufSegLen1;
+            else
+                *offsetSearchedTo = segmentPos - bufSegLen1 - strLen + 1;
+            return NS_OK;
+        }
+
+        // check if the string is straddling the next buffer segment
+        PRUint32 limit = PR_MIN(strLen, bufSegLen2 + 1);
+        for (i = 0; i < limit; i++) {
+            PRUint32 strPart1Len = strLen - i - 1;
+            PRUint32 strPart2Len = strLen - strPart1Len;
+            const char* strPart2 = &string[strLen - strPart2Len];
+            PRUint32 bufSeg1Offset = bufSegLen1 - strPart1Len;
+            if (COMPARE(&bufSeg1[bufSeg1Offset], string, strPart1Len) == 0 &&
+                COMPARE(bufSeg2, strPart2, strPart2Len) == 0) {
+                *found = PR_TRUE;
+                *offsetSearchedTo = segmentPos - strPart1Len;
+                return NS_OK;
+            }
+        }
+
+        // finally continue with the next buffer
+        bufSeg1 = bufSeg2;
+        bufSegLen1 = bufSegLen2;
+    }
+    NS_NOTREACHED("can't get here");
+    return NS_ERROR_FAILURE;    // keep compiler happy
+}
+
+NS_IMETHODIMP
+nsBuffer::ReaderClosed()
+{
+    nsresult rv = NS_OK;
+    nsAutoCMonitor mon(this);        // protect mSegments
+
+    // first prevent any more writing
+    mReaderClosed = PR_TRUE;
+
+    // then free any unread segments...
+    
+    // first set the read segment and cursor if not already set
+    if (mReadSegment == nsnull) {
+        if (!PR_CLIST_IS_EMPTY(&mSegments)) {
+            mReadSegment = mSegments.next;
+            mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
+            mReadCursor = (char*)mReadSegment + sizeof(PRCList);
+        }
+    }
+
+    while (mReadSegment) {
+        // snapshot the write cursor into a local variable -- this allows
+        // a writer to freely change it while we're reading while avoiding
+        // using a lock
+        char* snapshotWriteCursor = mWriteCursor;   // atomic
+
+        // next check if the write cursor is in our segment
+        if (mReadCursor <= snapshotWriteCursor &&
+            snapshotWriteCursor < mReadSegmentEnd) {
+            // same segment -- we've discarded all the unread segments we
+            // can, so just updatethe read cursor
+            mReadCursor = mWriteCursor;
+            break;
+        }
+        // else advance to the next segment, freeing this one
+        rv = PopReadSegment();
+        if (NS_FAILED(rv)) break;
+    }
+
+#ifdef DEBUG
+    PRUint32 amt;
+    const char* buf;
+    rv = GetReadSegment(0, &buf, &amt);
+    NS_ASSERTION(rv == NS_BASE_STREAM_EOF ||
+                 (NS_SUCCEEDED(rv) && amt == 0), "ReaderClosed failed");
+#endif
+
+    return rv;
+}
+
+NS_IMETHODIMP
+nsBuffer::GetCondition(nsresult *result)
+{
+    *result = mCondition;
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+NS_IMETHODIMP
+nsBuffer::WriteSegments(nsReadSegmentFun reader, void* closure, PRUint32 count,
+                        PRUint32 *writeCount)
+{
+    nsresult rv = NS_OK;
+
+    nsAutoCMonitor mon(this);
+    *writeCount = 0;
+
+    if (mReaderClosed) {
+        rv = NS_BASE_STREAM_CLOSED;
+        goto done;
+    }
+
+    if (NS_FAILED(mCondition)) {
+        rv = mCondition;
+        goto done;
+    }
+
+    while (count > 0) {
+        PRUint32 writeBufLen;
+        char* writeBuf;
+        rv = GetWriteSegment(&writeBuf, &writeBufLen);
+        if (NS_FAILED(rv) || writeBufLen == 0) {
+            // if we failed to allocate a new segment, we're probably out
+            // of memory, but we don't care -- just report what we were
+            // able to write so far
+            rv = (*writeCount == 0) ? rv : NS_OK;
+            goto done;
+        }
+
+        writeBufLen = PR_MIN(writeBufLen, count);
+        while (writeBufLen > 0) {
+            PRUint32 readCount = 0;
+            rv = reader(closure, writeBuf, *writeCount, writeBufLen, &readCount);
+            if (rv == NS_BASE_STREAM_WOULD_BLOCK || readCount == 0) {
+                // if the place we're putting the data would block (probably ran
+                // out of room) just return what we were able to write so far
+                rv = (*writeCount == 0) ? rv : NS_OK;
+                goto done;
+            }
+            if (NS_FAILED(rv)) {
+                // save the failure condition so that we can get it again later
+                nsresult rv2 = SetCondition(rv);
+                NS_ASSERTION(NS_SUCCEEDED(rv2), "SetCondition failed");
+                // if we failed to read just report what we were
+                // able to write so far
+                rv = (*writeCount == 0) ? rv : NS_OK;
+                goto done;
+            }
+            NS_ASSERTION(readCount <= writeBufLen, "reader returned bad readCount");
+            writeBuf += readCount;
+            writeBufLen -= readCount;
+            *writeCount += readCount;
+            count -= readCount;
+
+            // set the write cursor after the data is valid
+            if (mWriteCursor + readCount == mWriteSegmentEnd) {
+                mWriteSegment = nsnull;      // allocate a new segment next time around
+                mWriteSegmentEnd = nsnull;
+                mWriteCursor = nsnull;
+            }
+            else
+                mWriteCursor += readCount;
+        }
+    }
+done:
+    if (mObserver && *writeCount) {
+        mObserver->OnWrite(this, *writeCount);
+    }
+    return rv;
+}
+
+static NS_METHOD
+nsReadFromRawBuffer(void* closure,
+                    char* toRawSegment,
+                    PRUint32 offset,
+                    PRUint32 count,
+                    PRUint32 *readCount)
+{
+    const char* fromBuf = (const char*)closure;
+    nsCRT::memcpy(toRawSegment, &fromBuf[offset], count);
+    *readCount = count;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::Write(const char* fromBuf, PRUint32 bufLen, PRUint32 *writeCount)
+{
+    return WriteSegments(nsReadFromRawBuffer, (void*)fromBuf, bufLen, writeCount);
+}
+
+static NS_METHOD
+nsReadFromInputStream(void* closure,
+                      char* toRawSegment, 
+                      PRUint32 offset,
+                      PRUint32 count,
+                      PRUint32 *readCount)
+{
+    nsIInputStream* fromStream = (nsIInputStream*)closure;
+    return fromStream->Read(toRawSegment, count, readCount);
+}
+
+NS_IMETHODIMP
+nsBuffer::WriteFrom(nsIInputStream* fromStream, PRUint32 count, PRUint32 *writeCount)
+{
+    return WriteSegments(nsReadFromInputStream, fromStream, count, writeCount);
+}
+
+NS_IMETHODIMP
+nsBuffer::GetWriteSegment(char* *resultSegment,
+                          PRUint32 *resultSegmentLen)
+{
+    nsAutoCMonitor mon(this);
+    if (mReaderClosed)
+        return NS_BASE_STREAM_CLOSED;
+
+    nsresult rv;
+    *resultSegmentLen = 0;
+    *resultSegment = nsnull;
+    if (mWriteSegment == nsnull) {
+        rv = PushWriteSegment();
+        if (NS_FAILED(rv) || rv == NS_BASE_STREAM_WOULD_BLOCK) return rv;
+
+        NS_ASSERTION(mWriteSegment != nsnull, "failed to allocate segment");
+    }
+
+    *resultSegmentLen = mWriteSegmentEnd - mWriteCursor;
+    *resultSegment = mWriteCursor;
+    NS_ASSERTION(*resultSegmentLen > 0, "Failed to get write segment.");
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::GetWritableAmount(PRUint32 *amount)
+{
+    if (mReaderClosed)
+        return NS_BASE_STREAM_CLOSED;
+
+    nsresult rv;
+    PRUint32 readableAmount;
+    rv = GetReadableAmount(&readableAmount);
+    if (NS_FAILED(rv)) return rv;
+    *amount = mMaxSize - readableAmount;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::GetReaderClosed(PRBool *result)
+{
+    *result = mReaderClosed;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::SetCondition(nsresult condition)
+{
+    nsAutoCMonitor mon(this);
+    if (mReaderClosed)
+        return NS_BASE_STREAM_CLOSED;
+
+    mCondition = condition;
+    mWriteSegment = nsnull;     // allows reader to free last segment w/o asserting
+    mWriteSegmentEnd = nsnull;
+    // don't reset mWriteCursor here -- we need it for the EOF point in the buffer
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+static NS_DEFINE_CID(kAllocatorCID, NS_ALLOCATOR_CID);
+
+NS_COM nsresult
+NS_NewBuffer(nsIBuffer* *result,
+             PRUint32 growBySize, PRUint32 maxSize,
+             nsIBufferObserver* observer)
+{
+    nsresult rv;
+    NS_WITH_SERVICE(nsIAllocator, alloc, kAllocatorCID, &rv);
+    if (NS_FAILED(rv)) return rv;
+
+    nsBuffer* buf;
+    rv = nsBuffer::Create(NULL, nsIBuffer::GetIID(), (void**)&buf);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = buf->Init(growBySize, maxSize, observer, alloc);
+    if (NS_FAILED(rv)) {
+        NS_RELEASE(buf);
+        return rv;
+    }
+
+    *result = buf;
+    return NS_OK;
+}
+
+static NS_DEFINE_CID(kPageManagerCID, NS_PAGEMANAGER_CID);
+
+NS_COM nsresult
+NS_NewPageBuffer(nsIBuffer* *result,
+                 PRUint32 growBySize, PRUint32 maxSize,
+                 nsIBufferObserver* observer)
+{
+    nsresult rv;
+    NS_WITH_SERVICE(nsIAllocator, alloc, kPageManagerCID, &rv);
+    if (NS_FAILED(rv)) return rv;
+
+    nsBuffer* buf;
+    rv = nsBuffer::Create(NULL, nsIBuffer::GetIID(), (void**)&buf);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = buf->Init(growBySize, maxSize, observer, alloc);
+    if (NS_FAILED(rv)) {
+        NS_RELEASE(buf);
+        return rv;
+    }
+
+    *result = buf;
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////

mozilla/xpcom/ds/nsBuffer.h

@@ -0,0 +1,87 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsBuffer_h___
+#define nsBuffer_h___
+
+#include "nsIBuffer.h"
+#include "nscore.h"
+#include "prclist.h"
+#include "nsIAllocator.h"
+
+class nsBuffer : public nsIBuffer {
+public:
+    NS_DECL_ISUPPORTS
+
+    static NS_METHOD
+    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+    // nsIBuffer methods:
+    NS_IMETHOD Init(PRUint32 growBySize, PRUint32 maxSize,
+                    nsIBufferObserver* observer, nsIAllocator* allocator);
+    NS_IMETHOD Read(char* toBuf, PRUint32 bufLen, PRUint32 *readCount);
+    NS_IMETHOD ReadSegments(nsWriteSegmentFun writer, void* closure, PRUint32 count,
+                            PRUint32 *readCount);
+    NS_IMETHOD GetReadSegment(PRUint32 segmentLogicalOffset, 
+                              const char* *resultSegment,
+                              PRUint32 *resultSegmentLen);
+    NS_IMETHOD GetReadableAmount(PRUint32 *amount);
+    NS_IMETHOD Search(const char* forString, PRBool ignoreCase,
+                      PRBool *found, PRUint32 *offsetSearchedTo);
+    NS_IMETHOD ReaderClosed(void);
+    NS_IMETHOD GetCondition(nsresult *result);
+
+    NS_IMETHOD Write(const char* fromBuf, PRUint32 bufLen, PRUint32 *writeCount);
+    NS_IMETHOD WriteFrom(nsIInputStream* fromStream, PRUint32 count, PRUint32 *writeCount);
+    NS_IMETHOD WriteSegments(nsReadSegmentFun reader, void* closure, PRUint32 count,
+                             PRUint32 *writeCount);
+    NS_IMETHOD GetWriteSegment(char* *resultSegment,
+                               PRUint32 *resultSegmentLen);
+    NS_IMETHOD GetWritableAmount(PRUint32 *amount);
+    NS_IMETHOD GetReaderClosed(PRBool *result);
+    NS_IMETHOD SetCondition(nsresult condition);
+
+    // nsBuffer methods:
+    nsBuffer();
+    virtual ~nsBuffer();
+
+    nsresult PushWriteSegment();
+    nsresult PopReadSegment();
+
+protected:
+    PRUint32            mGrowBySize;
+    PRUint32            mMaxSize;
+    nsIAllocator*       mAllocator;
+    nsIBufferObserver*  mObserver;
+
+    PRCList             mSegments;
+    PRUint32            mBufferSize;
+    
+    PRCList*            mReadSegment;
+    char*               mReadSegmentEnd;
+    char*               mReadCursor;
+
+    PRCList*            mWriteSegment;
+    char*               mWriteSegmentEnd;
+    char*               mWriteCursor;
+
+    PRBool              mReaderClosed;
+    nsresult            mCondition;
+};
+
+#endif // nsBuffer_h___

mozilla/xpcom/ds/nsBufferPoolService.h

@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsBufferPoolService_h___
+#define nsBufferPoolService_h___
+
+#include "nsIBufferPoolService.h"
+
+class nsBufferPoolService : public nsIBufferPoolService {
+public:
+    NS_DECL_ISUPPORTS
+
+    // nsIBufferPoolService methods:
+    NS_IMETHOD NewBuffer(PRUint32 minSize, PRUint32 maxSize,
+                         nsIByteBuffer* *result);
+
+    // nsBufferPoolService methods:
+    nsBufferPoolService();
+    virtual ~nsBufferPoolService();
+
+protected:
+    
+};
+
+#endif // nsBufferPoolService_h___

mozilla/xpcom/ds/nsByteBuffer.cpp

@@ -0,0 +1,151 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsByteBuffer.h"
+#include "nsIInputStream.h"
+#include "nsCRT.h"
+
+#define MIN_BUFFER_SIZE 32
+
+ByteBufferImpl::ByteBufferImpl(void)
+  : mBuffer(NULL), mSpace(0), mLength(0)
+{
+  NS_INIT_REFCNT();
+}
+
+NS_IMETHODIMP
+ByteBufferImpl::Init(PRUint32 aBufferSize)
+{
+  if (aBufferSize < MIN_BUFFER_SIZE) {
+    aBufferSize = MIN_BUFFER_SIZE;
+  }
+  mSpace = aBufferSize;
+  mLength = 0;
+  mBuffer = new char[aBufferSize];
+  return mBuffer ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
+NS_IMPL_ISUPPORTS1(ByteBufferImpl,nsIByteBuffer)
+
+ByteBufferImpl::~ByteBufferImpl()
+{
+  if (nsnull != mBuffer) {
+    delete[] mBuffer;
+    mBuffer = nsnull;
+  }
+  mLength = 0;
+}
+
+NS_METHOD
+ByteBufferImpl::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+  if (aOuter)
+    return NS_ERROR_NO_AGGREGATION;
+
+  ByteBufferImpl* it = new ByteBufferImpl();
+  if (nsnull == it) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(it);
+  nsresult rv = it->QueryInterface(aIID, (void**)aResult);
+  NS_RELEASE(it);
+  return rv;
+}
+
+NS_IMETHODIMP_(PRUint32)
+ByteBufferImpl::GetLength(void) const
+{
+  return mLength;
+}
+
+NS_IMETHODIMP_(PRUint32)
+ByteBufferImpl::GetBufferSize(void) const
+{
+  return mSpace;
+}
+
+NS_IMETHODIMP_(char*)
+ByteBufferImpl::GetBuffer(void) const
+{
+  return mBuffer;
+}
+
+NS_IMETHODIMP_(PRBool)
+ByteBufferImpl::Grow(PRUint32 aNewSize)
+{
+  if (aNewSize < MIN_BUFFER_SIZE) {
+    aNewSize = MIN_BUFFER_SIZE;
+  }
+  char* newbuf = new char[aNewSize];
+  if (nsnull != newbuf) {
+    if (0 != mLength) {
+      nsCRT::memcpy(newbuf, mBuffer, mLength);
+    }
+    delete[] mBuffer;
+    mBuffer = newbuf;
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+NS_IMETHODIMP_(PRInt32)
+ByteBufferImpl::Fill(nsresult* aErrorCode, nsIInputStream* aStream,
+                     PRUint32 aKeep)
+{
+  NS_PRECONDITION(nsnull != aStream, "null stream");
+  NS_PRECONDITION(aKeep <= mLength, "illegal keep count");
+  if ((nsnull == aStream) || (PRUint32(aKeep) > PRUint32(mLength))) {
+    // whoops
+    *aErrorCode = NS_BASE_STREAM_ILLEGAL_ARGS;
+    return -1;
+  }
+
+  if (0 != aKeep) {
+    // Slide over kept data
+    nsCRT::memmove(mBuffer, mBuffer + (mLength - aKeep), aKeep);
+  }
+
+  // Read in some new data
+  mLength = aKeep;
+  PRUint32 nb;
+  *aErrorCode = aStream->Read(mBuffer + aKeep, mSpace - aKeep, &nb);
+  if (NS_SUCCEEDED(*aErrorCode)) {
+    mLength += nb;
+  }
+  else
+    nb = 0;
+  return nb;
+}
+
+NS_COM nsresult NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult,
+                                  nsISupports* aOuter,
+                                  PRUint32 aBufferSize)
+{
+  nsresult rv;
+  nsIByteBuffer* buf;
+  rv = ByteBufferImpl::Create(aOuter, nsIByteBuffer::GetIID(), (void**)&buf);
+  if (NS_FAILED(rv)) return rv;
+    
+  rv = buf->Init(aBufferSize);
+  if (NS_FAILED(rv)) {
+    NS_RELEASE(buf);
+    return rv;
+  }
+  *aInstancePtrResult = buf;
+  return rv;
+}

mozilla/xpcom/ds/nsByteBuffer.h

@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsByteBuffer_h__
+#define nsByteBuffer_h__
+
+#include "nsIByteBuffer.h"
+
+class ByteBufferImpl : public nsIByteBuffer {
+public:
+  ByteBufferImpl(void);
+  virtual ~ByteBufferImpl();
+
+  NS_DECL_ISUPPORTS
+
+  static NS_METHOD
+  Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+  NS_IMETHOD Init(PRUint32 aBufferSize);
+  NS_IMETHOD_(PRUint32) GetLength(void) const;
+  NS_IMETHOD_(PRUint32) GetBufferSize(void) const;
+  NS_IMETHOD_(char*) GetBuffer() const;
+  NS_IMETHOD_(PRBool) Grow(PRUint32 aNewSize);
+  NS_IMETHOD_(PRInt32) Fill(nsresult* aErrorCode, nsIInputStream* aStream,
+                            PRUint32 aKeep);
+
+  char* mBuffer;
+  PRUint32 mSpace;
+  PRUint32 mLength;
+};
+
+#endif // nsByteBuffer_h__

mozilla/xpcom/ds/nsCRT.cpp

@@ -0,0 +1,555 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */ 
+
+ 
+/**
+ * MODULE NOTES:
+ * @update  gess7/30/98
+ *
+ * Much as I hate to do it, we were using string compares wrong.
+ * Often, programmers call functions like strcmp(s1,s2), and pass
+ * one or more null strings. Rather than blow up on these, I've 
+ * added quick checks to ensure that cases like this don't cause
+ * us to fail.
+ *
+ * In general, if you pass a null into any of these string compare
+ * routines, we simply return 0.
+ */
+
+
+#include "nsCRT.h"
+#include "nsUnicharUtilCIID.h"
+#include "nsIServiceManager.h"
+#include "nsICaseConversion.h"
+
+
+// XXX Bug: These tables don't lowercase the upper 128 characters properly
+
+// This table maps uppercase characters to lower case characters;
+// characters that are neither upper nor lower case are unaffected.
+static const unsigned char kUpper2Lower[256] = {
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+   64,
+
+    // upper band mapped to lower [A-Z] => [a-z]
+       97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,120,121,122,
+
+                                               91, 92, 93, 94, 95,
+   96, 97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
+  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
+};
+
+static const unsigned char kLower2Upper[256] = {
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+   64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+   80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+   96,
+
+    // lower band mapped to upper [a-z] => [A-Z]
+       65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+   80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+
+                                              123,124,125,126,127,
+  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
+};
+
+// XXX bug: this doesn't map 0x80 to 0x9f properly
+ const PRUnichar kIsoLatin1ToUCS2[256] = {
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+   64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+   80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+   96, 97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
+  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
+};
+
+//----------------------------------------------------------------------
+
+#define TOLOWER(_ucs2) \
+  (((_ucs2) < 128) ? PRUnichar(kUpper2Lower[_ucs2]) : _ToLower(_ucs2))
+
+#define TOUPPER(_ucs2) \
+  (((_ucs2) < 128) ? PRUnichar(kLower2Upper[_ucs2]) : _ToUpper(_ucs2))
+
+class HandleCaseConversionShutdown : public nsIShutdownListener {
+public :
+   NS_IMETHOD OnShutdown(const nsCID& cid, nsISupports* service);
+   HandleCaseConversionShutdown(void) { NS_INIT_REFCNT(); }
+   virtual ~HandleCaseConversionShutdown(void) {}
+   NS_DECL_ISUPPORTS
+};
+static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
+
+static nsICaseConversion * gCaseConv = NULL; 
+
+NS_IMPL_ISUPPORTS1(HandleCaseConversionShutdown, nsIShutdownListener)
+
+nsresult
+HandleCaseConversionShutdown::OnShutdown(const nsCID& cid,
+                                         nsISupports* aService)
+{
+  if (cid.Equals(kUnicharUtilCID)) {
+    NS_ASSERTION(aService == gCaseConv, "wrong service!");
+    gCaseConv->Release();
+    gCaseConv = NULL;
+  }
+  return NS_OK;
+}
+
+static HandleCaseConversionShutdown* gListener = NULL;
+
+static void StartUpCaseConversion()
+{
+    nsresult err;
+
+    if ( NULL == gListener )
+    {
+      gListener = new HandleCaseConversionShutdown();
+      gListener->AddRef();
+    }
+    err = nsServiceManager::GetService(kUnicharUtilCID, NS_GET_IID(nsICaseConversion),
+                                        (nsISupports**) &gCaseConv, gListener);
+}
+static void CheckCaseConversion()
+{
+    if(NULL == gCaseConv )
+      StartUpCaseConversion();
+
+    NS_ASSERTION( gCaseConv != NULL , "cannot obtain UnicharUtil");
+   
+}
+
+static PRUnichar _ToLower(PRUnichar aChar)
+{
+  PRUnichar oLower;
+  CheckCaseConversion();
+  nsresult err = gCaseConv->ToLower(aChar, &oLower);
+  NS_ASSERTION( NS_SUCCEEDED(err),  "failed to communicate to UnicharUtil");
+  return ( NS_SUCCEEDED(err) ) ? oLower : aChar ;
+}
+
+static PRUnichar _ToUpper(PRUnichar aChar)
+{
+  nsresult err;
+  PRUnichar oUpper;
+  CheckCaseConversion();
+  err = gCaseConv->ToUpper(aChar, &oUpper);
+  NS_ASSERTION( NS_SUCCEEDED(err),  "failed to communicate to UnicharUtil");
+  return ( NS_SUCCEEDED(err) ) ? oUpper : aChar ;
+}
+
+//----------------------------------------------------------------------
+
+PRUnichar nsCRT::ToUpper(PRUnichar aChar)
+{
+  return TOUPPER(aChar);
+}
+
+PRUnichar nsCRT::ToLower(PRUnichar aChar)
+{
+  return TOLOWER(aChar);
+}
+
+PRBool nsCRT::IsUpper(PRUnichar aChar)
+{
+  return aChar != nsCRT::ToLower(aChar);
+}
+
+PRBool nsCRT::IsLower(PRUnichar aChar)
+{
+  return aChar != nsCRT::ToUpper(aChar);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// My lovely strtok routine
+
+#define IS_DELIM(m, c)          ((m)[(c) >> 3] & (1 << ((c) & 7)))
+#define SET_DELIM(m, c)         ((m)[(c) >> 3] |= (1 << ((c) & 7)))
+#define DELIM_TABLE_SIZE        32
+
+char* nsCRT::strtok(char* string, const char* delims, char* *newStr)
+{
+  NS_ASSERTION(string, "Unlike regular strtok, the first argument cannot be null.");
+
+  char delimTable[DELIM_TABLE_SIZE];
+  PRUint32 i;
+  char* result;
+  char* str = string;
+
+  for (i = 0; i < DELIM_TABLE_SIZE; i++)
+    delimTable[i] = '\0';
+
+  for (i = 0; i < DELIM_TABLE_SIZE && delims[i]; i++) {
+    SET_DELIM(delimTable, delims[i]);
+  }
+  NS_ASSERTION(delims[i] == '\0', "too many delimiters");
+
+  // skip to beginning
+  while (*str && IS_DELIM(delimTable, *str)) {
+    str++;
+  }
+  result = str;
+
+  // fix up the end of the token
+  while (*str) {
+    if (IS_DELIM(delimTable, *str)) {
+      *str++ = '\0';
+      break;
+    }
+    str++;
+  }
+  *newStr = str;
+
+  return str == result ? NULL : result;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+PRUint32 nsCRT::strlen(const PRUnichar* s)
+{
+  PRUint32 len = 0;
+  if(s) {
+    while (*s++ != 0) {
+      len++;
+    }
+  }
+  return len;
+}
+
+
+/**
+ * Compare unichar string ptrs, stopping at the 1st null 
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 and s2 both point to unichar strings
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strcmp(const PRUnichar* s1, const PRUnichar* s2)
+{
+  if(s1 && s2) {
+    for (;;) {
+      PRUnichar c1 = *s1++;
+      PRUnichar c2 = *s2++;
+      if (c1 != c2) {
+        if (c1 < c2) return -1;
+        return 1;
+      }
+      if ((0==c1) || (0==c2)) break;
+    }
+  }
+  return 0;
+}
+
+/**
+ * Compare unichar string ptrs, stopping at the 1st null or nth char.
+ * NOTE: If either is null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 and s2 both point to unichar strings
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strncmp(const PRUnichar* s1, const PRUnichar* s2, PRUint32 n)
+{
+  if(s1 && s2) { 
+    if(n != 0) {
+      do {
+        PRUnichar c1 = *s1++;
+        PRUnichar c2 = *s2++;
+        if (c1 != c2) {
+          if (c1 < c2) return -1;
+          return 1;
+        }
+        if ((0==c1) || (0==c2)) break;
+      } while (--n != 0);
+    }
+  }
+  return 0;
+}
+
+
+/**
+ * Compare unichar string ptrs without regard to case
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 and s2 both point to unichar strings
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strcasecmp(const PRUnichar* s1, const PRUnichar* s2)
+{
+  if(s1 && s2) {
+    for (;;) {
+      PRUnichar c1 = *s1++;
+      PRUnichar c2 = *s2++;
+      if (c1 != c2) {
+        c1 = TOLOWER(c1);
+        c2 = TOLOWER(c2);
+        if (c1 != c2) {
+          if (c1 < c2) return -1;
+          return 1;
+        }
+      }
+      if ((0==c1) || (0==c2)) break;
+    }
+  }
+  return 0;
+}
+
+/**
+ * Compare unichar string ptrs, stopping at the 1st null or nth char;
+ * also ignoring the case of characters.
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 and s2 both point to unichar strings
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const PRUnichar* s2, PRUint32 n)
+{
+  if(s1 && s2) {
+    if(n != 0){
+      do {
+        PRUnichar c1 = *s1++;
+        PRUnichar c2 = *s2++;
+        if (c1 != c2) {
+          c1 = TOLOWER(c1);
+          c2 = TOLOWER(c2);
+          if (c1 != c2) {
+            if (c1 < c2) return -1;
+            return 1;
+          }
+        }
+        if ((0==c1) || (0==c2)) break;
+      } while (--n != 0);
+    }
+  }
+  return 0;
+}
+
+
+/**
+ * Compare a unichar string ptr to cstring.
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 points to unichar string
+ * @param   s2 points to cstring
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strcmp(const PRUnichar* s1, const char* s2)
+{
+  if(s1 && s2) {
+    for (;;) {
+      PRUnichar c1 = *s1++;
+      PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
+      if (c1 != c2) {
+        if (c1 < c2) return -1;
+        return 1;
+      }
+      if ((0==c1) || (0==c2)) break;
+    }
+  }
+  return 0;
+}
+
+
+/**
+ * Compare a unichar string ptr to cstring, up to N chars.
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 points to unichar string
+ * @param   s2 points to cstring
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strncmp(const PRUnichar* s1, const char* s2, PRUint32 n)
+{
+  if(s1 && s2) {
+    if(n != 0){
+      do {
+        PRUnichar c1 = *s1++;
+        PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
+        if (c1 != c2) {
+          if (c1 < c2) return -1;
+          return 1;
+        }
+        if ((0==c1) || (0==c2)) break;
+      } while (--n != 0);
+    }
+  }
+  return 0;
+}
+
+/**
+ * Compare a unichar string ptr to cstring without regard to case
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 points to unichar string
+ * @param   s2 points to cstring
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strcasecmp(const PRUnichar* s1, const char* s2)
+{
+  if(s1 && s2) {
+    for (;;) {
+      PRUnichar c1 = *s1++;
+      PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
+      if (c1 != c2) {
+        c1 = TOLOWER(c1);
+        c2 = TOLOWER(c2);
+        if (c1 != c2) {
+          if (c1 < c2) return -1;
+          return 1;
+        }
+      }
+      if ((0==c1) || (0==c2)) break;
+    }
+  }
+  return 0;
+}
+
+/**
+ * Caseless compare up to N chars between unichar string ptr to cstring.
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 points to unichar string
+ * @param   s2 points to cstring
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const char* s2, PRUint32 n)
+{
+  if(s1 && s2){
+    if(n != 0){
+      do {
+        PRUnichar c1 = *s1++;
+        PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
+        if (c1 != c2) {
+          c1 = TOLOWER(c1);
+          c2 = TOLOWER(c2);
+          if (c1 != c2) {
+            if (c1 < c2) return -1;
+            return 1;
+          }
+        }
+        if (c1 == 0) break;
+      } while (--n != 0);
+    }
+  }
+  return 0;
+}
+
+PRUnichar* nsCRT::strdup(const PRUnichar* str)
+{
+  PRUint32 len = nsCRT::strlen(str) + 1; // add one for null
+
+
+	nsCppSharedAllocator<PRUnichar> shared_allocator;
+	PRUnichar* rslt = shared_allocator.allocate(len);
+  // PRUnichar* rslt = new PRUnichar[len];
+
+  if (rslt == NULL) return NULL;
+  nsCRT::memcpy(rslt, str, len * sizeof(PRUnichar));
+  return rslt;
+}
+
+PRUint32 nsCRT::HashValue(const char* us)
+{
+  PRUint32 rv = 0;
+  if(us) {
+    char ch;
+    while ((ch = *us++) != 0) {
+      // FYI: rv = rv*37 + ch
+      rv = ((rv << 5) + (rv << 2) + rv) + ch;
+    }
+  }
+  return rv;
+}
+
+PRUint32 nsCRT::HashValue(const char* us, PRUint32* uslenp)
+{
+  PRUint32 rv = 0;
+  PRUint32 len = 0;
+  char ch;
+  while ((ch = *us++) != 0) {
+    // FYI: rv = rv*37 + ch
+    rv = ((rv << 5) + (rv << 2) + rv) + ch;
+    len++;
+  }
+  *uslenp = len;
+  return rv;
+}
+
+PRUint32 nsCRT::HashValue(const PRUnichar* us)
+{
+  PRUint32 rv = 0;
+  if(us) {
+    PRUnichar ch;
+    while ((ch = *us++) != 0) {
+      // FYI: rv = rv*37 + ch
+      rv = ((rv << 5) + (rv << 2) + rv) + ch;
+    }
+  }
+  return rv;
+}
+
+PRUint32 nsCRT::HashValue(const PRUnichar* us, PRUint32* uslenp)
+{
+  PRUint32 rv = 0;
+  PRUint32 len = 0;
+  PRUnichar ch;
+  while ((ch = *us++) != 0) {
+    // FYI: rv = rv*37 + ch
+    rv = ((rv << 5) + (rv << 2) + rv) + ch;
+    len++;
+  }
+  *uslenp = len;
+  return rv;
+}
+
+PRInt32 nsCRT::atoi( const PRUnichar *string )
+{
+  return atoi(string);
+}
+

mozilla/xpcom/ds/nsCRT.h

@@ -0,0 +1,239 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsCRT_h___
+#define nsCRT_h___
+
+#include <stdlib.h>
+#include <string.h>
+#include "plstr.h"
+#include "nscore.h"
+#include "prtypes.h"
+#include "nsCppSharedAllocator.h"
+
+#define CR '\015'
+#define LF '\012'
+#define VTAB '\013'
+#define FF '\014'
+#define TAB '\011'
+#define CRLF "\015\012"     /* A CR LF equivalent string */
+
+#ifdef XP_MAC
+#  define NS_LINEBREAK             "\015"
+#  define NS_LINEBREAK_LEN 1
+#else
+#  ifdef XP_PC
+#    define NS_LINEBREAK           "\015\012"
+#    define NS_LINEBREAK_LEN       2
+#  else
+#    if defined(XP_UNIX) || defined(XP_BEOS)
+#      define NS_LINEBREAK         "\012"
+#      define NS_LINEBREAK_LEN     1
+#    endif /* XP_UNIX */
+#  endif /* XP_PC */
+#endif /* XP_MAC */
+
+
+extern const PRUnichar kIsoLatin1ToUCS2[256];
+
+
+// This macro can be used in a class declaration for classes that want
+// to ensure that their instance memory is zeroed.
+#define NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW \
+  void* operator new(size_t sz) {             \
+    void* rv = ::operator new(sz);            \
+    if (rv) {                                 \
+      nsCRT::zero(rv, sz);                    \
+    }                                         \
+    return rv;                                \
+  }                                           \
+  void operator delete(void* ptr) {           \
+    ::operator delete(ptr);                   \
+  }
+
+// This macro works with the next macro to declare a non-inlined
+// version of the above.
+#define NS_DECL_ZEROING_OPERATOR_NEW \
+  void* operator new(size_t sz);     \
+  void operator delete(void* ptr);
+
+#define NS_IMPL_ZEROING_OPERATOR_NEW(_class) \
+  void* _class::operator new(size_t sz) {    \
+    void* rv = ::operator new(sz);           \
+    if (rv) {                                \
+      nsCRT::zero(rv, sz);                   \
+    }                                        \
+    return rv;                               \
+  }                                          \
+  void _class::operator delete(void* ptr) {  \
+    ::operator delete(ptr);                  \
+  }
+
+// Freeing helper
+#define CRTFREEIF(x) if (x) { nsCRT::free(x); x = 0; }
+
+/// This is a wrapper class around all the C runtime functions. 
+
+class NS_COM nsCRT {
+public:
+
+  /** Copy bytes from aSrc to aDest.
+    @param aDest the destination address
+    @param aSrc the source address
+    @param aCount the number of bytes to copy
+    */
+  static void memcpy(void* aDest, const void* aSrc, PRUint32 aCount) {
+    ::memcpy(aDest, aSrc, (size_t)aCount);
+  }
+
+  static void memmove(void* aDest, const void* aSrc, PRUint32 aCount) {
+    ::memmove(aDest, aSrc, (size_t)aCount);
+  }
+
+  static void memset(void* aDest, PRUint8 aByte, PRUint32 aCount) {
+    ::memset(aDest, aByte, aCount);
+  }
+
+  static void zero(void* aDest, PRUint32 aCount) {
+    ::memset(aDest, 0, (size_t)aCount);
+  }
+
+  /** Compute the string length of s
+   @param s the string in question
+   @return the length of s
+   */
+  static PRUint32 strlen(const char* s) {
+    return PRUint32(::strlen(s));
+  }
+
+  /// Compare s1 and s2.
+  static PRInt32 strcmp(const char* s1, const char* s2) {
+    return PRUint32(PL_strcmp(s1, s2));
+  }
+
+  static PRInt32 strncmp(const char* s1, const char* s2,
+                         PRUint32 aMaxLen) {
+    return PRInt32(PL_strncmp(s1, s2, aMaxLen));
+  }
+
+  /// Case-insensitive string comparison.
+  static PRInt32 strcasecmp(const char* s1, const char* s2) {
+    return PRInt32(PL_strcasecmp(s1, s2));
+  }
+
+  /// Case-insensitive string comparison with length
+  static PRInt32 strncasecmp(const char* s1, const char* s2, PRUint32 aMaxLen) {
+    return PRInt32(PL_strncasecmp(s1, s2, aMaxLen));
+  }
+
+  static PRInt32 strncmp(const char* s1, const char* s2, PRInt32 aMaxLen) {
+    // inline the first test (assumes strings are not null):
+    PRInt32 diff = ((const unsigned char*)s1)[0] - ((const unsigned char*)s2)[0];
+    if (diff != 0) return diff;
+    return PRInt32(PL_strncmp(s1,s2,aMaxLen));
+  }
+  
+  static char* strdup(const char* str) {
+    return PL_strdup(str);
+  }
+
+  static void free(char* str) {
+    PL_strfree(str);
+  }
+
+  /**
+
+    How to use this fancy (thread-safe) version of strtok: 
+
+    void main( void ) {
+      printf( "%s\n\nTokens:\n", string );
+      // Establish string and get the first token:
+      char* newStr;
+      token = nsCRT::strtok( string, seps, &newStr );   
+      while( token != NULL ) {
+        // While there are tokens in "string"
+        printf( " %s\n", token );
+        // Get next token:
+        token = nsCRT::strtok( newStr, seps, &newStr );
+      }
+    }
+    * WARNING - STRTOK WHACKS str THE FIRST TIME IT IS CALLED *
+    * MAKE A COPY OF str IF YOU NEED TO USE IT AFTER strtok() *
+  */
+  static char* strtok(char* str, const char* delims, char* *newStr); 
+
+  /// Like strlen except for ucs2 strings
+  static PRUint32 strlen(const PRUnichar* s);
+
+  /// Like strcmp except for ucs2 strings
+  static PRInt32 strcmp(const PRUnichar* s1, const PRUnichar* s2);
+  /// Like strcmp except for ucs2 strings
+  static PRInt32 strncmp(const PRUnichar* s1, const PRUnichar* s2,
+                         PRUint32 aMaxLen);
+
+  /// Like strcasecmp except for ucs2 strings
+  static PRInt32 strcasecmp(const PRUnichar* s1, const PRUnichar* s2);
+  /// Like strncasecmp except for ucs2 strings
+  static PRInt32 strncasecmp(const PRUnichar* s1, const PRUnichar* s2,
+                             PRUint32 aMaxLen);
+
+  /// Like strcmp with a char* and a ucs2 string
+  static PRInt32 strcmp(const PRUnichar* s1, const char* s2);
+  /// Like strncmp with a char* and a ucs2 string
+  static PRInt32 strncmp(const PRUnichar* s1, const char* s2,
+                         PRUint32 aMaxLen);
+
+  /// Like strcasecmp with a char* and a ucs2 string
+  static PRInt32 strcasecmp(const PRUnichar* s1, const char* s2);
+  /// Like strncasecmp with a char* and a ucs2 string
+  static PRInt32 strncasecmp(const PRUnichar* s1, const char* s2,
+                             PRUint32 aMaxLen);
+
+  // Note: uses new[] to allocate memory, so you must use delete[] to
+  // free the memory
+  static PRUnichar* strdup(const PRUnichar* str);
+
+  static void free(PRUnichar* str) {
+  	nsCppSharedAllocator<PRUnichar> shared_allocator;
+  	shared_allocator.deallocate(str, 0 /*we never new or kept the size*/);
+  }
+
+  /// Compute a hashcode for a C string
+  static PRUint32 HashValue(const char* s1);
+
+  /// Same as above except that we return the length in s1len
+  static PRUint32 HashValue(const char* s1, PRUint32* s1len);
+
+  /// Compute a hashcode for a ucs2 string
+  static PRUint32 HashValue(const PRUnichar* s1);
+
+  /// Same as above except that we return the length in s1len
+  static PRUint32 HashValue(const PRUnichar* s1, PRUint32* s1len);
+
+  /// String to integer.
+  static PRInt32 atoi( const PRUnichar *string );
+  
+  static PRUnichar ToUpper(PRUnichar aChar);
+
+  static PRUnichar ToLower(PRUnichar aChar);
+  
+  static PRBool IsUpper(PRUnichar aChar);
+
+  static PRBool IsLower(PRUnichar aChar);
+};
+
+#endif /* nsCRT_h___ */

mozilla/xpcom/ds/nsConjoiningEnumerator.cpp

@@ -0,0 +1,365 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsIEnumerator.h"
+
+////////////////////////////////////////////////////////////////////////////////
+// Intersection Enumerators
+////////////////////////////////////////////////////////////////////////////////
+
+class nsConjoiningEnumerator : public nsIBidirectionalEnumerator
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  // nsIEnumerator methods:
+  NS_DECL_NSIENUMERATOR
+
+  // nsIBidirectionalEnumerator methods:
+  NS_DECL_NSIBIDIRECTIONALENUMERATOR
+
+  // nsConjoiningEnumerator methods:
+  nsConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second);
+  virtual ~nsConjoiningEnumerator(void);
+
+protected:
+  nsIEnumerator* mFirst;
+  nsIEnumerator* mSecond;
+  nsIEnumerator* mCurrent;
+};
+
+nsConjoiningEnumerator::nsConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second)
+  : mFirst(first), mSecond(second), mCurrent(first)
+{
+  NS_ADDREF(mFirst);
+  NS_ADDREF(mSecond);
+}
+
+nsConjoiningEnumerator::~nsConjoiningEnumerator(void)
+{
+  NS_RELEASE(mFirst);
+  NS_RELEASE(mSecond);
+}
+
+NS_IMPL_ISUPPORTS2(nsConjoiningEnumerator, nsIBidirectionalEnumerator, nsIEnumerator)
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::First(void)
+{
+  mCurrent = mFirst;
+  return mCurrent->First();
+}
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::Next(void)
+{
+  nsresult rv = mCurrent->Next();
+  if (NS_FAILED(rv) && mCurrent == mFirst) {
+    mCurrent = mSecond;
+    rv = mCurrent->First();
+  }
+  return rv;
+}
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::CurrentItem(nsISupports **aItem)
+{
+  return mCurrent->CurrentItem(aItem);
+}
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::IsDone(void)
+{
+  return (mCurrent == mFirst && mCurrent->IsDone() == NS_OK)
+      || (mCurrent == mSecond && mCurrent->IsDone() == NS_OK)
+    ? NS_OK : NS_COMFALSE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::Last(void)
+{
+  nsresult rv;
+  nsIBidirectionalEnumerator* be;
+  rv = mSecond->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
+  if (NS_FAILED(rv)) return rv;
+  mCurrent = mSecond;
+  rv = be->Last();
+  NS_RELEASE(be);
+  return rv;
+}
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::Prev(void)
+{
+  nsresult rv;
+  nsIBidirectionalEnumerator* be;
+  rv = mCurrent->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
+  if (NS_FAILED(rv)) return rv;
+  rv = be->Prev();
+  NS_RELEASE(be);
+  if (NS_FAILED(rv) && mCurrent == mSecond) {
+    rv = mFirst->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
+    if (NS_FAILED(rv)) return rv;
+    mCurrent = mFirst;
+    rv = be->Last();
+    NS_RELEASE(be);
+  }  
+  return rv;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+extern "C" NS_COM nsresult
+NS_NewConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second,
+                           nsIBidirectionalEnumerator* *aInstancePtrResult)
+{
+  if (aInstancePtrResult == 0)
+    return NS_ERROR_NULL_POINTER;
+  nsConjoiningEnumerator* e = new nsConjoiningEnumerator(first, second);
+  if (e == 0)
+    return NS_ERROR_OUT_OF_MEMORY;
+  NS_ADDREF(e);
+  *aInstancePtrResult = e;
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+static nsresult
+nsEnumeratorContains(nsIEnumerator* e, nsISupports* item)
+{
+  nsresult rv;
+  for (e->First(); e->IsDone() != NS_OK; e->Next()) {
+    nsISupports* other;
+    rv = e->CurrentItem(&other);
+    if (NS_FAILED(rv)) return rv;
+    if (item == other) {
+      NS_RELEASE(other);
+      return NS_OK;     // true -- exists in enumerator
+    }
+    NS_RELEASE(other);
+  }
+  return NS_COMFALSE;   // false -- doesn't exist
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Intersection Enumerators
+////////////////////////////////////////////////////////////////////////////////
+
+class nsIntersectionEnumerator : public nsIEnumerator
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  // nsIEnumerator methods:
+  NS_DECL_NSIENUMERATOR
+
+  // nsIntersectionEnumerator methods:
+  nsIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second);
+  virtual ~nsIntersectionEnumerator(void);
+
+protected:
+  nsIEnumerator* mFirst;
+  nsIEnumerator* mSecond;
+};
+
+nsIntersectionEnumerator::nsIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second)
+  : mFirst(first), mSecond(second)
+{
+  NS_ADDREF(mFirst);
+  NS_ADDREF(mSecond);
+}
+
+nsIntersectionEnumerator::~nsIntersectionEnumerator(void)
+{
+  NS_RELEASE(mFirst);
+  NS_RELEASE(mSecond);
+}
+
+NS_IMPL_ISUPPORTS1(nsIntersectionEnumerator, nsIEnumerator)
+
+NS_IMETHODIMP 
+nsIntersectionEnumerator::First(void)
+{
+  nsresult rv = mFirst->First();
+  if (NS_FAILED(rv)) return rv;
+  return Next();
+}
+
+NS_IMETHODIMP 
+nsIntersectionEnumerator::Next(void)
+{
+  nsresult rv;
+
+  // find the first item that exists in both
+  for (; mFirst->IsDone() != NS_OK; mFirst->Next()) {
+    nsISupports* item;
+    rv = mFirst->CurrentItem(&item);
+    if (NS_FAILED(rv)) return rv;
+
+    // see if it also exists in mSecond
+    rv = nsEnumeratorContains(mSecond, item);
+    if (NS_FAILED(rv)) return rv;
+
+    NS_RELEASE(item);
+    if (rv == NS_OK) {
+      // found in both, so return leaving it as the current item of mFirst
+      return NS_OK;
+    }
+  }
+
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP 
+nsIntersectionEnumerator::CurrentItem(nsISupports **aItem)
+{
+  return mFirst->CurrentItem(aItem);
+}
+
+NS_IMETHODIMP 
+nsIntersectionEnumerator::IsDone(void)
+{
+  return mFirst->IsDone();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+extern "C" NS_COM nsresult
+NS_NewIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
+                      nsIEnumerator* *aInstancePtrResult)
+{
+  if (aInstancePtrResult == 0)
+    return NS_ERROR_NULL_POINTER;
+  nsIntersectionEnumerator* e = new nsIntersectionEnumerator(first, second);
+  if (e == 0)
+    return NS_ERROR_OUT_OF_MEMORY;
+  NS_ADDREF(e);
+  *aInstancePtrResult = e;
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Union Enumerators
+////////////////////////////////////////////////////////////////////////////////
+
+class nsUnionEnumerator : public nsIEnumerator
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  // nsIEnumerator methods:
+  NS_DECL_NSIENUMERATOR
+
+  // nsUnionEnumerator methods:
+  nsUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second);
+  virtual ~nsUnionEnumerator(void);
+
+protected:
+  nsIEnumerator* mFirst;
+  nsIEnumerator* mSecond;
+};
+
+nsUnionEnumerator::nsUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second)
+  : mFirst(first), mSecond(second)
+{
+  NS_ADDREF(mFirst);
+  NS_ADDREF(mSecond);
+}
+
+nsUnionEnumerator::~nsUnionEnumerator(void)
+{
+  NS_RELEASE(mFirst);
+  NS_RELEASE(mSecond);
+}
+
+NS_IMPL_ISUPPORTS1(nsUnionEnumerator, nsIEnumerator)
+
+NS_IMETHODIMP 
+nsUnionEnumerator::First(void)
+{
+  nsresult rv = mFirst->First();
+  if (NS_FAILED(rv)) return rv;
+  return Next();
+}
+
+NS_IMETHODIMP 
+nsUnionEnumerator::Next(void)
+{
+  nsresult rv;
+
+  // find the first item that exists in both
+  for (; mFirst->IsDone() != NS_OK; mFirst->Next()) {
+    nsISupports* item;
+    rv = mFirst->CurrentItem(&item);
+    if (NS_FAILED(rv)) return rv;
+
+    // see if it also exists in mSecond
+    rv = nsEnumeratorContains(mSecond, item);
+    if (NS_FAILED(rv)) return rv;
+
+    NS_RELEASE(item);
+    if (rv != NS_OK) {
+      // if it didn't exist in mSecond, return, making it the current item
+      return NS_OK;
+    }
+    
+    // each time around, make sure that mSecond gets reset to the beginning
+    // so that when mFirst is done, we'll be ready to enumerate mSecond
+    rv = mSecond->First();
+    if (NS_FAILED(rv)) return rv;
+  }
+  
+  return mSecond->Next();
+}
+
+NS_IMETHODIMP 
+nsUnionEnumerator::CurrentItem(nsISupports **aItem)
+{
+  if (mFirst->IsDone() != NS_OK)
+    return mFirst->CurrentItem(aItem);
+  else
+    return mSecond->CurrentItem(aItem);
+}
+
+NS_IMETHODIMP 
+nsUnionEnumerator::IsDone(void)
+{
+  return (mFirst->IsDone() == NS_OK && mSecond->IsDone() == NS_OK)
+    ? NS_OK : NS_COMFALSE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+extern "C" NS_COM nsresult
+NS_NewUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
+                      nsIEnumerator* *aInstancePtrResult)
+{
+  if (aInstancePtrResult == 0)
+    return NS_ERROR_NULL_POINTER;
+  nsUnionEnumerator* e = new nsUnionEnumerator(first, second);
+  if (e == 0)
+    return NS_ERROR_OUT_OF_MEMORY;
+  NS_ADDREF(e);
+  *aInstancePtrResult = e;
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////

mozilla/xpcom/ds/nsCppSharedAllocator.h

@@ -0,0 +1,122 @@
+#ifndef nsCppSharedAllocator_h__
+#define nsCppSharedAllocator_h__
+
+#include "nsIAllocator.h" // for |nsAllocator|
+#include "nscore.h"       // for |NS_XXX_CAST|
+#include <new.h>					// to allow placement |new|
+
+
+  // under Metrowerks (Mac), we don't have autoconf yet
+#ifdef __MWERKS__
+  #define HAVE_CPP_MEMBER_TEMPLATES
+	#define HAVE_CPP_NUMERIC_LIMITS
+#endif
+
+#ifdef HAVE_CPP_NUMERIC_LIMITS
+#include <limits>
+#else
+#include <limits.h>
+#endif
+
+
+template <class T>
+class nsCppSharedAllocator
+    /*
+      ...allows Standard Library containers, et al, to use our global shared
+      (XP)COM-aware allocator.
+    */
+  {
+    public:
+      typedef T          value_type;
+      typedef size_t     size_type;
+      typedef ptrdiff_t  difference_type;
+
+      typedef T*         pointer;
+      typedef const T*   const_pointer;
+
+      typedef T&         reference;
+      typedef const T&   const_reference;
+
+
+
+      nsCppSharedAllocator() { }
+
+#ifdef HAVE_CPP_MEMBER_TEMPLATES
+      template <class U>
+      nsCppSharedAllocator( const nsCppSharedAllocator<U>& ) { }
+#endif
+
+     ~nsCppSharedAllocator() { }
+
+
+      pointer
+      address( reference r ) const
+        {
+          return &r;
+        }
+
+      const_pointer
+      address( const_reference r ) const
+        {
+          return &r;
+        }
+
+      pointer
+      allocate( size_type n, const void* /*hint*/=0 )
+        {
+          return NS_REINTERPRET_CAST(pointer, nsAllocator::Alloc(NS_STATIC_CAST(PRUint32, n*sizeof(T))));
+        }
+
+      void
+      deallocate( pointer p, size_type /*n*/ )
+        {
+          nsAllocator::Free(p);
+        }
+
+      void
+      construct( pointer p, const T& val )
+        {
+          new (p) T(val);
+        }
+      
+      void
+      destroy( pointer p )
+        {
+          p->~T();
+        }
+
+      size_type
+      max_size() const
+        {
+#ifdef HAVE_CPP_NUMERIC_LIMITS
+          return numeric_limits<size_type>::max() / sizeof(T);
+#else
+          return ULONG_MAX / sizeof(T);
+#endif
+        }
+
+#ifdef HAVE_CPP_MEMBER_TEMPLATES
+      template <class U>
+      struct rebind
+        {
+          typedef nsCppSharedAllocator<U> other;
+        };
+#endif
+  };
+
+
+template <class T>
+PRBool
+operator==( const nsCppSharedAllocator<T>&, const nsCppSharedAllocator<T>& )
+  {
+    return PR_TRUE;
+  }
+
+template <class T>
+PRBool
+operator!=( const nsCppSharedAllocator<T>&, const nsCppSharedAllocator<T>& )
+  {
+    return PR_FALSE;
+  }
+
+#endif /* !defined(nsCppSharedAllocator_h__) */

mozilla/xpcom/ds/nsDeque.cpp

@@ -0,0 +1,594 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+ 
+#include "nsDeque.h"
+#include "nsCRT.h"
+#include <stdio.h>
+
+//#define _SELFTEST_DEQUE 1
+#undef _SELFTEST_DEQUE 
+
+/**
+ * Standard constructor
+ * @update	gess4/18/98
+ * @return  new deque
+ */
+nsDeque::nsDeque(nsDequeFunctor* aDeallocator) {
+  mDeallocator=aDeallocator;
+  mOrigin=mSize=0;
+  mData=mBuffer; // don't allocate space until you must
+  mCapacity=sizeof(mBuffer)/sizeof(mBuffer[0]);
+  nsCRT::zero(mData,mCapacity*sizeof(mBuffer[0]));
+}
+
+
+/**
+ * Destructor
+ * @update	gess4/18/98
+ */
+nsDeque::~nsDeque() {
+
+#if 0
+  char buffer[30];
+  printf("Capacity: %i\n",mCapacity);
+
+  static int mCaps[15] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+  switch(mCapacity) {
+    case 4:     mCaps[0]++; break;
+    case 8:     mCaps[1]++; break;
+    case 16:    mCaps[2]++; break;
+    case 32:    mCaps[3]++; break;
+    case 64:    mCaps[4]++; break;
+    case 128:   mCaps[5]++; break;
+    case 256:   mCaps[6]++; break;
+    case 512:   mCaps[7]++; break;
+    case 1024:  mCaps[8]++; break;
+    case 2048:  mCaps[9]++; break;
+    case 4096:  mCaps[10]++; break;
+    default:
+      break;
+  }
+#endif
+
+  Erase();
+  if(mData && (mData!=mBuffer))
+    delete [] mData;
+  mData=0;
+  if(mDeallocator) {
+    delete mDeallocator;
+  }
+  mDeallocator=0;
+}
+
+
+/**
+ *
+ * @update	gess4/18/98
+ * @param 
+ * @return  
+ */ 
+void nsDeque::SetDeallocator(nsDequeFunctor* aDeallocator){
+  if(mDeallocator) {
+    delete mDeallocator;
+  }
+  mDeallocator=aDeallocator;
+}
+
+/**
+ * Remove all items from container without destroying them.
+ *
+ * @update	gess4/18/98
+ * @param 
+ * @return
+ */
+nsDeque& nsDeque::Empty() {
+  if((0<mCapacity) && (mData)) {
+    nsCRT::zero(mData,mCapacity*sizeof(mData));
+  }
+  mSize=0;
+  mOrigin=0;
+  return *this;
+}
+
+/**
+ * Remove and delete all items from container
+ * 
+ * @update	gess4/18/98
+ * @return  this
+ */
+nsDeque& nsDeque::Erase() { 
+  if(mDeallocator && mSize) {
+    ForEach(*mDeallocator);
+  }
+  return Empty();
+}
+
+
+/**
+ * This method adds an item to the end of the deque. 
+ * This operation has the potential to cause the 
+ * underlying buffer to resize.
+ *
+ * @update	gess4/18/98
+ * @param   anItem: new item to be added to deque
+ * @return  nada
+ */
+nsDeque& nsDeque::GrowCapacity(void) {
+
+  PRInt32 theNewSize = mCapacity<<2;
+  void** temp=new void*[theNewSize];
+
+  //Here's the interesting part: You can't just move the elements
+  //directy (in situ) from the old buffer to the new one.
+  //Since capacity has changed, the old origin doesn't make
+  //sense anymore. It's better to resequence the elements now.
+
+  if(mData) {
+    int tempi=0;
+    int i=0;
+    int j=0;
+    for(i=mOrigin;i<mCapacity;i++) temp[tempi++]=mData[i]; //copy the leading elements...
+    for(j=0;j<mOrigin;j++) temp[tempi++]=mData[j];         //copy the trailing elements...
+    if(mData!=mBuffer)
+      delete [] mData;
+  }
+  mCapacity=theNewSize;
+  mOrigin=0;       //now realign the origin...
+  mData=temp;
+  return *this;
+}
+
+/**
+ * This method adds an item to the end of the deque. 
+ * This operation has the potential to cause the 
+ * underlying buffer to resize.
+ *
+ * @update	gess4/18/98
+ * @param   anItem: new item to be added to deque
+ * @return  nada
+ */
+nsDeque& nsDeque::Push(void* anItem) {
+  if(mSize==mCapacity) {
+    GrowCapacity();
+  }
+  int offset=mOrigin+mSize;
+  if(offset<mCapacity)
+    mData[offset]=anItem;
+  else mData[offset-mCapacity]=anItem;
+  mSize++;
+  return *this;
+}
+
+/**
+ * This method adds an item to the front of the deque. 
+ * This operation has the potential to cause the 
+ * underlying buffer to resize.
+ *
+ * @update	gess4/18/98
+ * @param   anItem: new item to be added to deque
+ * @return  nada
+ */
+nsDeque& nsDeque::PushFront(void* anItem) {
+  if(mSize==mCapacity) {
+    GrowCapacity();
+  }
+  if(0==mOrigin){  //case1: [xxx..]
+    //mOrigin=mCapacity-1-mSize++;
+    mOrigin=mCapacity-1;
+    mData[mOrigin]=anItem;
+  }
+  else {// if(mCapacity==(mOrigin+mSize-1)){ //case2: [..xxx] and case3: [.xxx.]
+    mData[--mOrigin]=anItem;
+  }
+  mSize++;
+  return *this;
+}
+
+/**
+ * Remove and return the last item in the container.
+ * 
+ * @update	gess4/18/98
+ * @param   none
+ * @return  ptr to last item in container
+ */
+void* nsDeque::Pop(void) {
+  void* result=0;
+  if(mSize>0) {
+    int offset=mOrigin+mSize-1;
+    if(offset>=mCapacity) 
+      offset-=mCapacity;
+    result=mData[offset];
+    mData[offset]=0;
+    mSize--;
+    if(0==mSize)
+      mOrigin=0;
+  }
+  return result;
+}
+
+/**
+ * This method gets called you want to remove and return
+ * the first member in the container.
+ *
+ * @update	gess4/18/98
+ * @param   nada
+ * @return  last item in container
+ */
+void* nsDeque::PopFront() {
+  void* result=0;
+  if(mSize>0) {
+    NS_ASSERTION(mOrigin<mCapacity,"Error: Bad origin");
+    result=mData[mOrigin];
+    mData[mOrigin++]=0;     //zero it out for debugging purposes.
+    mSize--;
+    if(mCapacity==mOrigin)  //you popped off the end, so cycle back around...
+      mOrigin=0;
+    if(0==mSize)
+      mOrigin=0;
+  }
+  return result;
+}
+
+/**
+ * This method gets called you want to peek at the topmost
+ * member without removing it.
+ *
+ * @update	gess4/18/98
+ * @param   nada
+ * @return  last item in container
+ */
+void* nsDeque::Peek() {
+  void* result=0;
+  if(mSize>0) {
+    result=mData[mOrigin];
+  }
+  return result;
+}
+
+/**
+ * Call this to retrieve the ith element from this container.
+ * Keep in mind that accessing the underlying elements is 
+ * done in a relative fashion. Object 0 is not necessarily
+ * the first element (the first element is at mOrigin).
+ *
+ * @update	gess4/18/98
+ * @param   anIndex : 0 relative offset of item you want
+ * @return  void* or null
+ */
+void* nsDeque::ObjectAt(PRInt32 anIndex) const {
+  void* result=0;
+
+  if((anIndex>=0) && (anIndex<mSize))
+  {
+    if(anIndex<(mCapacity-mOrigin)) {
+      result=mData[mOrigin+anIndex];
+    }
+    else {
+      result=mData[anIndex-(mCapacity-mOrigin)];
+    }
+  }
+  return result;
+}
+
+/**
+ * Create and return an iterator pointing to
+ * the beginning of the queue. Note that this
+ * takes the circular buffer semantics into account.
+ * 
+ * @update	gess4/18/98
+ * @return  new deque iterator, init'ed to 1st item
+ */
+nsDequeIterator nsDeque::Begin(void) const{
+  return nsDequeIterator(*this,0);
+}
+
+/**
+ * Create and return an iterator pointing to
+ * the last of the queue. Note that this
+ * takes the circular buffer semantics into account.
+ * 
+ * @update	gess4/18/98
+ * @return  new deque iterator, init'ed to last item
+ */
+nsDequeIterator nsDeque::End(void) const{
+  return nsDequeIterator(*this,mSize);
+}
+
+/**
+ * Call this method when you wanto to iterate all the
+ * members of the container, passing a functor along
+ * to call your code.
+ *
+ * @update	gess4/20/98
+ * @param   aFunctor object to call for each member
+ * @return  *this
+ */
+void nsDeque::ForEach(nsDequeFunctor& aFunctor) const{
+  int i=0;
+  for(i=0;i<mSize;i++){
+    void* obj=ObjectAt(i);
+    obj=aFunctor(obj);
+  }
+}
+
+/**
+ * Call this method when you wanto to iterate all the
+ * members of the container, passing a functor along
+ * to call your code. Iteration continues until your
+ * functor returns a non-null.
+ *
+ * @update	gess4/20/98
+ * @param   aFunctor object to call for each member
+ * @return  *this
+ */
+const void* nsDeque::FirstThat(nsDequeFunctor& aFunctor) const{
+  int i=0;
+  for(i=0;i<mSize;i++){
+    void* obj=ObjectAt(i);
+    obj=aFunctor(obj);
+    if(obj)
+      return obj;
+  }
+  return 0;
+}
+
+
+/******************************************************
+ * Here comes the nsDequeIterator class...
+ ******************************************************/
+
+/**
+ * DequeIterator is an object that knows how to iterate (forward and backward)
+ * a Deque. Normally, you don't need to do this, but there are some special
+ * cases where it is pretty handy, so here you go.
+ *
+ * This is a standard dequeiterator constructor
+ *
+ * @update	gess4/18/98
+ * @param   aQueue is the deque object to be iterated
+ * @param   anIndex is the starting position for your iteration
+ */
+nsDequeIterator::nsDequeIterator(const nsDeque& aQueue,int anIndex):  mIndex(anIndex), mDeque(aQueue) {
+}
+
+/**
+ * Copy construct a new iterator beginning with given 
+ *
+ * @update	gess4/20/98
+ * @param   aCopy is another iterator to copy from
+ * @return
+ */
+nsDequeIterator::nsDequeIterator(const nsDequeIterator& aCopy) : mIndex(aCopy.mIndex), mDeque(aCopy.mDeque) {
+}
+
+/**
+ * Moves iterator to first element in deque
+ * @update	gess4/18/98
+ * @return  this
+ */
+nsDequeIterator& nsDequeIterator::First(void){
+  mIndex=0;
+  return *this;
+}
+
+/**
+ * Standard assignment operator for dequeiterator
+ *
+ * @update	gess4/18/98
+ * @param   aCopy is an iterator to be copied from
+ * @return  *this
+ */
+nsDequeIterator& nsDequeIterator::operator=(const nsDequeIterator& aCopy) {
+  //queue's are already equal.
+  mIndex=aCopy.mIndex;
+  return *this;
+}
+
+/**
+ * preform ! operation against to iterators to test for equivalence
+ * (or lack thereof)!
+ *
+ * @update	gess4/18/98
+ * @param   anIter is the object to be compared to
+ * @return  TRUE if NOT equal.
+ */
+PRBool nsDequeIterator::operator!=(nsDequeIterator& anIter) {
+  return PRBool(!this->operator==(anIter));
+}
+
+
+/**
+ * Compare 2 iterators for equivalence.
+ *
+ * @update	gess4/18/98
+ * @param   anIter is the other iterator to be compared to
+ * @return  TRUE if EQUAL
+ */
+PRBool nsDequeIterator::operator<(nsDequeIterator& anIter) {
+  return PRBool(((mIndex<anIter.mIndex) && (&mDeque==&anIter.mDeque)));
+}
+
+/**
+ * Compare 2 iterators for equivalence.
+ *
+ * @update	gess4/18/98
+ * @param   anIter is the other iterator to be compared to
+ * @return  TRUE if EQUAL
+ */
+PRBool nsDequeIterator::operator==(nsDequeIterator& anIter) {
+  return PRBool(((mIndex==anIter.mIndex) && (&mDeque==&anIter.mDeque)));
+}
+
+/**
+ * Compare 2 iterators for equivalence.
+ *
+ * @update	gess4/18/98
+ * @param   anIter is the other iterator to be compared to
+ * @return  TRUE if EQUAL
+ */
+PRBool nsDequeIterator::operator>=(nsDequeIterator& anIter) {
+  return PRBool(((mIndex>=anIter.mIndex) && (&mDeque==&anIter.mDeque)));
+}
+
+/**
+ * Pre-increment operator 
+ *
+ * @update	gess4/18/98
+ * @return  object at preincremented index
+ */
+void* nsDequeIterator::operator++() {
+  return mDeque.ObjectAt(++mIndex);
+}
+
+/**
+ * Post-increment operator 
+ *
+ * @update	gess4/18/98
+ * @param   param is ignored
+ * @return  object at post-incremented index
+ */
+void* nsDequeIterator::operator++(int) {
+  return mDeque.ObjectAt(mIndex++);
+}
+
+/**
+ * Pre-decrement operator
+ *
+ * @update	gess4/18/98
+ * @return  object at pre-decremented index
+ */
+void* nsDequeIterator::operator--() {
+  return mDeque.ObjectAt(--mIndex);
+}
+
+/**
+ * Post-decrement operator
+ *
+ * @update	gess4/18/98
+ * @param   param is ignored
+ * @return  object at post-decremented index
+ */
+void* nsDequeIterator::operator--(int) {
+  return mDeque.ObjectAt(mIndex--);
+}
+
+/**
+ * Dereference operator
+ *
+ * @update	gess4/18/98
+ * @return  object at ith index
+ */
+void* nsDequeIterator::GetCurrent(void) {
+  return mDeque.ObjectAt(mIndex);
+}
+
+/**
+ * Call this method when you wanto to iterate all the
+ * members of the container, passing a functor along
+ * to call your code.
+ *
+ * @update	gess4/20/98
+ * @param   aFunctor object to call for each member
+ * @return  *this
+ */
+void nsDequeIterator::ForEach(nsDequeFunctor& aFunctor) const{
+  mDeque.ForEach(aFunctor);
+}
+
+/**
+ * Call this method when you wanto to iterate all the
+ * members of the container, passing a functor along
+ * to call your code.
+ *
+ * @update	gess4/20/98
+ * @param   aFunctor object to call for each member
+ * @return  *this
+ */
+const void* nsDequeIterator::FirstThat(nsDequeFunctor& aFunctor) const{
+  return mDeque.FirstThat(aFunctor);
+}
+
+#ifdef  _SELFTEST_DEQUE
+/**************************************************************
+  Now define the token deallocator class...
+ **************************************************************/
+class _SelfTestDeallocator: public nsDequeFunctor{
+public:
+  _SelfTestDeallocator::_SelfTestDeallocator() {
+    nsDeque::SelfTest();
+  }
+  virtual void* operator()(void* anObject) {
+    return 0;
+  }
+};
+static _SelfTestDeallocator gDeallocator;
+#endif
+
+/**
+ * conduct automated self test for this class
+ *
+ * @update	gess4/18/98
+ * @param 
+ * @return
+ */
+void nsDeque::SelfTest(void) {
+#ifdef  _SELFTEST_DEQUE
+
+  {
+    nsDeque theDeque(gDeallocator); //construct a simple one...
+    
+    int ints[200];
+    int count=sizeof(ints)/sizeof(int);
+    int i=0;
+
+    for(i=0;i<count;i++){ //initialize'em
+      ints[i]=10*(1+i);
+    }
+
+    for(i=0;i<70;i++){
+      theDeque.Push(&ints[i]);
+    }
+
+    for(i=0;i<56;i++){
+      int* temp=(int*)theDeque.Pop();
+    }
+
+    for(i=0;i<55;i++){
+      theDeque.Push(&ints[i]);
+    }
+
+    for(i=0;i<35;i++){
+      int* temp=(int*)theDeque.Pop();
+    }
+
+    for(i=0;i<35;i++){
+      theDeque.Push(&ints[i]);
+    }
+
+    for(i=0;i<38;i++){
+      int* temp=(int*)theDeque.Pop();
+    }
+
+  }
+
+  int x;
+  x=10;
+#endif
+}
+

mozilla/xpcom/ds/nsDeque.h

@@ -0,0 +1,410 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/**
+ * MODULE NOTES:
+ * @update  gess 4/15/98 (tax day)
+ * 
+ * The Deque is a very small, very efficient container object
+ * than can hold elements of type void*, offering the following features:
+ *    It's interface supports pushing and poping of children.
+ *    It can iterate (via an interator class) it's children.
+ *    When full, it can efficently resize dynamically.
+ *
+ *
+ * NOTE: The only bit of trickery here is that this deque is
+ * built upon a ring-buffer. Like all ring buffers, the first 
+ * element may not be at index[0]. The mOrigin member determines 
+ * where the first child is. This point is quietly hidden from 
+ * customers of this class.
+ *    
+ */
+
+
+#ifndef _NSDEQUE
+#define _NSDEQUE
+
+#include "nscore.h"
+
+/**
+ * The nsDequefunctor class is used when you want to create
+ * callbacks between the deque and your generic code.
+ * Use these objects in a call to ForEach();
+ *
+ * @update	gess4/20/98
+ */
+class NS_COM nsDequeFunctor{
+public:
+  virtual void* operator()(void* anObject)=0;
+};
+
+
+/******************************************************
+ * Here comes the nsDeque class itself...
+ ******************************************************/
+
+/**
+ * The deque (double-ended queue) class is a common container type, 
+ * whose behavior mimics a line in your favorite checkout stand.
+ * Classic CS describes the common behavior of a queue as FIFO. 
+ * A Deque allows items to be added and removed from either end of
+ * the queue.
+ *
+ * @update	gess4/20/98
+ */
+
+class NS_COM nsDeque {
+friend class nsDequeIterator;
+  public:
+                       nsDeque(nsDequeFunctor* aDeallocator);
+                      ~nsDeque();
+            
+  /**
+   * Returns the number of elements currently stored in
+   * this deque.
+   *
+   * @update	gess4/18/98
+   * @param 
+   * @return  int contains element count
+   */
+  inline PRInt32 GetSize() const { return mSize;}  
+
+  /**
+   * Pushes new member onto the end of the deque
+   *
+   * @update	gess4/18/98
+   * @param   ptr to object to store
+   * @return  *this
+   */
+  nsDeque& Push(void* anItem);
+
+  /**
+   * Pushes new member onto the front of the deque
+   *
+   * @update	gess4/18/98
+   * @param   ptr to object to store
+   * @return  *this
+   */
+  nsDeque& PushFront(void* anItem);
+  
+  /**
+   * Remove and return the first item in the container.
+   * 
+   * @update	gess4/18/98
+   * @param   none
+   * @return  ptr to first item in container
+   */
+  void* Pop(void);
+
+ /**
+   * Remove and return the first item in the container.
+   * 
+   * @update	gess4/18/98
+   * @param   none
+   * @return  ptr to first item in container
+   */
+  void* PopFront(void);
+
+ 
+  /**
+   * Return topmost item without removing it.
+   * 
+   * @update	gess4/18/98
+   * @param   none
+   * @return  ptr to first item in container
+   */
+  void* Peek(void);
+  
+  /**
+   * method used to retrieve ptr to
+   * ith member in container. DOesn't remove
+   * that item.
+   *
+   * @update	gess4/18/98
+   * @param   index of desired item
+   * @return  ptr to ith element in list
+   */
+  void* ObjectAt(int anIndex) const;
+  
+  /**
+   * Remove all items from container without destroying them
+   * 
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDeque& Empty();
+  
+  /**
+   * Remove and delete all items from container
+   * 
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDeque& Erase();
+
+
+  /**
+   * Creates a new iterator, init'ed to start of container
+   *
+   * @update	gess4/18/98
+   * @return  new dequeIterator
+   */
+  nsDequeIterator Begin() const;
+  
+  /**
+   * Creates a new iterator, init'ed to end of container
+   *
+   * @update	gess4/18/98
+   * @return  new dequeIterator
+   */
+  nsDequeIterator End() const;
+
+
+  /**
+   * Call this method when you wanto to iterate all the
+   * members of the container, passing a functor along
+   * to call your code.
+   *
+   * @update	gess4/20/98
+   * @param   aFunctor object to call for each member
+   * @return  *this
+   */
+  void ForEach(nsDequeFunctor& aFunctor) const;
+
+  /**
+   * Call this method when you wanto to iterate all the
+   * members of the container, passing a functor along
+   * to call your code. This process will interupt if
+   * your function returns a null to this iterator.
+   *
+   * @update	gess4/20/98
+   * @param   aFunctor object to call for each member
+   * @return  *this
+   */
+  const void* FirstThat(nsDequeFunctor& aFunctor) const;
+
+  void SetDeallocator(nsDequeFunctor* aDeallocator);
+
+  /**
+   * Perform automated selftest on the deque
+   *
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  static void SelfTest();
+
+protected:
+
+  PRInt32         mSize;
+  PRInt32         mCapacity;
+  PRInt32         mOrigin;
+  nsDequeFunctor* mDeallocator;
+  void*           mBuffer[8];
+  void**          mData;
+
+
+private: 
+  
+
+  /**
+   * Simple default constructor (PRIVATE)
+   * 
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDeque();
+
+  /**
+   * Copy constructor (PRIVATE)
+   * 
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDeque(const nsDeque& other);
+
+  /**
+   * Deque assignment operator (PRIVATE)
+   *
+   * @update	gess4/18/98
+   * @param   another deque
+   * @return  *this
+   */
+  nsDeque& operator=(const nsDeque& anOther);
+
+  nsDeque&  GrowCapacity(void);
+
+};
+
+/******************************************************
+ * Here comes the nsDequeIterator class...
+ ******************************************************/
+
+class NS_COM nsDequeIterator {
+public:
+  
+  /**
+   * DequeIterator is an object that knows how to iterate (forward and backward)
+   * a Deque. Normally, you don't need to do this, but there are some special
+   * cases where it is pretty handy, so here you go.
+   *
+   * @update	gess4/18/98
+   * @param   aQueue is the deque object to be iterated
+   * @param   anIndex is the starting position for your iteration
+   */
+  nsDequeIterator(const nsDeque& aQueue,int anIndex=0);
+  
+  /**
+   * DequeIterator is an object that knows how to iterate (forward and backward)
+   * a Deque. Normally, you don't need to do this, but there are some special
+   * cases where it is pretty handy, so here you go.
+   *
+   * @update	gess4/18/98
+   * @param   aQueue is the deque object to be iterated
+   * @param   anIndex is the starting position for your iteration
+   */
+  nsDequeIterator(const nsDequeIterator& aCopy);
+
+  /**
+   * Moves iterator to first element in deque
+   * @update	gess4/18/98
+   * @return  this
+   */
+  nsDequeIterator& First(void);
+
+  /**
+   * Standard assignment operator for deque
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDequeIterator& operator=(const nsDequeIterator& aCopy);
+
+  /**
+   * preform ! operation against to iterators to test for equivalence
+   * (or lack thereof)!
+   *
+   * @update	gess4/18/98
+   * @param   anIter is the object to be compared to
+   * @return  TRUE if NOT equal.
+   */
+  PRBool operator!=(nsDequeIterator& anIter);
+
+  /**
+   * Compare 2 iterators for equivalence.
+   *
+   * @update	gess4/18/98
+   * @param   anIter is the other iterator to be compared to
+   * @return  TRUE if EQUAL
+   */
+  PRBool operator<(nsDequeIterator& anIter);
+
+  /**
+   * Compare 2 iterators for equivalence.
+   *
+   * @update	gess4/18/98
+   * @param   anIter is the other iterator to be compared to
+   * @return  TRUE if EQUAL
+   */
+  PRBool operator==(nsDequeIterator& anIter);
+  
+  /**
+   * Compare 2 iterators for equivalence.
+   *
+   * @update	gess4/18/98
+   * @param   anIter is the other iterator to be compared to
+   * @return  TRUE if EQUAL
+   */
+  PRBool operator>=(nsDequeIterator& anIter);
+
+  /**
+   * Pre-increment operator 
+   *
+   * @update	gess4/18/98
+   * @return  object at preincremented index
+   */
+  void* operator++();
+
+  /**
+   * Post-increment operator 
+   *
+   * @update	gess4/18/98
+   * @param   param is ignored
+   * @return  object at post-incremented index
+   */
+  void* operator++(int);
+
+  /**
+   * Pre-decrement operator
+   *
+   * @update	gess4/18/98
+   * @return  object at pre-decremented index
+   */
+  void* operator--();
+
+  /**
+   * Post-decrement operator
+   *
+   * @update	gess4/18/98
+   * @param   param is ignored
+   * @return  object at post-decremented index
+   */
+  void* operator--(int);
+  
+  /**
+   * Retrieve the ptr to the iterators notion of current node
+   *
+   * @update	gess4/18/98
+   * @return  object at ith index
+   */
+  void* GetCurrent(void);
+
+  /**
+   * Call this method when you wanto to iterate all the
+   * members of the container, passing a functor along
+   * to call your code.
+   *
+   * @update	gess4/20/98
+   * @param   aFunctor object to call for each member
+   * @return  *this
+   */
+  void ForEach(nsDequeFunctor& aFunctor) const;
+  
+  /**
+   * Call this method when you wanto to iterate all the
+   * members of the container, passing a functor along
+   * to call your code.
+   *
+   * @update	gess4/20/98
+   * @param   aFunctor object to call for each member
+   * @return  *this
+   */
+  const void* FirstThat(nsDequeFunctor& aFunctor) const;
+
+  protected:
+
+        PRInt32         mIndex;
+        const nsDeque&  mDeque;
+};
+
+
+#endif

mozilla/xpcom/ds/nsEmptyEnumerator.cpp

@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+
+  An empty enumerator.
+
+ */
+
+#include "nsIEnumerator.h"
+
+////////////////////////////////////////////////////////////////////////
+
+class EmptyEnumeratorImpl : public nsISimpleEnumerator
+{
+public:
+    EmptyEnumeratorImpl(void) {};
+    virtual ~EmptyEnumeratorImpl(void) {};
+
+    // nsISupports interface
+    NS_IMETHOD_(nsrefcnt) AddRef(void) {
+        return 2;
+    }
+
+    NS_IMETHOD_(nsrefcnt) Release(void) {
+        return 1;
+    }
+
+    NS_IMETHOD QueryInterface(REFNSIID iid, void** result) {
+        if (! result)
+            return NS_ERROR_NULL_POINTER;
+
+        if (iid.Equals(nsISimpleEnumerator::GetIID()) ||
+            iid.Equals(NS_GET_IID(nsISupports))) {
+            *result = (nsISimpleEnumerator*) this;
+            NS_ADDREF(this);
+            return NS_OK;
+        }
+        return NS_NOINTERFACE;
+    }
+
+    // nsISimpleEnumerator
+    NS_IMETHOD HasMoreElements(PRBool* aResult) {
+        *aResult = PR_FALSE;
+        return NS_OK;
+    }
+
+    NS_IMETHOD GetNext(nsISupports** aResult) {
+        return NS_ERROR_UNEXPECTED;
+    }
+};
+
+extern "C" NS_COM nsresult
+NS_NewEmptyEnumerator(nsISimpleEnumerator** aResult)
+{
+    static EmptyEnumeratorImpl gEmptyEnumerator;
+    *aResult = &gEmptyEnumerator;
+    return NS_OK;
+}
+

mozilla/xpcom/ds/nsEnumeratorUtils.cpp

@@ -0,0 +1,228 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsEnumeratorUtils.h"
+
+
+nsArrayEnumerator::nsArrayEnumerator(nsISupportsArray* aValueArray)
+    : mValueArray(aValueArray),
+      mIndex(0)
+{
+    NS_INIT_REFCNT();
+    NS_IF_ADDREF(mValueArray);
+}
+
+nsArrayEnumerator::~nsArrayEnumerator(void)
+{
+    NS_IF_RELEASE(mValueArray);
+}
+
+NS_IMPL_ISUPPORTS1(nsArrayEnumerator, nsISimpleEnumerator)
+
+NS_IMETHODIMP
+nsArrayEnumerator::HasMoreElements(PRBool* aResult)
+{
+    NS_PRECONDITION(aResult != 0, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    PRUint32 cnt;
+    nsresult rv = mValueArray->Count(&cnt);
+    if (NS_FAILED(rv)) return rv;
+    *aResult = (mIndex < (PRInt32) cnt);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsArrayEnumerator::GetNext(nsISupports** aResult)
+{
+    NS_PRECONDITION(aResult != 0, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    PRUint32 cnt;
+    nsresult rv = mValueArray->Count(&cnt);
+    if (NS_FAILED(rv)) return rv;
+    if (mIndex >= (PRInt32) cnt)
+        return NS_ERROR_UNEXPECTED;
+
+    *aResult = mValueArray->ElementAt(mIndex++);
+    return NS_OK;
+}
+
+extern "C" NS_COM nsresult
+NS_NewArrayEnumerator(nsISimpleEnumerator* *result,
+                      nsISupportsArray* array)
+{
+    nsArrayEnumerator* enumer = new nsArrayEnumerator(array);
+    if (enumer == nsnull)
+        return NS_ERROR_OUT_OF_MEMORY;
+    NS_ADDREF(enumer);
+    *result = enumer; 
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+nsSingletonEnumerator::nsSingletonEnumerator(nsISupports* aValue)
+    : mValue(aValue)
+{
+    NS_INIT_REFCNT();
+    NS_IF_ADDREF(mValue);
+    mConsumed = (mValue ? PR_FALSE : PR_TRUE);
+}
+
+nsSingletonEnumerator::~nsSingletonEnumerator()
+{
+    NS_IF_RELEASE(mValue);
+}
+
+NS_IMPL_ISUPPORTS1(nsSingletonEnumerator, nsISimpleEnumerator)
+
+NS_IMETHODIMP
+nsSingletonEnumerator::HasMoreElements(PRBool* aResult)
+{
+    NS_PRECONDITION(aResult != 0, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    *aResult = !mConsumed;
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsSingletonEnumerator::GetNext(nsISupports** aResult)
+{
+    NS_PRECONDITION(aResult != 0, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    if (mConsumed)
+        return NS_ERROR_UNEXPECTED;
+
+    mConsumed = PR_TRUE;
+
+    NS_ADDREF(mValue);
+    *aResult = mValue;
+    return NS_OK;
+}
+
+extern "C" NS_COM nsresult
+NS_NewSingletonEnumerator(nsISimpleEnumerator* *result,
+                          nsISupports* singleton)
+{
+    nsSingletonEnumerator* enumer = new nsSingletonEnumerator(singleton);
+    if (enumer == nsnull)
+        return NS_ERROR_OUT_OF_MEMORY;
+    NS_ADDREF(enumer);
+    *result = enumer; 
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+
+nsAdapterEnumerator::nsAdapterEnumerator(nsIEnumerator* aEnum)
+    : mEnum(aEnum), mCurrent(0), mStarted(PR_FALSE)
+{
+    NS_INIT_REFCNT();
+    NS_ADDREF(mEnum);
+}
+
+
+nsAdapterEnumerator::~nsAdapterEnumerator()
+{
+    NS_RELEASE(mEnum);
+    NS_IF_RELEASE(mCurrent);
+}
+
+
+NS_IMPL_ISUPPORTS1(nsAdapterEnumerator, nsISimpleEnumerator)
+
+NS_IMETHODIMP
+nsAdapterEnumerator::HasMoreElements(PRBool* aResult)
+{
+    nsresult rv;
+
+    if (mCurrent) {
+        *aResult = PR_TRUE;
+        return NS_OK;
+    }
+
+    if (! mStarted) {
+        mStarted = PR_TRUE;
+        rv = mEnum->First();
+        if (rv == NS_OK) {
+            mEnum->CurrentItem(&mCurrent);
+            *aResult = PR_TRUE;
+        }
+        else {
+            *aResult = PR_FALSE;
+        }
+    }
+    else {
+        *aResult = PR_FALSE;
+
+        rv = mEnum->IsDone();
+        if (rv != NS_OK) {
+            // We're not done. Advance to the next one.
+            rv = mEnum->Next();
+            if (rv == NS_OK) {
+                mEnum->CurrentItem(&mCurrent);
+                *aResult = PR_TRUE;
+            }
+        }
+    }
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsAdapterEnumerator::GetNext(nsISupports** aResult)
+{
+    nsresult rv;
+
+    PRBool hasMore;
+    rv = HasMoreElements(&hasMore);
+    if (NS_FAILED(rv)) return rv;
+
+    if (! hasMore)
+        return NS_ERROR_UNEXPECTED;
+
+    // No need to addref, we "transfer" the ownership to the caller.
+    *aResult = mCurrent;
+    mCurrent = 0;
+    return NS_OK;
+}
+
+extern "C" NS_COM nsresult
+NS_NewAdapterEnumerator(nsISimpleEnumerator* *result,
+                        nsIEnumerator* enumerator)
+{
+    nsAdapterEnumerator* enumer = new nsAdapterEnumerator(enumerator);
+    if (enumer == nsnull)
+        return NS_ERROR_OUT_OF_MEMORY;
+    NS_ADDREF(enumer);
+    *result = enumer; 
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+

mozilla/xpcom/ds/nsEnumeratorUtils.h

@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsEnumeratorUtils_h__
+#define nsEnumeratorUtils_h__
+
+#include "nsIEnumerator.h"
+#include "nsISupportsArray.h"
+
+class NS_COM nsArrayEnumerator : public nsISimpleEnumerator
+{
+public:
+    // nsISupports interface
+    NS_DECL_ISUPPORTS
+
+    // nsISimpleEnumerator interface
+    NS_IMETHOD HasMoreElements(PRBool* aResult);
+    NS_IMETHOD GetNext(nsISupports** aResult);
+
+    // nsRDFArrayEnumerator methods
+    nsArrayEnumerator(nsISupportsArray* aValueArray);
+    virtual ~nsArrayEnumerator(void);
+
+protected:
+    nsISupportsArray* mValueArray;
+    PRInt32 mIndex;
+};
+
+extern "C" NS_COM nsresult
+NS_NewArrayEnumerator(nsISimpleEnumerator* *result,
+                      nsISupportsArray* array);
+
+////////////////////////////////////////////////////////////////////////////////
+
+class NS_COM nsSingletonEnumerator : public nsISimpleEnumerator
+{
+public:
+    NS_DECL_ISUPPORTS
+
+    // nsISimpleEnumerator methods
+    NS_IMETHOD HasMoreElements(PRBool* aResult);
+    NS_IMETHOD GetNext(nsISupports** aResult);
+
+    nsSingletonEnumerator(nsISupports* aValue);
+    virtual ~nsSingletonEnumerator();
+
+protected:
+    nsISupports* mValue;
+    PRBool mConsumed;
+};
+
+extern "C" NS_COM nsresult
+NS_NewSingletonEnumerator(nsISimpleEnumerator* *result,
+                          nsISupports* singleton);
+
+////////////////////////////////////////////////////////////////////////////////
+
+class NS_COM nsAdapterEnumerator : public nsISimpleEnumerator
+{
+public:
+    NS_DECL_ISUPPORTS
+
+    // nsISimpleEnumerator methods
+    NS_IMETHOD HasMoreElements(PRBool* aResult);
+    NS_IMETHOD GetNext(nsISupports** aResult);
+
+    nsAdapterEnumerator(nsIEnumerator* aEnum);
+    virtual ~nsAdapterEnumerator();
+
+protected:
+    nsIEnumerator* mEnum;
+    nsISupports*   mCurrent;
+    PRBool mStarted;
+};
+
+extern "C" NS_COM nsresult
+NS_NewAdapterEnumerator(nsISimpleEnumerator* *result,
+                        nsIEnumerator* enumerator);
+
+////////////////////////////////////////////////////////////////////////
+
+#endif /* nsEnumeratorUtils_h__ */

mozilla/xpcom/ds/nsIArena.h

@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsIArena_h___
+#define nsIArena_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+#define NS_MIN_ARENA_BLOCK_SIZE 64
+#define NS_DEFAULT_ARENA_BLOCK_SIZE 4096
+
+/// Interface IID for nsIArena
+#define NS_IARENA_IID         \
+{ 0xa24fdad0, 0x93b4, 0x11d1, \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+#define NS_ARENA_PROGID "component://netscape/arena"
+#define NS_ARENA_CLASSNAME "Arena"
+
+/** Interface to a memory arena abstraction. Arena's use large blocks
+ * of memory to allocate smaller objects. Arena's provide no free
+ * operator; instead, all of the objects in the arena are deallocated
+ * by deallocating the arena (e.g. when it's reference count goes to
+ * zero)
+ */
+class nsIArena : public nsISupports {
+public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IARENA_IID; return iid; }
+
+  NS_IMETHOD Init(PRUint32 arenaBlockSize) = 0;
+
+  NS_IMETHOD_(void*) Alloc(PRUint32 size) = 0;
+};
+
+/**
+ * Create a new arena using the desired block size for allocating the
+ * underlying memory blocks. The underlying memory blocks are allocated
+ * using the PR heap.
+ */
+extern NS_COM nsresult NS_NewHeapArena(nsIArena** aInstancePtrResult,
+                                        PRUint32 aArenaBlockSize = 0);
+
+#define NS_ARENA_CID                                 \
+{ /* 9832ec80-0d6b-11d3-9331-00104ba0fd40 */         \
+    0x9832ec80,                                      \
+    0x0d6b,                                          \
+    0x11d3,                                          \
+    {0x93, 0x31, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
+}
+
+#endif /* nsIArena_h___ */
+
+

mozilla/xpcom/ds/nsIAtom.idl

@@ -0,0 +1,82 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * The Initial Developer of the Original Code is Netscape Communications 
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998-1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ *
+ * Contributors:
+ *     
+ */
+#include "nsISupports.idl"
+
+interface nsISizeOfHandler;
+
+
+[ref] native nsStringRef(nsString);
+%{ C++
+class nsString;
+%}
+
+
+[uuid(3d1b15b0-93b4-11d1-895b-006008911b81)]
+interface nsIAtom : nsISupports
+{
+  /**
+   * Translate the unicode string into the stringbuf.
+   */
+  void ToString(in nsStringRef aString); 
+	
+  /**
+   * Return a pointer to a zero terminated unicode string.
+   */
+   void GetUnicode([shared, retval] out wstring aResult);
+
+  /**
+   * Get the size, in bytes, of the atom.
+   */
+  PRUint32 SizeOf(in nsISizeOfHandler aHandler);
+};
+
+
+%{C++
+
+/**
+ * Find an atom that matches the given iso-latin1 C string. The
+ * C string is translated into it's unicode equivalent.
+ */
+extern NS_COM nsIAtom* NS_NewAtom(const char* isolatin1);
+
+/**
+ * Find an atom that matches the given unicode string. The string is assumed
+ * to be zero terminated.
+ */
+extern NS_COM nsIAtom* NS_NewAtom(const PRUnichar* unicode);
+
+/**
+ * Find an atom that matches the given string.
+ */
+extern NS_COM nsIAtom* NS_NewAtom(const nsString& aString);
+
+/**
+ * Return a count of the total number of atoms currently
+ * alive in the system.
+ */
+extern NS_COM nsrefcnt NS_GetNumberOfAtoms(void);
+
+extern NS_COM void NS_PurgeAtomTable(void);
+
+%}

mozilla/xpcom/ds/nsIBuffer.h

@@ -0,0 +1,312 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsIBuffer_h___
+#define nsIBuffer_h___
+
+/**
+ * nsIBuffer is something that we use to implement pipes (buffered
+ * input/output stream pairs). It might be useful to you for other
+ * purposes, but if not, oh well.
+ *
+ * One of the important things to understand about pipes is how
+ * they work with respect to EOF and result values. The following
+ * table describes:
+ *
+ *               | empty & not EOF    | full               | reader closed | writer closed                     |
+ * -------------------------------------------------------------------------------------------------------------
+ * buffer Read   | readCount == 0     | readCount == N     | N/A           | readCount == N, return NS_OK -or- |
+ * operations    | return WOULD_BLOCK | return NS_OK       |               | readCount == 0, return EOF        |
+ * -------------------------------------------------------------------------------------------------------------
+ * buffer Write  | writeCount == N    | writeCount == 0    | N/A           | assertion!                        | 
+ * operations    | return NS_OK       | return WOULD_BLOCK |               |                                   |
+ * -------------------------------------------------------------------------------------------------------------
+ * input stream  | readCount == 0     | readCount == N     | assertion!    | readCount == N, return NS_OK -or- |
+ * Read ops      | return WOULD_BLOCK | return NS_OK       |               | readCount == 0, return EOF        |
+ * -------------------------------------------------------------------------------------------------------------
+ * output stream | writeCount == N    | writeCount == 0    | return        | assertion!                        | 
+ * Write ops     | return NS_OK       | return WOULD_BLOCK | STREAM_CLOSED |                                   |
+ * -------------------------------------------------------------------------------------------------------------
+ */
+
+#include "nsISupports.h"
+#include "nscore.h"
+
+class nsIInputStream;
+class nsIAllocator;
+class nsIBufferInputStream;
+class nsIBufferOutputStream;
+class nsIBufferObserver;
+
+#define NS_IBUFFER_IID                               \
+{ /* 1eebb300-fb8b-11d2-9324-00104ba0fd40 */         \
+    0x1eebb300,                                      \
+    0xfb8b,                                          \
+    0x11d2,                                          \
+    {0x93, 0x24, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
+}
+
+#define NS_BUFFER_CID                                \
+{ /* 5dbe4de0-fbab-11d2-9324-00104ba0fd40 */         \
+    0x5dbe4de0,                                      \
+    0xfbab,                                          \
+    0x11d2,                                          \
+    {0x93, 0x24, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
+}
+
+#define NS_BUFFER_PROGID "component://netscape/buffer"
+#define NS_BUFFER_CLASSNAME "Buffer"
+
+/**
+ * The signature for the reader function passed to WriteSegment. This 
+ * specifies where the data should come from that gets written into the buffer.
+ * Implementers should return the following:
+ * @return NS_OK and readCount - if successfully read something
+ * @return NS_BASE_STREAM_EOF - if no more to read
+ * @return NS_BASE_STREAM_WOULD_BLOCK - if there is currently no data (in
+ *   a non-blocking mode)
+ * @return <other-error> - on failure
+ */
+typedef NS_CALLBACK(nsReadSegmentFun)(void* closure,
+                                      char* toRawSegment,
+                                      PRUint32 fromOffset,
+                                      PRUint32 count,
+                                      PRUint32 *readCount);
+
+/**
+ * The signature of the writer function passed to ReadSegments. This
+ * specifies where the data should go that gets read from the buffer.
+ * Implementers should return the following:
+ * @return NS_OK and writeCount - if successfully wrote something
+ * @return NS_BASE_STREAM_CLOSED - if no more can be written
+ * @return NS_BASE_STREAM_WOULD_BLOCK - if there is currently space to write (in
+ *   a non-blocking mode)
+ * @return <other-error> - on failure
+ */
+typedef NS_CALLBACK(nsWriteSegmentFun)(void* closure,
+                                       const char* fromRawSegment,
+                                       PRUint32 toOffset,
+                                       PRUint32 count,
+                                       PRUint32 *writeCount);
+
+class nsIBuffer : public nsISupports {
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IBUFFER_IID);
+
+    /**
+     * The segment overhead is the amount of space chopped out of each
+     * segment for implementation purposes. The remainder of the segment
+     * is available for data, e.g.:
+     *     segmentDataSize = growBySize - SEGMENT_OVERHEAD;
+     */
+    enum { SEGMENT_OVERHEAD = 8 };
+
+    /**
+     * Initializes a buffer. The segment size (including overhead) will
+     * start from and increment by the growBySize, until reaching maxSize.
+     * The size of the data that can fit in a segment will be the growBySize
+     * minus SEGMENT_OVERHEAD bytes.
+     */
+    NS_IMETHOD Init(PRUint32 growBySize, PRUint32 maxSize,
+                    nsIBufferObserver* observer, nsIAllocator* allocator) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Methods for Readers
+
+    /**
+     * Reads from the read cursor into a char buffer up to a specified length.
+     */
+    NS_IMETHOD Read(char* toBuf, PRUint32 bufLen, PRUint32 *readCount) = 0;
+
+    /**
+     * This read method allows you to pass a callback function that gets called
+     * repeatedly for each buffer segment until the entire amount is read.
+     * This avoids the need to copy data to/from and intermediate buffer.
+     */
+    NS_IMETHOD ReadSegments(nsWriteSegmentFun writer, void* closure, PRUint32 count,
+                            PRUint32 *readCount) = 0;
+
+    /**
+     * Returns the raw char buffer segment and its length available for reading.
+     * @param segmentLogicalOffset - The offset from the current read cursor for
+     *   the segment to be returned. If this is beyond the available written area,
+     *   NULL is returned for the resultSegment.
+     * @param resultSegment - The resulting read segment.
+     * @param resultSegmentLength - The resulting read segment length.
+     *
+     * @return NS_OK - if a read segment is successfully returned, or if
+     *   the requested offset is at or beyond the write cursor (in which case
+     *   the resultSegment will be nsnull and the resultSegmentLen will be 0)
+     * @return NS_BASE_STREAM_WOULD_BLOCK - if the buffer size becomes 0
+     * @return any error set by SetCondition if the requested offset is at
+     *   or beyond the write cursor (in which case the resultSegment will be
+     *   nsnull and the resultSegmentLen will be 0). Note that NS_OK will be
+     *   returned if SetCondition has not been called. 
+     * @return any error returned by OnEmpty
+     */
+    NS_IMETHOD GetReadSegment(PRUint32 segmentLogicalOffset,
+                              const char* *resultSegment,
+                              PRUint32 *resultSegmentLen) = 0;
+
+    /**
+     * Returns the amount of data currently in the buffer available for reading.
+     */
+    NS_IMETHOD GetReadableAmount(PRUint32 *amount) = 0;
+
+    /**
+     * Searches for a string in the buffer. Since the buffer has a notion
+     * of EOF, it is possible that the string may at some time be in the
+     * buffer, but is is not currently found up to some offset. Consequently,
+     * both the found and not found cases return an offset:
+     *    if found, return offset where it was found
+     *    if not found, return offset of the first byte not searched
+     * In the case the buffer is at EOF and the string is not found, the first
+     * byte not searched will correspond to the length of the buffer.
+     */
+    NS_IMETHOD Search(const char* forString, PRBool ignoreCase,
+                      PRBool *found, PRUint32 *offsetSearchedTo) = 0;
+
+    /**
+     * Sets that the reader has closed their end of the stream.
+     */
+    NS_IMETHOD ReaderClosed(void) = 0;
+
+    /**
+     * Tests whether EOF marker is set. Note that this does not necessarily mean that
+     * all the data in the buffer has yet been consumed.
+     */
+    NS_IMETHOD GetCondition(nsresult *result) = 0;
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Methods for Writers
+
+    /**
+     * Writes from a char buffer up to a specified length.
+     * @param writeCount - The amount that could be written. If the buffer becomes full,
+     *   this could be less then the specified bufLen.
+     */
+    NS_IMETHOD Write(const char* fromBuf, PRUint32 bufLen, PRUint32 *writeCount) = 0;
+
+    /**
+     * Writes from an input stream up to a specified count of bytes.
+     * @param writeCount - The amount that could be written. If the buffer becomes full,
+     *   this could be less then the specified count.
+     */
+    NS_IMETHOD WriteFrom(nsIInputStream* fromStream, PRUint32 count, PRUint32 *writeCount) = 0;
+
+    /**
+     * This write method allows you to pass a callback function that gets called
+     * repeatedly for each buffer segment until the entire amount is written.
+     * This avoids the need to copy data to/from and intermediate buffer.
+     */
+    NS_IMETHOD WriteSegments(nsReadSegmentFun reader, void* closure, PRUint32 count,
+                             PRUint32 *writeCount) = 0;
+
+    /**
+     * Returns the raw char buffer segment and its length available for writing.
+     * @param resultSegment - The resulting write segment.
+     * @param resultSegmentLength - The resulting write segment length.
+     *
+     * @return NS_OK - if there is a segment available to write to
+     * @return NS_BASE_STREAM_CLOSED - if ReaderClosed has been called
+     * @return NS_BASE_STREAM_WOULD_BLOCK - if the max buffer size is exceeded
+     * @return NS_ERROR_OUT_OF_MEMORY - if a new segment could not be allocated
+     * @return any error returned by OnFull
+     */
+    NS_IMETHOD GetWriteSegment(char* *resultSegment,
+                               PRUint32 *resultSegmentLen) = 0;
+
+    /**
+     * Returns the amount of space currently in the buffer available for writing.
+     */
+    NS_IMETHOD GetWritableAmount(PRUint32 *amount) = 0;
+
+    /**
+     * Returns whether the reader has closed their end of the stream.
+     */
+    NS_IMETHOD GetReaderClosed(PRBool *result) = 0;
+
+    /**
+     * Sets an EOF marker (typcially done by the writer) so that a reader can be informed
+     * when all the data in the buffer is consumed. After the EOF marker has been
+     * set, all subsequent calls to the above write methods will return NS_BASE_STREAM_EOF.
+     */
+    NS_IMETHOD SetCondition(nsresult condition) = 0;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+#define NS_IBUFFEROBSERVER_IID                       \
+{ /* 0c18bef0-22a8-11d3-9349-00104ba0fd40 */         \
+    0x0c18bef0,                                      \
+    0x22a8,                                          \
+    0x11d3,                                          \
+    {0x93, 0x49, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
+}
+
+/**
+ * A buffer observer is used to detect when the buffer becomes completely full
+ * or completely empty.
+ */
+class nsIBufferObserver : public nsISupports {
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IBUFFEROBSERVER_IID);
+
+    NS_IMETHOD OnFull(nsIBuffer* buffer) = 0;
+
+    NS_IMETHOD OnWrite(nsIBuffer*, PRUint32 amount) = 0;
+
+    NS_IMETHOD OnEmpty(nsIBuffer* buffer) = 0;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Creates a new buffer.
+ * @param observer - may be null
+ */
+extern NS_COM nsresult
+NS_NewBuffer(nsIBuffer* *result,
+             PRUint32 growBySize, PRUint32 maxSize,
+             nsIBufferObserver* observer);
+
+/**
+ * Creates a new buffer, allocating segments from virtual memory pages.
+ */
+extern NS_COM nsresult
+NS_NewPageBuffer(nsIBuffer* *result,
+                 PRUint32 growBySize, PRUint32 maxSize,
+                 nsIBufferObserver* observer);
+
+extern NS_COM nsresult
+NS_NewBufferInputStream(nsIBufferInputStream* *result,
+                        nsIBuffer* buffer, PRBool blocking = PR_FALSE);
+
+extern NS_COM nsresult
+NS_NewBufferOutputStream(nsIBufferOutputStream* *result,
+                         nsIBuffer* buffer, PRBool blocking = PR_FALSE);
+
+extern NS_COM nsresult
+NS_NewPipe(nsIBufferInputStream* *inStrResult,
+           nsIBufferOutputStream* *outStrResult,
+           PRUint32 growBySize, PRUint32 maxSize,
+           PRBool blocking, nsIBufferObserver* observer);
+
+////////////////////////////////////////////////////////////////////////////////
+
+#endif // nsIBuffer_h___

mozilla/xpcom/ds/nsIByteBuffer.h

@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsIByteBuffer_h___
+#define nsIByteBuffer_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+class nsIInputStream;
+
+#define NS_IBYTE_BUFFER_IID    \
+{ 0xe4a6e4b0, 0x93b4, 0x11d1, \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+#define NS_IBYTEBUFFER_IID    \
+{ 0xe4a6e4b0, 0x93b4, 0x11d1, \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+#define NS_BYTEBUFFER_PROGID "component://netscape/byte-buffer"
+#define NS_BYTEBUFFER_CLASSNAME "Byte Buffer"
+
+/** Interface to a buffer that holds bytes */
+class nsIByteBuffer : public nsISupports {
+public:
+	static const nsIID& GetIID() { static nsIID iid = NS_IBYTEBUFFER_IID; return iid; }
+
+  NS_IMETHOD Init(PRUint32 aBufferSize) = 0;
+
+  /** @return length of buffer, i.e. how many bytes are currently in it. */
+  NS_IMETHOD_(PRUint32) GetLength(void) const = 0;
+
+  /** @return number of bytes allocated in the buffer */
+  NS_IMETHOD_(PRUint32) GetBufferSize(void) const = 0;
+
+  /** @return the buffer */
+  NS_IMETHOD_(char*) GetBuffer(void) const = 0;
+
+  /** Grow buffer to aNewSize bytes. */
+  NS_IMETHOD_(PRBool) Grow(PRUint32 aNewSize) = 0;
+
+  /** Fill the buffer with data from aStream.  Don't grow the buffer, only
+   *  read until length of buffer equals buffer size. */
+  NS_IMETHOD_(PRInt32) Fill(nsresult* aErrorCode, nsIInputStream* aStream,
+                            PRUint32 aKeep) = 0;
+};
+
+#define NS_BYTEBUFFER_CID                            \
+{ /* a49d5280-0d6b-11d3-9331-00104ba0fd40 */         \
+    0xa49d5280,                                      \
+    0x0d6b,                                          \
+    0x11d3,                                          \
+    {0x93, 0x31, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
+}
+
+/** Create a new byte buffer using the given buffer size. */
+extern NS_COM nsresult 
+NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult,
+                 nsISupports* aOuter,
+                 PRUint32 aBufferSize = 0);
+
+#endif /* nsIByteBuffer_h___ */
+

mozilla/xpcom/ds/nsICollection.idl

@@ -0,0 +1,38 @@
+/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsISupports.idl"
+#include "nsIEnumerator.idl"
+
+[scriptable, uuid(83b6019c-cbc4-11d2-8cca-0060b0fc14a3)]
+interface nsICollection : nsISupports
+{
+
+  PRUint32 Count();
+  nsISupports GetElementAt(in PRUint32 index);
+  void QueryElementAt(in PRUint32 index, in nsIIDRef uuid, 
+                      [iid_is(uuid),retval] out nsQIResult result);
+  void SetElementAt(in PRUint32 index, in nsISupports item);
+  void AppendElement(in nsISupports item);
+  void RemoveElement(in nsISupports item);
+
+  nsIEnumerator Enumerate();
+
+  void Clear();
+
+};

mozilla/xpcom/ds/nsIEnumerator.idl

@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(D1899240-F9D2-11D2-BDD6-000064657374)]
+interface nsISimpleEnumerator : nsISupports {
+  boolean HasMoreElements();
+  nsISupports GetNext();
+};
+
+/*
+ * DO NOT USE THIS INTERFACE.  IT IS HORRIBLY BROKEN, USES NS_COMFALSE
+ * AND IS BASICALLY IMPOSSIBLE TO USE CORRECTLY THROUGH PROXIES OR
+ * XPCONNECT.  IF YOU SEE NEW USES OF THIS INTERFACE IN CODE YOU ARE
+ * REVIEWING, YOU SHOULD INSIST ON nsISimpleEnumerator.
+ *
+ * DON'T MAKE ME COME OVER THERE.
+ */
+[scriptable, uuid(ad385286-cbc4-11d2-8cca-0060b0fc14a3)]
+interface nsIEnumerator : nsISupports {
+
+  /** First will reset the list. will return NS_FAILED if no items
+   */
+  void first();
+
+  /** Next will advance the list. will return failed if already at end
+   */
+  void next();
+
+  /** CurrentItem will return the CurrentItem item it will fail if the 
+   *  list is empty
+   */
+  nsISupports currentItem();
+
+  /** return if the collection is at the end.  that is the beginning following 
+   *  a call to Prev and it is the end of the list following a call to next
+   */
+  void isDone();
+};
+
+[uuid(75f158a0-cadd-11d2-8cca-0060b0fc14a3)]
+interface nsIBidirectionalEnumerator : nsIEnumerator {
+
+  /** Last will reset the list to the end. will return NS_FAILED if no items
+   */
+  void Last();
+
+  /** Prev will decrement the list. will return failed if already at beginning
+   */
+  void Prev();
+};
+
+%{C++
+extern "C" NS_COM nsresult
+NS_NewEmptyEnumerator(nsISimpleEnumerator** aResult);
+
+// Construct and return an implementation of a "conjoining enumerator." This
+// enumerator lets you string together two other enumerators into one sequence.
+// The result is an nsIBidirectionalEnumerator, but if either input is not
+// also bidirectional, the Last and Prev operations will fail.
+extern "C" NS_COM nsresult
+NS_NewConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second,
+                           nsIBidirectionalEnumerator* *aInstancePtrResult);
+
+// Construct and return an implementation of a "union enumerator." This
+// enumerator will only return elements that are found in both constituent
+// enumerators.
+extern "C" NS_COM nsresult
+NS_NewUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
+                      nsIEnumerator* *aInstancePtrResult);
+
+// Construct and return an implementation of an "intersection enumerator." This
+// enumerator will return elements that are found in either constituent
+// enumerators, eliminating duplicates.
+extern "C" NS_COM nsresult
+NS_NewIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
+                             nsIEnumerator* *aInstancePtrResult);
+
+%}

mozilla/xpcom/ds/nsIObserver.idl

@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(DB242E01-E4D9-11d2-9DDE-000064657374)]
+interface nsIObserver : nsISupports {
+
+	/*------------------------------- Observe ----------------------------------
+    | Called when aTopic changes for aSubject (presumably; it is actually      |
+    | called whenever anyone calls nsIObserverService::Notify for aTopic).     |
+    |                                                                          |
+    | Implement this in your class to handle the event appropriately.  If      |
+    | your observer objects can respond to multiple topics and/or subjects,    |
+    | then you will have to filter accordingly.                                |
+	--------------------------------------------------------------------------*/
+    void Observe( in nsISupports aSubject,
+				  in wstring     aTopic,
+				  in wstring     someData );
+
+};
+
+%{C++
+
+#define NS_OBSERVER_PROGID "component://netscape/xpcom/observer"
+
+#define NS_OBSERVER_CLASSNAME "Observer"
+
+%}

mozilla/xpcom/ds/nsIObserverList.h

@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsIObserverList_h__
+#define nsIObserverList_h__
+
+#include "nsISupports.h"
+#include "nsIObserver.h"
+#include "nsIEnumerator.h"
+#include "nscore.h"
+
+
+// {E777D482-E6E3-11d2-8ACD-00105A1B8860}
+#define NS_IOBSERVERLIST_IID \
+{ 0xe777d482, 0xe6e3, 0x11d2, { 0x8a, 0xcd, 0x0, 0x10, 0x5a, 0x1b, 0x88, 0x60 } }
+
+// {E777D484-E6E3-11d2-8ACD-00105A1B8860}
+#define NS_OBSERVERLIST_CID \
+{ 0xe777d484, 0xe6e3, 0x11d2, { 0x8a, 0xcd, 0x0, 0x10, 0x5a, 0x1b, 0x88, 0x60 } }
+
+class nsIObserverList : public nsISupports {
+public:
+    static const nsIID& GetIID() { static nsIID iid = NS_IOBSERVERLIST_IID; return iid; }
+    
+    NS_IMETHOD AddObserver(nsIObserver** anObserver) = 0;
+    NS_IMETHOD RemoveObserver(nsIObserver** anObserver) = 0;
+	NS_IMETHOD EnumerateObserverList(nsIEnumerator** anEnumerator) = 0;
+   
+};
+
+extern NS_COM nsresult NS_NewObserverList(nsIObserverList** anObserverList);
+
+#endif /* nsIObserverList_h__ */

mozilla/xpcom/ds/nsIObserverService.idl

@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsISupports.idl"
+#include "nsIObserver.idl"
+#include "nsIEnumerator.idl"
+
+[scriptable, uuid(D07F5192-E3D1-11d2-8ACD-00105A1B8860)]
+interface nsIObserverService : nsISupports {
+
+ 	void AddObserver( in nsIObserver anObserver, in wstring aTopic );
+    void RemoveObserver( in nsIObserver anObserver, in wstring nsString );
+	nsIEnumerator EnumerateObserverList( in wstring aTopic );
+    void Notify( in nsISupports aSubject,
+                 in wstring     aTopic,
+                 in wstring     someData );
+
+};
+
+%{C++
+
+#define NS_OBSERVERSERVICE_PROGID "component://netscape/observer-service"
+
+#define NS_OBSERVERSERVICE_CLASSNAME "Observer Service"
+
+%}

mozilla/xpcom/ds/nsIPageManager.h

@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsIPageManager_h__
+#define nsIPageManager_h__
+
+#include "nsISupports.h"
+
+#define NS_PAGEMGR_PAGE_BITS            12      // 4k pages
+#define NS_PAGEMGR_PAGE_SIZE            (1 << NS_PAGEMGR_PAGE_BITS)
+#define NS_PAGEMGR_PAGE_MASK            (NS_PAGEMGR_PAGE_SIZE - 1)
+#define NS_PAGEMGR_PAGE_COUNT(bytes)    (((bytes) + NS_PAGEMGR_PAGE_MASK) >> NS_PAGEMGR_PAGE_BITS)
+
+#define NS_IPAGEMANAGER_IID                          \
+{ /* bea98210-fb7b-11d2-9324-00104ba0fd40 */         \
+    0xbea98210,                                      \
+    0xfb7b,                                          \
+    0x11d2,                                          \
+    {0x93, 0x24, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
+}
+
+#define NS_PAGEMANAGER_CID                           \
+{ /* cac907e0-fb7b-11d2-9324-00104ba0fd40 */         \
+    0xcac907e0,                                      \
+    0xfb7b,                                          \
+    0x11d2,                                          \
+    {0x93, 0x24, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
+}
+#define NS_PAGEMANAGER_PROGID "component://netscape/page-manager"
+#define NS_PAGEMANAGER_CLASSNAME "Page Manager"
+
+class nsIPageManager : public nsISupports {
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPAGEMANAGER_IID);
+
+    NS_IMETHOD AllocPages(PRUint32 pageCount, void* *result) = 0;
+
+    NS_IMETHOD DeallocPages(PRUint32 pageCount, void* pages) = 0;
+
+};
+
+#endif // nsIPageManager_h__

mozilla/xpcom/ds/nsIProperties.h

@@ -0,0 +1,150 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL. You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All Rights
+ * Reserved.
+ */
+
+#ifndef nsIProperties_h___
+#define nsIProperties_h___
+
+#include "nsISupports.h"
+#include "nsIEnumerator.h"
+#include "nsISupportsArray.h"
+
+#define NS_IPROPERTIES_IID                           \
+{ /* f42bc870-dc17-11d2-9311-00e09805570f */         \
+    0xf42bc870,                                      \
+    0xdc17,                                          \
+    0x11d2,                                          \
+    {0x93, 0x11, 0x00, 0xe0, 0x98, 0x05, 0x57, 0x0f} \
+}
+
+#define NS_PROPERTIES_CID                            \
+{ /* b3efe4d0-0d6b-11d3-9331-00104ba0fd40 */         \
+    0xb3efe4d0,                                      \
+    0x0d6b,                                          \
+    0x11d3,                                          \
+    {0x93, 0x31, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
+}
+#define NS_PROPERTIES_PROGID "component://netscape/properties"
+#define NS_PROPERTIES_CLASSNAME "Properties"
+
+class nsIProperties : public nsISupports {
+public:
+    static const nsIID& GetIID() { static nsIID iid = NS_IPROPERTIES_IID; return iid; }
+    
+    /**
+     * Defines a new property.
+     * @return NS_ERROR_FAILURE if a property is already defined.
+     */
+    NS_IMETHOD DefineProperty(const char* prop, nsISupports* initialValue) = 0;
+
+    /**
+     * Undefines a property.
+     * @return NS_ERROR_FAILURE if a property is not already defined.
+     */
+    NS_IMETHOD UndefineProperty(const char* prop) = 0;
+
+    /**
+     * Gets a property.
+     * @return NS_ERROR_FAILURE if a property is not already defined.
+     */
+    NS_IMETHOD GetProperty(const char* prop, nsISupports* *result) = 0;
+
+    /**
+     * Sets a property.
+     * @return NS_ERROR_FAILURE if a property is not already defined.
+     */
+    NS_IMETHOD SetProperty(const char* prop, nsISupports* value) = 0;
+
+    /**
+     * @return NS_OK if the property exists with the specified value
+     * @return NS_COMFALSE if the property does not exist, or doesn't have
+     * the specified value (values are compared with ==)
+     */
+    NS_IMETHOD HasProperty(const char* prop, nsISupports* value) = 0; 
+
+};
+
+// Returns a default implementation of an nsIProperties object.
+extern nsresult
+NS_NewIProperties(nsIProperties* *result);
+
+////////////////////////////////////////////////////////////////////////////////
+
+#include "nsID.h"
+#include "nsIInputStream.h"
+#include "nsIOutputStream.h"
+#include "nsString.h"
+
+// {1A180F60-93B2-11d2-9B8B-00805F8A16D9}
+#define NS_IPERSISTENTPROPERTIES_IID \
+{ 0x1a180f60, 0x93b2, 0x11d2, \
+  { 0x9b, 0x8b, 0x0, 0x80, 0x5f, 0x8a, 0x16, 0xd9 } }
+
+// {2245E573-9464-11d2-9B8B-00805F8A16D9}
+NS_DECLARE_ID(kPersistentPropertiesCID,
+  0x2245e573, 0x9464, 0x11d2, 0x9b, 0x8b, 0x0, 0x80, 0x5f, 0x8a, 0x16, 0xd9);
+
+#define NS_PERSISTENTPROPERTIES_PROGID "component://netscape/persistent-properties"
+#define NS_PERSISTENTPROPERTIES_CLASSNAME "Persistent Properties"
+
+class nsIPersistentProperties : public nsIProperties
+{
+public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IPERSISTENTPROPERTIES_IID; return iid; }
+
+  NS_IMETHOD Load(nsIInputStream* aIn) = 0;
+  NS_IMETHOD Save(nsIOutputStream* aOut, const nsString& aHeader) = 0;
+  NS_IMETHOD Subclass(nsIPersistentProperties* aSubclass) = 0;	
+
+  /**
+   * Enumerates the properties in the supplied enumerator.
+   * @return NS_ERROR_FAILURE if no properties to enumerate
+   */
+  NS_IMETHOD EnumerateProperties(nsIBidirectionalEnumerator** aResult) = 0;
+
+  // XXX these 2 methods will be subsumed by the ones from 
+  // nsIProperties once we figure this all out
+  NS_IMETHOD GetStringProperty(const nsString& aKey, nsString& aValue) = 0;
+  NS_IMETHOD SetStringProperty(const nsString& aKey, nsString& aNewValue,
+                         nsString& aOldValue) = 0;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+// {C23C10B3-0E1A-11d3-A430-0060B0EB5963}
+#define NS_IPROPERTYELEMENT_IID \
+{ 0xc23c10b3, 0xe1a, 0x11d3, \
+	{ 0xa4, 0x30, 0x0, 0x60, 0xb0, 0xeb, 0x59, 0x63 } }
+
+// {579C0568-0E1B-11d3-A430-0060B0EB5963}
+NS_DECLARE_ID(kPropertyElementCID, 
+	0x579c0568, 0xe1b, 0x11d3, 0xa4, 0x30, 0x0, 0x60, 0xb0, 0xeb, 0x59, 0x63);
+
+class nsIPropertyElement : public nsISupports
+{
+public:
+	static const nsIID& GetIID() { static nsIID iid = NS_IPROPERTYELEMENT_IID; return iid; }	
+
+	NS_IMETHOD SetKey(nsString* aKey) = 0;
+	NS_IMETHOD SetValue(nsString* aValue) = 0; 
+	NS_IMETHOD GetKey(nsString** aReturnKey) = 0;
+	NS_IMETHOD GetValue(nsString** aReturnValue) = 0;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+#endif // nsIProperties_h___

mozilla/xpcom/ds/nsISimpleEnumerator.h

@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsISimpleEnumerator_h__
+#define nsISimpleEnumerator_h__
+
+// This file is needed to pacify the xpidl-generated header files.
+#include "nsIEnumerator.h"
+
+#endif // nsISimpleEnumerator_h__
+

mozilla/xpcom/ds/nsISizeOfHandler.h

@@ -0,0 +1,100 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsISizeOfHandler_h___
+#define nsISizeOfHandler_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+/* c028d1f0-fc9e-11d1-89e4-006008911b81 */
+#define NS_ISIZEOF_HANDLER_IID \
+{ 0xc028d1f0, 0xfc9e, 0x11d1, {0x89, 0xe4, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81}}
+
+class nsIAtom;
+class nsISizeOfHandler;
+
+/**
+ * Function used by the Report method to report data gathered during
+ * a collection of data.
+ */
+typedef void (*nsISizeofReportFunc)(nsISizeOfHandler* aHandler,
+                                    nsIAtom* aKey,
+                                    PRUint32 aCount,
+                                    PRUint32 aTotalSize,
+                                    PRUint32 aMinSize,
+                                    PRUint32 aMaxSize,
+                                    void* aArg);
+
+/**
+ * An API to managing a sizeof computation of an arbitrary graph.
+ * The handler is responsible for remembering which objects have been
+ * seen before (using RecordObject). Note that the handler doesn't
+ * hold references to nsISupport's objects; the assumption is that the
+ * objects being sized are stationary and will not be modified during
+ * the sizing computation and therefore do not need an extra reference
+ * count.
+ *
+ * Users of this API are responsible for the actual graph/tree walking.
+ */
+class nsISizeOfHandler : public nsISupports {
+public:
+	NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISIZEOF_HANDLER_IID)
+
+  /**
+   * Initialize the handler for a new collection of data. This empties
+   * out the object prescence table and the keyed size table.
+   */
+  NS_IMETHOD Init() = 0;
+
+  /**
+   * Record the sizing status of a given object. The first time
+   * aObject is recorded, aResult will be PR_FALSE. Subsequent times,
+   * aResult will be PR_TRUE.
+   */
+  NS_IMETHOD RecordObject(void* aObject, PRBool* aResult) = 0;
+
+  /**
+   * Add size information to the running size data. The atom is used
+   * as a key to keep type specific running totals of size
+   * information.  This increments the total count and the total size
+   * as well as updates the minimum, maximum and total size for aKey's
+   * type.
+   */
+  NS_IMETHOD AddSize(nsIAtom* aKey, PRUint32 aSize) = 0;
+
+  /**
+   * Enumerate data collected for each type and invoke the
+   * reporting function with the data gathered.
+   */
+  NS_IMETHOD Report(nsISizeofReportFunc aFunc, void* aArg) = 0;
+
+  /**
+   * Get the current totals - the number of total objects sized (not
+   * necessarily anything to do with RecordObject's tracking of
+   * objects) and the total number of bytes that those object use. The
+   * counters are not reset by this call (use Init to reset
+   * everything).
+   */
+  NS_IMETHOD GetTotals(PRUint32* aTotalCountResult,
+                       PRUint32* aTotalSizeResult) = 0;
+};
+
+extern NS_COM nsresult
+NS_NewSizeOfHandler(nsISizeOfHandler** aInstancePtrResult);
+
+#endif /* nsISizeofHandler_h___ */

mozilla/xpcom/ds/nsISupportsArray.idl

@@ -0,0 +1,104 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+#include "nsISupports.idl"
+#include "nsICollection.idl"
+
+native nsISupportsArrayEnumFunc(nsISupportsArrayEnumFunc);
+
+%{C++
+
+class nsIBidirectionalEnumerator;
+ 
+#define NS_SUPPORTSARRAY_CID                         \
+{ /* bda17d50-0d6b-11d3-9331-00104ba0fd40 */         \
+    0xbda17d50,                                      \
+    0x0d6b,                                          \
+    0x11d3,                                          \
+    {0x93, 0x31, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
+}
+#define NS_SUPPORTSARRAY_PROGID "component://netscape/supports-array"
+#define NS_SUPPORTSARRAY_CLASSNAME "Supports Array"
+ 
+// Enumerator callback function. Return PR_FALSE to stop
+typedef PRBool (*nsISupportsArrayEnumFunc)(nsISupports* aElement, void *aData);
+ 
+%}
+
+[scriptable, uuid(791eafa0-b9e6-11d1-8031-006008159b5a)]
+interface nsISupportsArray : nsICollection {
+
+  [notxpcom] boolean Equals([const] in nsISupportsArray other);
+  
+  [notxpcom] nsISupports ElementAt(in unsigned long aIndex);
+  
+  [notxpcom] long IndexOf([const] in nsISupports aPossibleElement);
+  [notxpcom] long IndexOfStartingAt([const] in nsISupports aPossibleElement,
+                                    in unsigned long aStartIndex);
+  [notxpcom] long LastIndexOf([const] in nsISupports aPossibleElement);
+  
+  // xpcom-compatible versions
+  long GetIndexOf(in nsISupports aPossibleElement);
+  long GetIndexOfStartingAt(in nsISupports aPossibleElement,
+                            in unsigned long aStartIndex);
+  long GetLastIndexOf(in nsISupports aPossibleElement);  
+  
+  [notxpcom] boolean InsertElementAt(in nsISupports aElement,
+                                     in unsigned long aIndex);
+  [notxpcom] boolean ReplaceElementAt(in nsISupports aElement,
+                                      in unsigned long aIndex);
+
+  [notxpcom] boolean RemoveElementAt(in unsigned long aIndex);
+  [notxpcom] boolean RemoveLastElement([const] in nsISupports aElement);
+  
+  // xpcom-compatible versions
+  void DeleteLastElement(in nsISupports aElement);
+  void DeleteElementAt(in unsigned long aIndex);
+  
+  [notxpcom] boolean AppendElements(in nsISupportsArray aElements);
+  
+  void Compact();
+  
+  [notxpcom, noscript]
+      boolean EnumerateForwards(in nsISupportsArrayEnumFunc aFunc,
+                                in voidStar aData);
+  [notxpcom, noscript]
+      boolean EnumerateBackwards(in nsISupportsArrayEnumFunc aFunc,
+                                 in voidStar aData);
+%{C++
+private:
+//  NS_IMETHOD_(nsISupportsArray&) operator=(const nsISupportsArray& other) = 0;
+  NS_IMETHOD_(PRBool) operator==(const nsISupportsArray& other) = 0;
+  NS_IMETHOD_(nsISupports*)  operator[](PRUint32 aIndex) = 0;
+%}
+};
+
+%{C++
+
+// Construct and return a default implementation of nsISupportsArray:
+extern NS_COM nsresult
+NS_NewISupportsArray(nsISupportsArray** aInstancePtrResult);
+
+// Construct and return a default implementation of an enumerator for nsISupportsArrays:
+extern NS_COM nsresult
+NS_NewISupportsArrayEnumerator(nsISupportsArray* array,
+                               nsIBidirectionalEnumerator* *aInstancePtrResult);
+
+
+%}

mozilla/xpcom/ds/nsISupportsPrimitives.idl

@@ -0,0 +1,263 @@
+/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/* nsISupports wrappers for single primitive pieces of data. */
+
+#include "nsISupports.idl"
+
+/**
+ * These first three are pointer types and do data copying
+ * using the nsIAllocator. Be careful!
+ */ 
+
+[scriptable, uuid(d18290a0-4a1c-11d3-9890-006008962422)]
+interface nsISupportsID : nsISupports
+{
+    attribute nsIDPtr data;
+    string toString();
+};
+
+[scriptable, uuid(d65ff270-4a1c-11d3-9890-006008962422)]
+interface nsISupportsString : nsISupports
+{
+    attribute string data;
+    string toString();
+};
+
+[scriptable, uuid(d79dc970-4a1c-11d3-9890-006008962422)]
+interface nsISupportsWString : nsISupports
+{
+    attribute wstring data;
+    wstring toString();
+};
+
+/**
+ * The rest are truly primitive and are passed by value
+ */ 
+
+[scriptable, uuid(ddc3b490-4a1c-11d3-9890-006008962422)]
+interface nsISupportsPRBool : nsISupports
+{
+    attribute PRBool data;
+    string toString();
+};
+
+[scriptable, uuid(dec2e4e0-4a1c-11d3-9890-006008962422)]
+interface nsISupportsPRUint8 : nsISupports
+{
+    attribute PRUint8 data;
+    string toString();
+};
+
+[scriptable, uuid(dfacb090-4a1c-11d3-9890-006008962422)]
+interface nsISupportsPRUint16 : nsISupports
+{
+    attribute PRUint16 data;
+    string toString();
+};
+
+[scriptable, uuid(e01dc470-4a1c-11d3-9890-006008962422)]
+interface nsISupportsPRUint32 : nsISupports
+{
+    attribute PRUint32 data;
+    string toString();
+};
+
+[scriptable, uuid(e13567c0-4a1c-11d3-9890-006008962422)]
+interface nsISupportsPRUint64 : nsISupports
+{
+    attribute PRUint64 data;
+    string toString();
+};
+
+[scriptable, uuid(e2563630-4a1c-11d3-9890-006008962422)]
+interface nsISupportsPRTime : nsISupports
+{
+    attribute PRTime data;
+    string toString();
+};
+
+[scriptable, uuid(e2b05e40-4a1c-11d3-9890-006008962422)]
+interface nsISupportsChar : nsISupports
+{
+    attribute char data;
+    string toString();
+};
+
+[scriptable, uuid(e30d94b0-4a1c-11d3-9890-006008962422)]
+interface nsISupportsPRInt16 : nsISupports
+{
+    attribute PRInt16 data;
+    string toString();
+};
+
+[scriptable, uuid(e36c5250-4a1c-11d3-9890-006008962422)]
+interface nsISupportsPRInt32 : nsISupports
+{
+    attribute PRInt32 data;
+    string toString();
+};
+
+[scriptable, uuid(e3cb0ff0-4a1c-11d3-9890-006008962422)]
+interface nsISupportsPRInt64 : nsISupports
+{
+    attribute PRInt64 data;
+    string toString();
+};
+
+[scriptable, uuid(abeaa390-4ac0-11d3-baea-00805f8a5dd7)]
+interface nsISupportsFloat : nsISupports
+{
+    attribute float data;
+    string toString();
+};
+
+[scriptable, uuid(b32523a0-4ac0-11d3-baea-00805f8a5dd7)]
+interface nsISupportsDouble : nsISupports
+{
+    attribute double data;
+    string toString();
+};
+
+[scriptable, uuid(464484f0-568d-11d3-baf8-00805f8a5dd7)]
+interface nsISupportsVoid : nsISupports
+{
+    /*
+    *  This would be: "[noscript] attribute voidStar data;" but for...
+    *  http://bugzilla.mozilla.org/show_bug.cgi?id=11454
+    */
+    [noscript] void GetData([shared,retval] out voidStar aData);
+    [noscript] void SetData(in voidStar aData);
+    string toString();
+};
+
+/////////////////////////////////////////////////////////////////////////
+
+%{C++
+// {ACF8DC40-4A25-11d3-9890-006008962422}
+#define NS_SUPPORTS_ID_CID \
+{ 0xacf8dc40, 0x4a25, 0x11d3, \
+    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
+#define NS_SUPPORTS_ID_PROGID "component://netscape/supports-id"
+#define NS_SUPPORTS_ID_CLASSNAME "Supports ID"
+
+// {ACF8DC41-4A25-11d3-9890-006008962422}
+#define NS_SUPPORTS_STRING_CID \
+{ 0xacf8dc41, 0x4a25, 0x11d3, \
+    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
+#define NS_SUPPORTS_STRING_PROGID "component://netscape/supports-string"
+#define NS_SUPPORTS_STRING_CLASSNAME "Supports String"
+
+// {ACF8DC42-4A25-11d3-9890-006008962422}
+#define NS_SUPPORTS_WSTRING_CID \
+{ 0xacf8dc42, 0x4a25, 0x11d3, \
+    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
+#define NS_SUPPORTS_WSTRING_PROGID "component://netscape/supports-wstring"
+#define NS_SUPPORTS_WSTRING_CLASSNAME "Supports WString"
+
+// {ACF8DC43-4A25-11d3-9890-006008962422}
+#define NS_SUPPORTS_PRBOOL_CID \
+{ 0xacf8dc43, 0x4a25, 0x11d3, \
+    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
+#define NS_SUPPORTS_PRBOOL_PROGID "component://netscape/supports-PRBool"
+#define NS_SUPPORTS_PRBOOL_CLASSNAME "Supports PRBool"
+
+// {ACF8DC44-4A25-11d3-9890-006008962422}
+#define NS_SUPPORTS_PRUINT8_CID \
+{ 0xacf8dc44, 0x4a25, 0x11d3, \
+    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
+#define NS_SUPPORTS_PRUINT8_PROGID "component://netscape/supports-PRUint8"
+#define NS_SUPPORTS_PRUINT8_CLASSNAME "Supports PRUint8"
+
+// {ACF8DC46-4A25-11d3-9890-006008962422}
+#define NS_SUPPORTS_PRUINT16_CID \
+{ 0xacf8dc46, 0x4a25, 0x11d3, \
+    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
+#define NS_SUPPORTS_PRUINT16_PROGID "component://netscape/supports-PRUint16"
+#define NS_SUPPORTS_PRUINT16_CLASSNAME "Supports PRUint16"
+
+// {ACF8DC47-4A25-11d3-9890-006008962422}
+#define NS_SUPPORTS_PRUINT32_CID \
+{ 0xacf8dc47, 0x4a25, 0x11d3, \
+    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
+#define NS_SUPPORTS_PRUINT32_PROGID "component://netscape/supports-PRUint32"
+#define NS_SUPPORTS_PRUINT32_CLASSNAME "Supports PRUint32"
+
+// {ACF8DC48-4A25-11d3-9890-006008962422}
+#define NS_SUPPORTS_PRUINT64_CID \
+{ 0xacf8dc48, 0x4a25, 0x11d3, \
+    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
+#define NS_SUPPORTS_PRUINT64_PROGID "component://netscape/supports-PRUint64"
+#define NS_SUPPORTS_PRUINT64_CLASSNAME "Supports PRUint64"
+
+// {ACF8DC49-4A25-11d3-9890-006008962422}
+#define NS_SUPPORTS_PRTIME_CID \
+{ 0xacf8dc49, 0x4a25, 0x11d3, \
+    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
+#define NS_SUPPORTS_PRTIME_PROGID "component://netscape/supports-PRTime"
+#define NS_SUPPORTS_PRTIME_CLASSNAME "Supports PRTime"
+
+// {ACF8DC4A-4A25-11d3-9890-006008962422}
+#define NS_SUPPORTS_CHAR_CID \
+{ 0xacf8dc4a, 0x4a25, 0x11d3, \
+    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
+#define NS_SUPPORTS_CHAR_PROGID "component://netscape/supports-char"
+#define NS_SUPPORTS_CHAR_CLASSNAME "Supports Char"
+
+// {ACF8DC4B-4A25-11d3-9890-006008962422}
+#define NS_SUPPORTS_PRINT16_CID \
+{ 0xacf8dc4b, 0x4a25, 0x11d3, \
+    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
+#define NS_SUPPORTS_PRINT16_PROGID "component://netscape/supports-PRInt16"
+#define NS_SUPPORTS_PRINT16_CLASSNAME "Supports PRInt16"
+
+// {ACF8DC4C-4A25-11d3-9890-006008962422}
+#define NS_SUPPORTS_PRINT32_CID \
+{ 0xacf8dc4c, 0x4a25, 0x11d3, \
+    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
+#define NS_SUPPORTS_PRINT32_PROGID "component://netscape/supports-PRInt32"
+#define NS_SUPPORTS_PRINT32_CLASSNAME "Supports PRInt32"
+
+// {ACF8DC4D-4A25-11d3-9890-006008962422}
+#define NS_SUPPORTS_PRINT64_CID \
+{ 0xacf8dc4d, 0x4a25, 0x11d3, \
+    { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }
+#define NS_SUPPORTS_PRINT64_PROGID "component://netscape/supports-PRInt64"
+#define NS_SUPPORTS_PRINT64_CLASSNAME "Supports PRInt64"
+
+// {CBF86870-4AC0-11d3-BAEA-00805F8A5DD7}
+#define NS_SUPPORTS_FLOAT_CID \
+{ 0xcbf86870, 0x4ac0, 0x11d3, \
+    { 0xba, 0xea, 0x0, 0x80, 0x5f, 0x8a, 0x5d, 0xd7 } }
+#define NS_SUPPORTS_FLOAT_PROGID "component://netscape/supports-float"
+#define NS_SUPPORTS_FLOAT_CLASSNAME "Supports float"
+
+// {CBF86871-4AC0-11d3-BAEA-00805F8A5DD7}
+#define NS_SUPPORTS_DOUBLE_CID \
+{ 0xcbf86871, 0x4ac0, 0x11d3, \
+    { 0xba, 0xea, 0x0, 0x80, 0x5f, 0x8a, 0x5d, 0xd7 } }
+#define NS_SUPPORTS_DOUBLE_PROGID "component://netscape/supports-double"
+#define NS_SUPPORTS_DOUBLE_CLASSNAME "Supports double"
+
+// {AF10F3E0-568D-11d3-BAF8-00805F8A5DD7}
+#define NS_SUPPORTS_VOID_CID \
+{ 0xaf10f3e0, 0x568d, 0x11d3, \
+    { 0xba, 0xf8, 0x0, 0x80, 0x5f, 0x8a, 0x5d, 0xd7 } }
+#define NS_SUPPORTS_VOID_PROGID "component://netscape/supports-void"
+#define NS_SUPPORTS_VOID_CLASSNAME "Supports void"
+%}

mozilla/xpcom/ds/nsIUnicharBuffer.h

@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsIUnicharBuffer_h___
+#define nsIUnicharBuffer_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+class nsIUnicharInputStream;
+
+#define NS_IUNICHARBUFFER_IID \
+{ 0x14cf6970, 0x93b5, 0x11d1, \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+
+/// Interface to a buffer that holds unicode characters
+class nsIUnicharBuffer : public nsISupports {
+public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IUNICHARBUFFER_IID);
+
+  NS_IMETHOD Init(PRUint32 aBufferSize) = 0;
+  NS_IMETHOD_(PRInt32) GetLength() const = 0;
+  NS_IMETHOD_(PRInt32) GetBufferSize() const = 0;
+  NS_IMETHOD_(PRUnichar*) GetBuffer() const = 0;
+  NS_IMETHOD_(PRBool) Grow(PRInt32 aNewSize) = 0;
+  NS_IMETHOD_(PRInt32) Fill(nsresult* aErrorCode, nsIUnicharInputStream* aStream,
+                            PRInt32 aKeep) = 0;
+};
+
+/// Factory method for nsIUnicharBuffer.
+extern NS_COM nsresult
+NS_NewUnicharBuffer(nsIUnicharBuffer** aInstancePtrResult,
+                    nsISupports* aOuter,
+                    PRUint32 aBufferSize = 0);
+
+#define NS_UNICHARBUFFER_CID                         \
+{ /* c81fd8f0-0d6b-11d3-9331-00104ba0fd40 */         \
+    0xc81fd8f0,                                      \
+    0x0d6b,                                          \
+    0x11d3,                                          \
+    {0x93, 0x31, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
+}
+
+#endif /* nsIUnicharBuffer_h___ */

mozilla/xpcom/ds/nsInt64.h

@@ -0,0 +1,340 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsInt64_h__
+#define nsInt64_h__
+
+#include "prlong.h"
+#include "nscore.h"
+
+/**
+ * This class encapsulates full 64-bit integer functionality and
+ * provides simple arithmetic and conversion operations.
+ */
+
+// If you ever decide that you need to add a non-inline method to this
+// class, be sure to change the class declaration to "class NS_BASE
+// nsInt64".
+
+class nsInt64
+{
+private:
+    PRInt64 mValue;
+
+public:
+    /**
+     * Construct a new 64-bit integer.
+     */
+    nsInt64(void) : mValue(LL_ZERO) {
+    }
+
+    /**
+     * Construct a new 64-bit integer from a 32-bit signed integer
+     */
+    nsInt64(const PRInt32 aInt32) {
+        LL_I2L(mValue, aInt32);
+    }
+
+    /**
+     * Construct a new 64-bit integer from a 32-bit unsigned integer
+     */
+    nsInt64(const PRUint32 aUint32) {
+        LL_UI2L(mValue, aUint32);
+    }
+
+    /**
+     * Construct a new 64-bit integer from a floating point value.
+     */
+    nsInt64(const PRFloat64 aFloat64) {
+        LL_D2L(mValue, aFloat64);
+    }
+
+    /**
+     * Construct a new 64-bit integer from a native 64-bit integer
+     */
+    nsInt64(const PRInt64 aInt64) : mValue(aInt64) {
+    }
+
+    /**
+     * Construct a new 64-bit integer from another 64-bit integer
+     */
+    nsInt64(const nsInt64& aObject) : mValue(aObject.mValue) {
+    }
+
+    // ~nsInt64(void) -- XXX destructor unnecessary
+
+    /**
+     * Assign a 64-bit integer to another 64-bit integer
+     */
+    const nsInt64& operator =(const nsInt64& aObject) {
+        mValue = aObject.mValue;
+        return *this;
+    }
+
+    /**
+     * Convert a 64-bit integer to a signed 32-bit value
+     */
+    operator PRInt32(void) const {
+        PRInt32 result;
+        LL_L2I(result, mValue);
+        return result;
+    }
+
+    /**
+     * Convert a 64-bit integer to an unsigned 32-bit value
+     */
+    operator PRUint32(void) const {
+        PRUint32 result;
+        LL_L2UI(result, mValue);
+        return result;
+    }
+
+    /**
+     * Convert a 64-bit integer to a floating point value
+     */
+    operator PRFloat64(void) const {
+        PRFloat64 result;
+        LL_L2D(result, mValue);
+        return result;
+    }
+
+    /**
+     * Convert a 64-bit integer to a native 64-bit integer.
+     */
+    operator PRInt64(void) const {
+        return mValue;
+    }
+
+    /**
+     * Perform unary negation on a 64-bit integer.
+     */
+    const nsInt64 operator -(void) {
+        nsInt64 result;
+        LL_NEG(result.mValue, mValue);
+        return result;
+    }
+
+    // Arithmetic operators
+    friend const nsInt64 operator +(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend const nsInt64 operator -(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend const nsInt64 operator *(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend const nsInt64 operator /(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend const nsInt64 operator %(const nsInt64& aObject1, const nsInt64& aObject2);
+
+    /**
+     * Increment a 64-bit integer by a 64-bit integer amount.
+     */
+    nsInt64& operator +=(const nsInt64& aObject) {
+        LL_ADD(mValue, mValue, aObject.mValue);
+        return *this;
+    }
+
+    /**
+     * Decrement a 64-bit integer by a 64-bit integer amount.
+     */
+    nsInt64& operator -=(const nsInt64& aObject) {
+        LL_SUB(mValue, mValue, aObject.mValue);
+        return *this;
+    }
+
+    /**
+     * Multiply a 64-bit integer by a 64-bit integer amount.
+     */
+    nsInt64& operator *=(const nsInt64& aObject) {
+        LL_MUL(mValue, mValue, aObject.mValue);
+        return *this;
+    }
+
+    /**
+     * Divide a 64-bit integer by a 64-bit integer amount.
+     */
+    nsInt64& operator /=(const nsInt64& aObject) {
+        LL_DIV(mValue, mValue, aObject.mValue);
+        return *this;
+    }
+
+    /**
+     * Compute the modulus of a 64-bit integer to a 64-bit value.
+     */
+    nsInt64& operator %=(const nsInt64& aObject) {
+        LL_MOD(mValue, mValue, aObject.mValue);
+        return *this;
+    }
+
+    // Comparison operators
+    friend PRBool operator ==(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend PRBool operator !=(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend PRBool operator >(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend PRBool operator >=(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend PRBool operator <(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend PRBool operator <=(const nsInt64& aObject1, const nsInt64& aObject2);
+
+    // Bitwise operators
+    friend const nsInt64 operator &(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend const nsInt64 operator |(const nsInt64& aObject1, const nsInt64& aObject2);
+    friend const nsInt64 operator ^(const nsInt64& aObject1, const nsInt64& aObject2);
+
+    /**
+     * Compute the bitwise NOT of a 64-bit integer
+     */
+    const nsInt64 operator ~(void) {
+        nsInt64 result;
+        LL_NOT(result.mValue, mValue);
+        return result;
+    }
+
+    /**
+     * Compute the bitwise AND with another 64-bit integer
+     */
+    nsInt64& operator &=(const nsInt64& aObject) {
+        LL_AND(mValue, mValue, aObject.mValue);
+        return *this;
+    }
+
+    /**
+     * Compute the bitwise OR with another 64-bit integer
+     */
+    nsInt64& operator |=(const nsInt64& aObject) {
+        LL_OR(mValue, mValue, aObject.mValue);
+        return *this;
+    }
+
+    /**
+     * Compute the bitwise XOR with another 64-bit integer
+     */
+    nsInt64& operator ^=(const nsInt64& aObject) {
+        LL_XOR(mValue, mValue, aObject.mValue);
+        return *this;
+    }
+};
+
+
+/**
+ * Add two 64-bit integers.
+ */
+inline const nsInt64
+operator +(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return nsInt64(aObject1) += aObject2;
+}
+
+/**
+ * Subtract one 64-bit integer from another.
+ */
+inline const nsInt64
+operator -(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return nsInt64(aObject1) -= aObject2;
+}
+
+/**
+ * Multiply two 64-bit integers
+ */
+inline const nsInt64
+operator *(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return nsInt64(aObject1) *= aObject2;
+}
+
+/**
+ * Divide one 64-bit integer by another
+ */
+inline const nsInt64
+operator /(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return nsInt64(aObject1) /= aObject2;
+}
+
+/**
+ * Compute the modulus of two 64-bit integers
+ */
+inline const nsInt64
+operator %(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return nsInt64(aObject1) %= aObject2;
+}
+
+/**
+ * Determine if two 64-bit integers are equal
+ */
+inline PRBool
+operator ==(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return LL_EQ(aObject1.mValue, aObject2.mValue);
+}
+
+/**
+ * Determine if two 64-bit integers are not equal
+ */
+inline PRBool
+operator !=(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return LL_NE(aObject1.mValue, aObject2.mValue);
+}
+
+/**
+ * Determine if one 64-bit integer is strictly greater than another, using signed values
+ */
+inline PRBool
+operator >(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return LL_CMP(aObject1.mValue, >, aObject2.mValue);
+}
+
+/**
+ * Determine if one 64-bit integer is greater than or equal to another, using signed values
+ */
+inline PRBool
+operator >=(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return LL_CMP(aObject1.mValue, >=, aObject2.mValue);
+}
+
+/**
+ * Determine if one 64-bit integer is strictly less than another, using signed values
+ */
+inline PRBool 
+operator <(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return LL_CMP(aObject1.mValue, <, aObject2.mValue);
+}
+
+/**
+ * Determine if one 64-bit integers is less than or equal to another, using signed values
+ */
+inline PRBool
+operator <=(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return LL_CMP(aObject1.mValue, <=, aObject2.mValue);
+}
+
+/**
+ * Perform a bitwise AND of two 64-bit integers
+ */
+inline const nsInt64
+operator &(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return nsInt64(aObject1) &= aObject2;
+}
+
+/**
+ * Perform a bitwise OR of two 64-bit integers
+ */
+inline const nsInt64
+operator |(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return nsInt64(aObject1) |= aObject2;
+}
+
+/**
+ * Perform a bitwise XOR of two 64-bit integers
+ */
+inline const nsInt64
+operator ^(const nsInt64& aObject1, const nsInt64& aObject2) {
+    return nsInt64(aObject1) ^= aObject2;
+}
+
+
+#endif // nsInt64_h__

mozilla/xpcom/ds/nsObserver.cpp

@@ -0,0 +1,92 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#define NS_IMPL_IDS
+#include "pratom.h"
+#include "nsIFactory.h"
+#include "nsIServiceManager.h"
+#include "nsRepository.h"
+#include "nsIObserver.h"
+#include "nsObserver.h"
+#include "nsString.h"
+
+static NS_DEFINE_CID(kObserverCID, NS_OBSERVER_CID);
+
+////////////////////////////////////////////////////////////////////////////////
+// nsObserver Implementation
+
+
+NS_IMPL_AGGREGATED(nsObserver)
+
+NS_COM nsresult NS_NewObserver(nsIObserver** anObserver, nsISupports* outer)
+{
+    return nsObserver::Create(outer, NS_GET_IID(nsIObserver), (void**)anObserver);
+}
+
+NS_METHOD
+nsObserver::Create(nsISupports* outer, const nsIID& aIID, void* *anObserver)
+{
+    NS_ENSURE_ARG_POINTER(anObserver);
+	 NS_ENSURE_PROPER_AGGREGATION(outer, aIID);
+
+    nsObserver* it = new nsObserver(outer);
+    if (it == NULL)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    nsresult rv = it->AggregatedQueryInterface(aIID, anObserver);
+    if (NS_FAILED(rv)) {
+        delete it;
+        return rv;
+    }
+    return rv;
+}
+
+nsObserver::nsObserver(nsISupports* outer)
+{
+    NS_INIT_AGGREGATED(outer);
+}
+
+nsObserver::~nsObserver(void)
+{
+}
+
+NS_IMETHODIMP
+nsObserver::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr)
+{
+    NS_ENSURE_ARG_POINTER(aInstancePtr);
+
+    if (aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID()))
+	     *aInstancePtr = GetInner();
+	 else if(aIID.Equals(nsIObserver::GetIID()))
+	     *aInstancePtr = NS_STATIC_CAST(nsIObserver*, this);
+	 else {
+	     *aInstancePtr = nsnull;
+		  return NS_NOINTERFACE;
+	 }
+
+	 NS_ADDREF((nsISupports*)*aInstancePtr);
+	 return NS_OK;
+}
+
+NS_IMETHODIMP
+nsObserver::Observe( nsISupports *, const PRUnichar *, const PRUnichar * ) {
+    nsresult rv = NS_OK;
+    return rv;
+}
+
+////////////////////////////////////////////////////////////////////////////////

mozilla/xpcom/ds/nsObserver.h

@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL. You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All Rights
+ * Reserved.
+ */
+
+#ifndef nsObserver_h___
+#define nsObserver_h___
+
+#include "nsIObserver.h"
+#include "nsAgg.h"
+
+// {DB242E03-E4D9-11d2-9DDE-000064657374}
+#define NS_OBSERVER_CID \
+    { 0xdb242e03, 0xe4d9, 0x11d2, { 0x9d, 0xde, 0x0, 0x0, 0x64, 0x65, 0x73, 0x74 } }
+
+class nsObserver : public nsIObserver {
+public:
+
+    NS_DEFINE_STATIC_CID_ACCESSOR( NS_OBSERVER_CID )
+ 
+    NS_DECL_NSIOBSERVER
+ 
+    nsObserver(nsISupports* outer);
+    virtual ~nsObserver(void);
+
+    static NS_METHOD
+    Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr);
+
+    NS_DECL_AGGREGATED
+
+private:
+
+};
+
+extern NS_COM nsresult NS_NewObserver(nsIObserver** anObserver, nsISupports* outer = NULL);
+
+#endif /* nsObserver_h___ */