put this here

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

mozilla/htmlparser/src/nsAVLTree.cpp

@@ -1,617 +0,0 @@
-/* -*- 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

@@ -1,74 +0,0 @@
-/* -*- 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/mailnews/base/src/nsMsgMailSession.cpp

@@ -0,0 +1,298 @@
+/* -*- 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.
+ */
+
+#include "msgCore.h" // for pre-compiled headers
+//#include "nsIMsgIdentity.h"
+#include "nsIMsgAccountManager.h"
+//#include "nsIPop3IncomingServer.h"
+#include "nsMsgMailSession.h"
+#include "nsMsgLocalCID.h"
+#include "nsMsgBaseCID.h"
+#include "nsCOMPtr.h"
+#include "nsMsgFolderCache.h"
+#include "nsIFileLocator.h"
+#include "nsFileLocations.h"
+#include "nsIMsgStatusFeedback.h"
+
+NS_IMPL_ISUPPORTS(nsMsgMailSession, nsCOMTypeInfo<nsIMsgMailSession>::GetIID());
+
+static NS_DEFINE_CID(kMsgAccountManagerCID, NS_MSGACCOUNTMANAGER_CID);
+static NS_DEFINE_CID(kMsgFolderCacheCID, NS_MSGFOLDERCACHE_CID);
+static NS_DEFINE_IID(kIFileLocatorIID,      NS_IFILELOCATOR_IID);
+static NS_DEFINE_CID(kFileLocatorCID,       NS_FILELOCATOR_CID);
+ 
+//static NS_DEFINE_CID(kMsgIdentityCID, NS_MSGIDENTITY_CID);
+//static NS_DEFINE_CID(kPop3IncomingServerCID, NS_POP3INCOMINGSERVER_CID);
+//static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
+    
+
+nsMsgMailSession::nsMsgMailSession():
+  mRefCnt(0),
+  m_accountManager(0),
+  m_msgFolderCache(0)
+{
+
+	NS_INIT_REFCNT();
+}
+
+
+nsMsgMailSession::~nsMsgMailSession()
+{
+	Shutdown();
+}
+
+nsresult nsMsgMailSession::Init()
+{
+	nsresult rv = NS_NewISupportsArray(getter_AddRefs(mListeners));
+
+	return rv;
+
+}
+
+nsresult nsMsgMailSession::Shutdown()
+{
+  if(m_accountManager)
+  {
+	  if (m_msgFolderCache)
+		m_accountManager->WriteToFolderCache(m_msgFolderCache);
+	  m_accountManager->CloseCachedConnections();
+	  m_accountManager->UnloadAccounts();
+  }
+
+  NS_IF_RELEASE(m_accountManager);
+
+  NS_IF_RELEASE(m_msgFolderCache);
+
+  return NS_OK;
+}
+
+// nsIMsgMailSession
+nsresult nsMsgMailSession::GetCurrentIdentity(nsIMsgIdentity ** aIdentity)
+{
+  nsresult rv;
+
+  nsCOMPtr<nsIMsgAccountManager> accountManager;
+  rv = GetAccountManager(getter_AddRefs(accountManager));
+  if (NS_FAILED(rv)) return rv;
+
+  nsCOMPtr<nsIMsgAccount> defaultAccount;
+  rv = accountManager->GetDefaultAccount(getter_AddRefs(defaultAccount));
+  if (NS_FAILED(rv)) return rv;
+  
+  rv = defaultAccount->GetDefaultIdentity(aIdentity);
+  if (NS_SUCCEEDED(rv))
+  	NS_ADDREF(*aIdentity);
+  
+  return rv;
+}
+
+nsresult nsMsgMailSession::GetCurrentServer(nsIMsgIncomingServer ** aServer)
+{
+  nsresult rv=NS_ERROR_UNEXPECTED;
+
+  nsCOMPtr<nsIMsgAccountManager> accountManager;
+  rv = GetAccountManager(getter_AddRefs(accountManager));
+  if (NS_FAILED(rv)) return rv;
+  
+  nsCOMPtr<nsIMsgAccount> defaultAccount;
+  rv = accountManager->GetDefaultAccount(getter_AddRefs(defaultAccount));
+  if (NS_FAILED(rv)) return rv;
+
+  //if successful aServer will be addref'd by GetIncomingServer
+  rv = defaultAccount->GetIncomingServer(aServer);
+
+  return rv;
+}
+
+nsresult nsMsgMailSession::GetAccountManager(nsIMsgAccountManager* *aAM)
+{
+  NS_ENSURE_ARG_POINTER(aAM);
+
+  nsresult rv;
+  
+  NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, kMsgAccountManagerCID, &rv);
+  if (NS_FAILED(rv)) return rv;
+  accountManager->LoadAccounts();
+    
+  *aAM = accountManager;
+  NS_IF_ADDREF(*aAM);
+  return NS_OK;
+}
+
+nsresult nsMsgMailSession::GetFolderCache(nsIMsgFolderCache* *aFolderCache)
+{
+  if (!aFolderCache) return NS_ERROR_NULL_POINTER;
+
+  nsresult rv = NS_OK;
+
+  if (!m_msgFolderCache)
+  {
+    rv = nsComponentManager::CreateInstance(kMsgFolderCacheCID,
+                                            NULL,
+                                            nsCOMTypeInfo<nsIMsgFolderCache>::GetIID(),
+                                            (void **)&m_msgFolderCache);
+    if (NS_FAILED(rv))
+		return rv;
+
+    nsCOMPtr <nsIFileSpec> cacheFile;
+    NS_WITH_SERVICE(nsIFileLocator, locator, kFileLocatorCID, &rv);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = locator->GetFileLocation(nsSpecialFileSpec::App_MessengerFolderCache50, getter_AddRefs(cacheFile));
+    if (NS_FAILED(rv)) return rv;
+
+    m_msgFolderCache->Init(cacheFile);
+
+  }
+
+  *aFolderCache = m_msgFolderCache;
+  NS_IF_ADDREF(*aFolderCache);
+  return rv;
+}
+
+nsresult nsMsgMailSession::GetTemporaryMsgStatusFeedback(nsIMsgStatusFeedback* *aMsgStatusFeedback)
+{
+  if (!aMsgStatusFeedback) return NS_ERROR_NULL_POINTER;
+  
+  *aMsgStatusFeedback = m_temporaryMsgStatusFeedback;
+  NS_IF_ADDREF(*aMsgStatusFeedback);
+  return NS_OK;
+}
+
+
+nsresult nsMsgMailSession::SetTemporaryMsgStatusFeedback(nsIMsgStatusFeedback* aMsgStatusFeedback)
+{
+  m_temporaryMsgStatusFeedback = do_QueryInterface(aMsgStatusFeedback);
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP nsMsgMailSession::AddFolderListener(nsIFolderListener * listener)
+{
+  mListeners->AppendElement(listener);
+  return NS_OK;
+
+}
+
+NS_IMETHODIMP nsMsgMailSession::RemoveFolderListener(nsIFolderListener * listener)
+{
+  mListeners->RemoveElement(listener);
+  return NS_OK;
+
+}
+
+NS_IMETHODIMP
+nsMsgMailSession::NotifyFolderItemPropertyChanged(nsISupports *item,
+                                                  const char *property,
+                                                  const char* oldValue,
+                                                  const char* newValue)
+{
+	nsresult rv;
+	PRUint32 count;
+	rv = mListeners->Count(&count);
+	if (NS_FAILED(rv)) return rv;
+
+	
+	for(PRUint32 i = 0; i < count; i++)
+	{
+		nsCOMPtr<nsIFolderListener> listener = getter_AddRefs((nsIFolderListener*)mListeners->ElementAt(i));
+		listener->OnItemPropertyChanged(item, property, oldValue, newValue);
+	}
+
+	return NS_OK;
+
+}
+
+NS_IMETHODIMP
+nsMsgMailSession::NotifyFolderItemPropertyFlagChanged(nsISupports *item,
+                                                      const char *property,
+                                                      PRUint32 oldValue,
+                                                      PRUint32 newValue)
+{
+	nsresult rv;
+	PRUint32 count;
+	rv = mListeners->Count(&count);
+	if (NS_FAILED(rv)) return rv;
+
+	
+	for(PRUint32 i = 0; i < count; i++)
+	{
+		nsCOMPtr<nsIFolderListener> listener = getter_AddRefs((nsIFolderListener*)mListeners->ElementAt(i));
+		listener->OnItemPropertyFlagChanged(item, property, oldValue, newValue);
+	}
+
+	return NS_OK;
+
+}
+
+NS_IMETHODIMP nsMsgMailSession::NotifyFolderItemAdded(nsIFolder *folder, nsISupports *item)
+{
+	nsresult rv;
+	PRUint32 count;
+	rv = mListeners->Count(&count);
+	if (NS_FAILED(rv)) return rv;
+
+	
+	for(PRUint32 i = 0; i < count; i++)
+	{
+		nsCOMPtr<nsIFolderListener> listener = getter_AddRefs((nsIFolderListener*)mListeners->ElementAt(i));
+		listener->OnItemAdded(folder, item);
+	}
+
+	return NS_OK;
+
+}
+
+NS_IMETHODIMP nsMsgMailSession::NotifyFolderItemDeleted(nsIFolder *folder, nsISupports *item)
+{
+	nsresult rv;
+	PRUint32 count;
+	rv = mListeners->Count(&count);
+	if (NS_FAILED(rv)) return rv;
+
+	
+	for(PRUint32 i = 0; i < count; i++)
+	{
+		nsCOMPtr<nsIFolderListener> listener = getter_AddRefs((nsIFolderListener*)mListeners->ElementAt(i));
+		listener->OnItemRemoved(folder, item);
+	}
+	return NS_OK;
+
+}
+
+NS_IMETHODIMP  nsMsgMailSession::NotifyFolderLoaded(nsIFolder *folder)
+{
+
+	nsresult rv;
+	PRUint32 count;
+	rv = mListeners->Count(&count);
+	if (NS_FAILED(rv)) return rv;
+
+	
+	for(PRUint32 i = 0; i < count; i++)
+	{
+		nsCOMPtr<nsIFolderListener> listener = getter_AddRefs((nsIFolderListener*)mListeners->ElementAt(i));
+		listener->OnFolderLoaded(folder);
+	}
+	return NS_OK;
+
+
+}
+
+
+

mozilla/mailnews/base/util/MANIFEST

@@ -0,0 +1,35 @@
+# 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.
+#
+# This is a list of local files which get copied to the mozilla:dist:mailnews directory
+#
+
+nsMsgLineBuffer.h
+nsMsgGroupRecord.h
+nsUInt32Array.h
+nsMsgKeySet.h
+nsMsgFolder.h
+nsMsgDBFolder.h
+nsLocalFolderSummarySpec.h
+nsMsgIdentity.h
+nsMsgIncomingServer.h
+nsNewsSummarySpec.h
+nsMsgUtils.h
+nsMessage.h
+nsMsgProtocol.h
+nsMsgTxn.h
+nsMsgMailNewsUrl.h
+nsMsgI18N.h
+

mozilla/mailnews/base/util/Makefile.in

@@ -0,0 +1,75 @@
+#
+# 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		= msgbaseutil
+LIBRARY_NAME	= msgbaseutil
+
+CPPSRCS		= \
+		nsMsgGroupRecord.cpp \
+		nsMsgLineBuffer.cpp \
+		nsMsgFolder.cpp \
+		nsMsgDBFolder.cpp \
+		nsUInt32Array.cpp \
+		nsMsgKeySet.cpp \
+		nsLocalFolderSummarySpec.cpp \
+		nsNewsSummarySpec.cpp \
+		nsMsgIdentity.cpp \
+		nsMsgIncomingServer.cpp \
+		nsMsgUtils.cpp \
+		nsMessage.cpp \
+		nsMsgProtocol.cpp \
+		nsMsgMailNewsUrl.cpp \
+		nsMsgTxn.cpp \
+		nsMsgI18N.cpp \
+		$(NULL)
+
+EXPORTS		= \
+		nsMsgGroupRecord.h \
+		nsMsgLineBuffer.h \
+		nsUInt32Array.h \
+		nsMsgKeySet.h \
+		nsMsgFolder.h \
+		nsMsgDBFolder.h \
+		nsLocalFolderSummarySpec.h \
+		nsNewsSummarySpec.h \
+		nsMsgIdentity.h \
+		nsMsgIncomingServer.h \
+		nsMsgUtils.h \
+		nsMessage.h \
+		nsMsgProtocol.h \
+		nsMsgMailNewsUrl.h \
+		nsMsgTxn.h \
+		nsMsgI18N.h \
+		$(NULL)
+
+EXTRA_DSO_LDOPTS = \
+	-L$(DIST)/bin \
+	-L$(DIST)/lib \
+	-lxpcom \
+	-lrdfutil_s \
+	$(NSPR_LIBS) \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/mailnews/base/util/macbuild/msgUtilPrefix.h

@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
+/* -*- 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
@@ -16,11 +16,6 @@
  * Reserved.
  */
 
-#ifndef nsISimpleEnumerator_h__
-#define nsISimpleEnumerator_h__
 
-// This file is needed to pacify the xpidl-generated header files.
-#include "nsIEnumerator.h"
-
-#endif // nsISimpleEnumerator_h__
 
+#include "MacPrefix.h"

mozilla/mailnews/base/util/macbuild/msgUtilPrefixDebug.h

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- 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
@@ -16,12 +16,6 @@
  * Reserved.
  */
 
-#include "nsIEnumerator.idl"
 
-interface nsIFile;
 
-[scriptable, uuid(D7BEA930-59D7-11d3-8C46-00609792278C)]
-interface nsIDirectoryEnumerator : nsISimpleEnumerator
-{
-    void Init(in nsIFile parent, in boolean resolveSymlinks);
-};
+#include "MacPrefix_debug.h"

mozilla/mailnews/base/util/makefile.win

@@ -0,0 +1,87 @@
+#!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= msgbsutl
+
+include <$(DEPTH)\config\config.mak>
+
+################################################################################
+## exports
+
+EXPORTS=                \
+	nsMsgLineBuffer.h	\
+	nsMsgGroupRecord.h  \
+	nsUInt32Array.h	\
+	nsMsgKeySet.h			\
+	nsMsgFolder.h			\
+	nsMsgDBFolder.h			\
+	nsLocalFolderSummarySpec.h	\
+	nsMsgIdentity.h			\
+	nsMsgIncomingServer.h	\
+	nsNewsSummarySpec.h \
+	nsMsgUtils.h \
+	nsMessage.h \
+	nsMsgProtocol.h \
+	nsMsgMailNewsUrl.h \
+	nsMsgTxn.h \
+	nsMsgI18N.h \
+	$(NULL)
+
+################################################################################
+## library
+
+LIBNAME = .\$(OBJDIR)\msgbsutl
+DLL = $(LIBNAME).dll
+
+DEFINES=-D_IMPL_NS_MSG_BASE
+
+LCFLAGS =		   \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+CPP_OBJS=                               \
+	.\$(OBJDIR)\nsMsgGroupRecord.obj    \
+	.\$(OBJDIR)\nsMsgLineBuffer.obj     \
+	.\$(OBJDIR)\nsUInt32Array.obj		\
+	.\$(OBJDIR)\nsMsgKeySet.obj			\
+	.\$(OBJDIR)\nsMsgFolder.obj			\
+	.\$(OBJDIR)\nsMsgDBFolder.obj		\
+	.\$(OBJDIR)\nsLocalFolderSummarySpec.obj	\
+	.\$(OBJDIR)\nsMsgIdentity.obj		\
+	.\$(OBJDIR)\nsMsgIncomingServer.obj	\
+	.\$(OBJDIR)\nsNewsSummarySpec.obj	\
+	.\$(OBJDIR)\nsMsgUtils.obj			\
+	.\$(OBJDIR)\nsMessage.obj			\
+	.\$(OBJDIR)\nsMsgProtocol.obj		\
+	.\$(OBJDIR)\nsMsgMailNewsUrl.obj	\
+	.\$(OBJDIR)\nsMsgTxn.obj			\
+	.\$(OBJDIR)\nsMsgI18N.obj			\
+	$(NULL)
+
+LLIBS=								\
+	$(DIST)\lib\xpcom.lib			\
+	$(DIST)\lib\rdfutil_s.lib		\
+	$(LIBNSPR)						\
+	$(NULL)
+
+include <$(DEPTH)/config/rules.mak>
+
+libs:: $(DLL)
+	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin
+	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib

mozilla/mailnews/base/util/nsLocalFolderSummarySpec.cpp

@@ -0,0 +1,76 @@
+/* -*- 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) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsLocalFolderSummarySpec.h"
+#include "plstr.h"
+#include "nsString.h"
+
+MOZ_DECL_CTOR_COUNTER(nsLocalFolderSummarySpec);
+
+nsLocalFolderSummarySpec::~nsLocalFolderSummarySpec()
+{
+	MOZ_COUNT_DTOR(nsLocalFolderSummarySpec);
+
+}
+
+nsLocalFolderSummarySpec::nsLocalFolderSummarySpec()
+{
+	MOZ_COUNT_CTOR(nsLocalFolderSummarySpec);
+}
+
+nsLocalFolderSummarySpec::nsLocalFolderSummarySpec(const char *folderPath, PRBool create)
+  : nsFileSpec(folderPath, create)
+{
+	MOZ_COUNT_CTOR(nsLocalFolderSummarySpec);
+	CreateSummaryFileName();
+}
+
+nsLocalFolderSummarySpec::nsLocalFolderSummarySpec(const nsFileSpec& inFolderPath)
+: nsFileSpec(inFolderPath)
+{
+	MOZ_COUNT_CTOR(nsLocalFolderSummarySpec);
+	CreateSummaryFileName();
+}
+
+nsLocalFolderSummarySpec::nsLocalFolderSummarySpec(const nsFilePath &inFolderPath, PRBool create) : nsFileSpec(inFolderPath, create)
+{
+	MOZ_COUNT_CTOR(nsLocalFolderSummarySpec);
+	CreateSummaryFileName();
+}
+
+void nsLocalFolderSummarySpec::SetFolderName(const char *folderPath)
+{
+	*this = folderPath;
+}
+
+void nsLocalFolderSummarySpec::	CreateSummaryFileName()
+{
+	char *leafName = GetLeafName();
+
+	nsString fullLeafName(leafName);
+
+	// Append .msf (msg summary file) this is what windows will want.
+	// Mac and Unix can decide for themselves.
+
+	fullLeafName += ".msf";				// message summary file
+	char *cLeafName = fullLeafName.ToNewCString();
+	SetLeafName(cLeafName);
+    nsAllocator::Free(cLeafName);
+	PL_strfree(leafName);
+}
+

mozilla/mailnews/base/util/nsLocalFolderSummarySpec.h

@@ -0,0 +1,46 @@
+/* -*- 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) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _nsLocalFolderSummarySpec_H
+#define _nsLocalFolderSummarySpec_H
+
+#include "msgCore.h"
+#include "nsFileSpec.h"
+
+// Class to name a summary file for a local mail folder,
+// given a full folder file spec. For windows, this just means tacking .msf on the end.
+// For Unix, it might mean something like putting a '.' on the front and .msgsummary on the end.
+// Note this class expects the invoking code to fully specify the folder path. 
+// This class does NOT prepend the local folder directory, or put .sbd on the containing
+// directory names.
+class NS_MSG_BASE nsLocalFolderSummarySpec : public nsFileSpec
+{
+public:
+			virtual ~nsLocalFolderSummarySpec();
+			nsLocalFolderSummarySpec();
+			nsLocalFolderSummarySpec(const char *folderPath, PRBool create = PR_FALSE);
+			nsLocalFolderSummarySpec(const nsFileSpec& inFolderPath);
+			nsLocalFolderSummarySpec(const nsFilePath &inFolderPath, PRBool create = PR_FALSE);
+			void SetFolderName(const char *folderPath);
+
+protected:
+	void	CreateSummaryFileName();
+
+};
+
+#endif

mozilla/mailnews/base/util/nsMessage.cpp

@@ -0,0 +1,509 @@
+/* -*- 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 "msgCore.h"    // precompiled header...
+#include "nsMessage.h"
+#include "nsIMsgFolder.h"
+
+
+nsMessage::nsMessage(void)
+  : nsRDFResource(), mFolder(nsnull)
+{
+
+}
+
+nsMessage::~nsMessage(void)
+{
+	//Member variables are either nsCOMPtr's or ptrs we don't want to own.
+}
+
+NS_IMPL_ADDREF_INHERITED(nsMessage, nsRDFResource)
+NS_IMPL_RELEASE_INHERITED(nsMessage, nsRDFResource)                        
+
+NS_IMETHODIMP nsMessage::QueryInterface(REFNSIID aIID, void** aInstancePtr)
+{
+	if (!aInstancePtr) return NS_ERROR_NULL_POINTER;
+	*aInstancePtr = nsnull;
+	if (aIID.Equals(nsCOMTypeInfo<nsIMessage>::GetIID()) || aIID.Equals(nsCOMTypeInfo<nsIDBMessage>::GetIID()))
+	{
+		*aInstancePtr = NS_STATIC_CAST(nsIDBMessage*, this);
+	}              
+	if(*aInstancePtr)
+	{
+		AddRef();
+		return NS_OK;
+	}
+
+	return nsRDFResource::QueryInterface(aIID, aInstancePtr);
+}
+
+NS_IMETHODIMP
+nsMessage::Init(const char* aURI)
+{
+
+	return nsRDFResource::Init(aURI);
+}
+
+
+NS_IMETHODIMP nsMessage::GetProperty(const char *propertyName, nsString &resultProperty)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetProperty(propertyName, resultProperty);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetProperty(const char *propertyName, nsString &propertyStr)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetProperty(propertyName, propertyStr);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetUint32Property(const char *propertyName, PRUint32 *pResult)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetUint32Property(propertyName, pResult);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetUint32Property(const char *propertyName, PRUint32 propertyVal)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetUint32Property(propertyName, propertyVal);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetNumReferences(PRUint16 *result)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetNumReferences(result);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetStringReference(PRInt32 refNum, nsCString &resultReference)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetStringReference(refNum, resultReference);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetDate(PRTime *result)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetDate(result);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetDate(PRTime date)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetDate(date);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetMessageId(const char *messageId)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetMessageId(messageId);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetReferences(const char *references)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetReferences(references);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetCCList(const char *ccList)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetCCList(ccList);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetRecipients(const char *recipients, PRBool recipientsIsNewsgroup)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetRecipients(recipients, recipientsIsNewsgroup);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetRecipientsArray(const char *names, const char *addresses, PRUint32 numAddresses)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetRecipientsArray(names, addresses, numAddresses);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetCCListArray(const char *names, const char *addresses, PRUint32 numAddresses)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetCCListArray(names, addresses, numAddresses);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetAuthor(const char *author)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetAuthor(author);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetSubject(const char *subject)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetSubject(subject);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetStatusOffset(PRUint32 statusOffset)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetStatusOffset(statusOffset);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+
+NS_IMETHODIMP nsMessage::GetAuthor(nsString *resultAuthor)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetAuthor(resultAuthor);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetSubject(nsString *resultSubject)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetSubject(resultSubject);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetRecipients(nsString *resultRecipients)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetRecipients(resultRecipients);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetCCList(nsString *ccList)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetCCList(ccList);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetMessageId(nsCString *resultMessageId)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetMessageId(resultMessageId);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+
+NS_IMETHODIMP nsMessage::GetMime2DecodedAuthor(nsString *resultAuthor)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetMime2DecodedAuthor(resultAuthor);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetMime2DecodedSubject(nsString *resultSubject)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetMime2DecodedSubject(resultSubject);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetMime2DecodedRecipients(nsString *resultRecipients)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetMime2DecodedRecipients(resultRecipients);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+
+NS_IMETHODIMP nsMessage::GetAuthorCollationKey(nsString *resultAuthor)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetAuthorCollationKey(resultAuthor);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetSubjectCollationKey(nsString *resultSubject)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetSubjectCollationKey(resultSubject);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetRecipientsCollationKey(nsString *resultRecipients)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetRecipientsCollationKey(resultRecipients);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+
+NS_IMETHODIMP nsMessage::GetFlags(PRUint32 *result)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetFlags(result);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetFlags(PRUint32 flags)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetFlags(flags);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::OrFlags(PRUint32 flags, PRUint32 *result)
+{
+	if(mMsgHdr)
+		return mMsgHdr->OrFlags(flags, result);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::AndFlags(PRUint32 flags, PRUint32 *result)
+{
+	if(mMsgHdr)
+		return mMsgHdr->AndFlags(flags, result);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::MarkRead(PRBool bRead)
+{
+	if(mMsgHdr)
+		return mMsgHdr->MarkRead(bRead);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::MarkFlagged(PRBool bFlagged)
+{
+	if(mMsgHdr)
+		return mMsgHdr->MarkFlagged(bFlagged);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetMessageKey(nsMsgKey *result)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetMessageKey(result);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetThreadId(nsMsgKey *result)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetThreadId(result);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetThreadId(nsMsgKey inKey)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetThreadId(inKey);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetMessageKey(nsMsgKey inKey)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetMessageKey(inKey);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetMessageSize(PRUint32 *result)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetMessageSize(result);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetLineCount(PRUint32 *result)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetLineCount(result);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetMessageSize(PRUint32 messageSize)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetMessageSize(messageSize);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetLineCount(PRUint32 lineCount)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetLineCount(lineCount);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetPriority(nsMsgPriority priority)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetPriority(priority);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetPriority(const char *priority)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetPriority(priority);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetPriority(nsMsgPriority *result)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetPriority(result);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+
+NS_IMETHODIMP nsMessage::GetMessageOffset(PRUint32 *result)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetMessageOffset(result);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetStatusOffset(PRUint32 *result)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetStatusOffset(result);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetCharSet(nsString *result)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetCharSet(result);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::GetThreadParent(nsMsgKey *result)
+{
+	if(mMsgHdr)
+		return mMsgHdr->GetThreadParent(result);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsMessage::SetThreadParent(nsMsgKey inKey)
+{
+	if(mMsgHdr)
+		return mMsgHdr->SetThreadParent(inKey);
+	else
+		return NS_ERROR_FAILURE;
+}
+
+
+NS_IMETHODIMP nsMessage::GetMsgFolder(nsIMsgFolder **folder)
+{
+	if(!folder)
+		return NS_ERROR_NULL_POINTER;
+	*folder = mFolder;
+	if(mFolder)
+	{
+		NS_ADDREF(mFolder);
+		return NS_OK;
+	}
+	else
+		return NS_ERROR_NULL_POINTER;
+}
+
+
+NS_IMETHODIMP nsMessage::SetMsgFolder(nsIMsgFolder *folder)
+{
+	mFolder = folder;
+	//We don't want to own folder, so don't AddRef
+	return NS_OK;
+}
+
+
+NS_IMETHODIMP nsMessage::SetMsgDBHdr(nsIMsgDBHdr *hdr)
+{
+	mMsgHdr = dont_QueryInterface(hdr);
+	return NS_OK;
+}
+
+NS_IMETHODIMP nsMessage::GetMsgDBHdr(nsIMsgDBHdr **hdr)
+{
+	*hdr = mMsgHdr;
+	if(*hdr)
+	{
+		NS_ADDREF(*hdr);
+		return NS_OK;
+	}
+	else
+		return NS_ERROR_NULL_POINTER;
+}
+

mozilla/mailnews/base/util/nsMessage.h

@@ -0,0 +1,113 @@
+/* -*- 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.
+ */
+
+/********************************************************************************************************
+ 
+   Interface for representing Messenger folders.
+ 
+*********************************************************************************************************/
+
+#ifndef nsMessage_h__
+#define nsMessage_h__
+
+#include "msgCore.h"
+#include "nsIMessage.h" /* include the interface we are going to support */
+#include "nsRDFResource.h"
+#include "nsIMsgHdr.h"
+#include "nsCOMPtr.h"
+
+
+class NS_MSG_BASE nsMessage: public nsRDFResource, public nsIDBMessage
+{
+public: 
+	nsMessage(void);
+	virtual ~nsMessage(void);
+
+	NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_NSIMESSAGE
+  NS_DECL_NSIDBMESSAGE
+
+	NS_IMETHOD Init(const char *aURI);
+	//nsIMsgHdr
+	NS_IMETHOD GetProperty(const char *propertyName, nsString &resultProperty);
+    NS_IMETHOD SetProperty(const char *propertyName, nsString &propertyStr);
+    NS_IMETHOD GetUint32Property(const char *propertyName, PRUint32 *pResult);
+    NS_IMETHOD SetUint32Property(const char *propertyName, PRUint32 propertyVal);
+    NS_IMETHOD GetNumReferences(PRUint16 *result);
+    NS_IMETHOD GetStringReference(PRInt32 refNum, nsCString &resultReference);
+    NS_IMETHOD GetDate(PRTime *result);
+    NS_IMETHOD SetDate(PRTime date);
+    NS_IMETHOD SetMessageId(const char *messageId);
+    NS_IMETHOD SetReferences(const char *references);
+    NS_IMETHOD SetCCList(const char *ccList);
+    NS_IMETHOD SetRecipients(const char *recipients, PRBool recipientsIsNewsgroup);
+	NS_IMETHOD SetRecipientsArray(const char *names, const char *addresses, PRUint32 numAddresses);
+    NS_IMETHOD SetCCListArray(const char *names, const char *addresses, PRUint32 numAddresses);
+    NS_IMETHOD SetAuthor(const char *author);
+    NS_IMETHOD SetSubject(const char *subject);
+    NS_IMETHOD SetStatusOffset(PRUint32 statusOffset);
+
+	NS_IMETHOD GetAuthor(nsString *resultAuthor);
+	NS_IMETHOD GetSubject(nsString *resultSubject);
+	NS_IMETHOD GetRecipients(nsString *resultRecipients);
+	NS_IMETHOD GetCCList(nsString *ccList);
+	NS_IMETHOD GetMessageId(nsCString *resultMessageId);
+
+	NS_IMETHOD GetMime2DecodedAuthor(nsString *resultAuthor);
+	NS_IMETHOD GetMime2DecodedSubject(nsString *resultSubject);
+	NS_IMETHOD GetMime2DecodedRecipients(nsString *resultRecipients);
+
+	NS_IMETHOD GetAuthorCollationKey(nsString *resultAuthor);
+	NS_IMETHOD GetSubjectCollationKey(nsString *resultSubject);
+	NS_IMETHOD GetRecipientsCollationKey(nsString *resultRecipients);
+
+    // flag handling routines
+    NS_IMETHOD GetFlags(PRUint32 *result);
+    NS_IMETHOD SetFlags(PRUint32 flags);
+    NS_IMETHOD OrFlags(PRUint32 flags, PRUint32 *result);
+    NS_IMETHOD AndFlags(PRUint32 flags, PRUint32 *result);
+
+	// Mark message routines
+	NS_IMETHOD MarkRead(PRBool bRead);
+	NS_IMETHOD MarkFlagged(PRBool bFlagged);
+
+    NS_IMETHOD GetMessageKey(nsMsgKey *result);
+    NS_IMETHOD GetThreadId(nsMsgKey *result);
+    NS_IMETHOD SetThreadId(nsMsgKey inKey);
+    NS_IMETHOD SetMessageKey(nsMsgKey inKey);
+    NS_IMETHOD GetMessageSize(PRUint32 *result);
+    NS_IMETHOD SetMessageSize(PRUint32 messageSize);
+    NS_IMETHOD GetLineCount(PRUint32 *result);
+    NS_IMETHOD SetLineCount(PRUint32 lineCount);
+    NS_IMETHOD SetPriority(nsMsgPriority priority);
+    NS_IMETHOD SetPriority(const char *priority);
+    NS_IMETHOD GetMessageOffset(PRUint32 *result);
+    NS_IMETHOD GetStatusOffset(PRUint32 *result); 
+	NS_IMETHOD GetCharSet(nsString *result);
+    NS_IMETHOD GetPriority(nsMsgPriority *result);
+    NS_IMETHOD GetThreadParent(nsMsgKey *result);
+    NS_IMETHOD SetThreadParent(nsMsgKey inKey);
+
+protected:
+	nsIMsgFolder *mFolder;
+	nsCOMPtr<nsIMsgDBHdr> mMsgHdr;
+
+};
+
+#endif //nsMessage_h__
+

mozilla/mailnews/base/util/nsMsgDBFolder.cpp

@@ -0,0 +1,530 @@
+/* -*- 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 "msgCore.h"
+#include "nsIMessage.h"
+#include "nsMsgDBFolder.h"
+#include "nsMsgFolderFlags.h"
+#include "nsIPref.h"
+#include "nsIMsgFolderCache.h"
+#include "nsIMsgFolderCacheElement.h"
+#include "nsIMsgMailSession.h"
+#include "nsMsgBaseCID.h"
+#include "nsIMsgMailNewsUrl.h"
+
+static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
+static NS_DEFINE_CID(kMsgMailSessionCID, NS_MSGMAILSESSION_CID);
+
+NS_IMPL_ADDREF_INHERITED(nsMsgDBFolder, nsMsgFolder)
+NS_IMPL_RELEASE_INHERITED(nsMsgDBFolder, nsMsgFolder)
+
+NS_IMETHODIMP nsMsgDBFolder::QueryInterface(REFNSIID aIID, void** aInstancePtr)
+{
+	if (!aInstancePtr) return NS_ERROR_NULL_POINTER;
+	*aInstancePtr = nsnull;
+	if (aIID.Equals(nsCOMTypeInfo<nsIDBChangeListener>::GetIID()))
+	{
+		*aInstancePtr = NS_STATIC_CAST(nsIDBChangeListener*, this);
+	}              
+	else if (aIID.Equals(nsCOMTypeInfo<nsIUrlListener>::GetIID()))
+	{
+		*aInstancePtr = NS_STATIC_CAST(nsIUrlListener*, this);
+	}              
+
+	if(*aInstancePtr)
+	{
+		AddRef();
+		return NS_OK;
+	}
+
+	return nsRDFResource::QueryInterface(aIID, aInstancePtr);
+}
+
+nsMsgDBFolder::nsMsgDBFolder(void)
+: mCharset(""), mAddListener(PR_TRUE)
+{
+
+}
+
+nsMsgDBFolder::~nsMsgDBFolder(void)
+{
+	if(mDatabase)
+	{
+		mDatabase->RemoveListener(this);
+		mDatabase->Close(PR_TRUE);
+	}
+}
+
+NS_IMETHODIMP nsMsgDBFolder::StartFolderLoading(void)
+{
+	if(mDatabase)
+		mDatabase->RemoveListener(this);
+	mAddListener = PR_FALSE;
+	return NS_OK;
+}
+
+NS_IMETHODIMP nsMsgDBFolder::EndFolderLoading(void)
+{
+	if(mDatabase)
+		mDatabase->AddListener(this);
+	mAddListener = PR_TRUE;
+	return NS_OK;
+}
+
+NS_IMETHODIMP nsMsgDBFolder::GetThreads(nsISimpleEnumerator** threadEnumerator)
+{
+	nsresult rv = GetDatabase();
+	
+	if(NS_SUCCEEDED(rv))
+		return mDatabase->EnumerateThreads(threadEnumerator);
+	else
+		return rv;
+}
+
+NS_IMETHODIMP
+nsMsgDBFolder::GetThreadForMessage(nsIMessage *message, nsIMsgThread **thread)
+{
+	nsresult rv = GetDatabase();
+	if(NS_SUCCEEDED(rv))
+	{
+		nsCOMPtr<nsIMsgDBHdr> msgDBHdr;
+		nsCOMPtr<nsIDBMessage> dbMessage(do_QueryInterface(message, &rv));
+		if(NS_SUCCEEDED(rv))
+			rv = dbMessage->GetMsgDBHdr(getter_AddRefs(msgDBHdr));
+		if(NS_SUCCEEDED(rv))
+		{
+			rv = mDatabase->GetThreadContainingMsgHdr(msgDBHdr, thread);
+		}
+	}
+	return rv;
+
+}
+
+NS_IMETHODIMP
+nsMsgDBFolder::HasMessage(nsIMessage *message, PRBool *hasMessage)
+{
+	if(!hasMessage)
+		return NS_ERROR_NULL_POINTER;
+
+	nsresult rv = GetDatabase();
+
+	if(NS_SUCCEEDED(rv))
+	{
+		nsCOMPtr<nsIMsgDBHdr> msgDBHdr, msgDBHdrForKey;
+		nsCOMPtr<nsIDBMessage> dbMessage(do_QueryInterface(message, &rv));
+		nsMsgKey key;
+		if(NS_SUCCEEDED(rv))
+			rv = dbMessage->GetMsgDBHdr(getter_AddRefs(msgDBHdr));
+		if(NS_SUCCEEDED(rv))
+			rv = msgDBHdr->GetMessageKey(&key);
+		if(NS_SUCCEEDED(rv))
+			rv = mDatabase->ContainsKey(key, hasMessage);
+		
+	}
+	return rv;
+
+}
+
+NS_IMETHODIMP nsMsgDBFolder::GetCharset(PRUnichar * *aCharset)
+{
+	nsresult rv = NS_OK;
+	if(!aCharset)
+		return NS_ERROR_NULL_POINTER;
+
+	if(mCharset == "")
+	{
+		NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv);
+
+		char *prefCharset = nsnull;
+		if (NS_SUCCEEDED(rv))
+		{
+			rv = prefs->CopyCharPref("intl.character_set_name", &prefCharset);
+		}
+  
+		nsString prefCharsetStr;
+		if(prefCharset)
+		{
+			prefCharsetStr = prefCharset;
+			PR_Free(prefCharset);
+		}
+		else
+		{
+			prefCharsetStr = "us-ascii";
+		}
+		*aCharset = prefCharsetStr.ToNewUnicode();
+	}
+	else
+	{
+		*aCharset = mCharset.ToNewUnicode();
+	}
+	return rv;
+}
+
+NS_IMETHODIMP nsMsgDBFolder::SetCharset(const PRUnichar * aCharset)
+{
+	nsresult rv;
+
+	nsCOMPtr<nsIDBFolderInfo> folderInfo;
+	nsCOMPtr<nsIMsgDatabase> db; 
+	rv = GetDBFolderInfoAndDB(getter_AddRefs(folderInfo), getter_AddRefs(db));
+	if(NS_SUCCEEDED(rv))
+	{
+		nsString charset(aCharset);
+		rv = folderInfo->SetCharacterSet(&charset);
+		db->Commit(nsMsgDBCommitType::kLargeCommit);
+	}
+	return rv;
+}
+
+nsresult nsMsgDBFolder::ReadDBFolderInfo(PRBool force)
+{
+	// Since it turns out to be pretty expensive to open and close
+	// the DBs all the time, if we have to open it once, get everything
+	// we might need while we're here
+
+	nsresult result;
+
+	nsCOMPtr <nsIMsgFolderCache> folderCache;
+
+	NS_WITH_SERVICE(nsIMsgMailSession, mailSession, kMsgMailSessionCID, &result); 
+	if(NS_SUCCEEDED(result))
+	{
+		result = mailSession->GetFolderCache(getter_AddRefs(folderCache));
+		if (NS_SUCCEEDED(result) && folderCache)
+		{
+			char *uri;
+
+			result = GetURI(&uri);
+			if (NS_SUCCEEDED(result) && uri)
+			{
+				nsCOMPtr <nsIMsgFolderCacheElement> cacheElement;
+				result = folderCache->GetCacheElement(uri, PR_FALSE, getter_AddRefs(cacheElement));
+				if (NS_SUCCEEDED(result) && cacheElement)
+				{
+					result = ReadFromFolderCache(cacheElement);
+				}
+				PR_Free(uri);
+			}
+
+		}
+	}
+//	if (m_master->InitFolderFromCache (this))
+//		return err;
+
+	if (force || !(mPrefFlags & MSG_FOLDER_PREF_CACHED))
+    {
+        nsCOMPtr<nsIDBFolderInfo> folderInfo;
+        nsCOMPtr<nsIMsgDatabase> db; 
+        result = GetDBFolderInfoAndDB(getter_AddRefs(folderInfo), getter_AddRefs(db));
+        if(NS_SUCCEEDED(result))
+        {
+			mIsCachable = PR_TRUE;
+            if (folderInfo)
+            {
+
+	            folderInfo->GetFlags(&mPrefFlags);
+                mPrefFlags |= MSG_FOLDER_PREF_CACHED;
+                folderInfo->SetFlags(mPrefFlags);
+
+				folderInfo->GetNumMessages(&mNumTotalMessages);
+				folderInfo->GetNumNewMessages(&mNumUnreadMessages);
+
+				//These should be put in IMAP folder only.
+				//folderInfo->GetImapTotalPendingMessages(&mNumPendingTotalMessages);
+				//folderInfo->GetImapUnreadPendingMessages(&mNumPendingUnreadMessages);
+
+				folderInfo->GetCharacterSet(&mCharset);
+        
+				if (db) {
+					PRBool hasnew;
+					nsresult rv;
+					rv = db->HasNew(&hasnew);
+					if (NS_FAILED(rv)) return rv;
+					if (!hasnew && mNumPendingUnreadMessages <= 0) {
+						ClearFlag(MSG_FOLDER_FLAG_GOT_NEW);
+					}
+				}
+            }
+
+        }
+        if (db)
+	        db->Close(PR_FALSE);
+    }
+
+	return result;
+	
+}
+
+nsresult nsMsgDBFolder::SendFlagNotifications(nsISupports *item, PRUint32 oldFlags, PRUint32 newFlags)
+{
+	nsresult rv = NS_OK;
+
+	PRUint32 changedFlags = oldFlags ^ newFlags;
+	if((changedFlags & MSG_FLAG_READ) || (changedFlags & MSG_FLAG_REPLIED)
+		|| (changedFlags & MSG_FLAG_FORWARDED)|| (changedFlags & MSG_FLAG_NEW))
+	{
+		rv = NotifyPropertyFlagChanged(item, "Status", oldFlags, newFlags);
+	}
+	else if((changedFlags & MSG_FLAG_MARKED))
+	{
+		rv = NotifyPropertyFlagChanged(item, "Flagged", oldFlags, newFlags);
+	}
+		return rv;
+}
+
+NS_IMETHODIMP
+nsMsgDBFolder::GetMsgDatabase(nsIMsgDatabase** aMsgDatabase)
+{
+    if (!aMsgDatabase || !mDatabase)
+        return NS_ERROR_NULL_POINTER;
+    *aMsgDatabase = mDatabase;
+    NS_ADDREF(*aMsgDatabase);
+    return NS_OK;
+}
+
+NS_IMETHODIMP nsMsgDBFolder::OnKeyChange(nsMsgKey aKeyChanged, PRUint32 aOldFlags, PRUint32 aNewFlags, 
+                         nsIDBChangeListener * aInstigator)
+{
+	nsCOMPtr<nsIMsgDBHdr> pMsgDBHdr;
+	nsresult rv = mDatabase->GetMsgHdrForKey(aKeyChanged, getter_AddRefs(pMsgDBHdr));
+	if(NS_SUCCEEDED(rv) && pMsgDBHdr)
+	{
+		nsCOMPtr<nsIMessage> message;
+		rv = CreateMessageFromMsgDBHdr(pMsgDBHdr, getter_AddRefs(message));
+		if(NS_SUCCEEDED(rv))
+		{
+			nsCOMPtr<nsISupports> msgSupports(do_QueryInterface(message, &rv));
+			if(NS_SUCCEEDED(rv))
+			{
+				SendFlagNotifications(msgSupports, aOldFlags, aNewFlags);
+			}
+			UpdateSummaryTotals(PR_TRUE);
+		}
+	}
+	return NS_OK;
+}
+
+NS_IMETHODIMP nsMsgDBFolder::OnKeyDeleted(nsMsgKey aKeyChanged, nsMsgKey  aParentKey, PRInt32 aFlags, 
+                          nsIDBChangeListener * aInstigator)
+{
+	nsCOMPtr<nsIMsgDBHdr> pMsgDBHdr;
+	nsresult rv = mDatabase->GetMsgHdrForKey(aKeyChanged, getter_AddRefs(pMsgDBHdr));
+	if(NS_SUCCEEDED(rv) && pMsgDBHdr)
+	{
+		nsCOMPtr<nsIMessage> message;
+		rv = CreateMessageFromMsgDBHdr(pMsgDBHdr, getter_AddRefs(message));
+		if(NS_SUCCEEDED(rv))
+		{
+			nsCOMPtr<nsISupports> msgSupports(do_QueryInterface(message, &rv));
+			if(NS_SUCCEEDED(rv))
+			{
+				NotifyItemDeleted(msgSupports);
+			}
+			UpdateSummaryTotals(PR_TRUE);
+		}
+	}
+
+	return NS_OK;
+}
+
+NS_IMETHODIMP nsMsgDBFolder::OnKeyAdded(nsMsgKey aKeyChanged, nsMsgKey  aParentKey , PRInt32 aFlags, 
+                        nsIDBChangeListener * aInstigator)
+{
+	nsresult rv;
+	nsCOMPtr<nsIMsgDBHdr> msgDBHdr;
+	rv = mDatabase->GetMsgHdrForKey(aKeyChanged, getter_AddRefs(msgDBHdr));
+	if(NS_SUCCEEDED(rv) && msgDBHdr)
+	{
+		nsCOMPtr<nsIMessage> message;
+		rv = CreateMessageFromMsgDBHdr(msgDBHdr, getter_AddRefs(message));
+		if(NS_SUCCEEDED(rv))
+		{
+			nsCOMPtr<nsISupports> msgSupports(do_QueryInterface(message));
+			if(msgSupports)
+			{
+				NotifyItemAdded(msgSupports);
+			}
+			UpdateSummaryTotals(PR_TRUE);
+		}
+	}
+	return NS_OK;
+}
+
+NS_IMETHODIMP nsMsgDBFolder::OnParentChanged(nsMsgKey aKeyChanged, nsMsgKey oldParent, nsMsgKey newParent, 
+						nsIDBChangeListener * aInstigator)
+{
+	return NS_OK;
+}
+
+
+NS_IMETHODIMP nsMsgDBFolder::OnAnnouncerGoingAway(nsIDBChangeAnnouncer *
+													 instigator)
+{
+    if (mDatabase)
+    {
+        mDatabase->RemoveListener(this);
+        mDatabase = null_nsCOMPtr();
+    }
+    return NS_OK;
+}
+
+NS_IMETHODIMP nsMsgDBFolder::ManyHeadersToDownload(PRBool *retval)
+{
+	PRInt32 numTotalMessages;
+
+	if (!retval)
+		return NS_ERROR_NULL_POINTER;
+	if (!mDatabase)
+		*retval = PR_TRUE;
+	else if (NS_SUCCEEDED(GetTotalMessages(PR_FALSE, &numTotalMessages)) && numTotalMessages <= 0)
+		*retval = PR_TRUE;
+	else
+		*retval = PR_FALSE;
+	return NS_OK;
+}
+
+
+nsresult nsMsgDBFolder::ReadFromFolderCache(nsIMsgFolderCacheElement *element)
+{
+	nsresult rv = NS_OK;
+	char *charset;
+
+	element->GetInt32Property("flags", &mPrefFlags);
+	element->GetInt32Property("totalMsgs", &mNumTotalMessages);
+	element->GetInt32Property("totalUnreadMsgs", &mNumUnreadMessages);
+
+	element->GetStringProperty("charset", &charset);
+
+#ifdef DEBUG_bienvenu1
+	char *uri;
+
+	GetURI(&uri);
+	printf("read total %ld for %s\n", mNumTotalMessages, uri);
+	PR_Free(uri);
+#endif
+	mCharset = charset;
+	PR_FREEIF(charset);
+
+    mPrefFlags |= MSG_FOLDER_PREF_CACHED;
+	return rv;
+}
+
+NS_IMETHODIMP nsMsgDBFolder::WriteToFolderCache(nsIMsgFolderCache *folderCache)
+{
+	nsCOMPtr <nsIEnumerator> aEnumerator;
+
+	nsresult rv = GetSubFolders(getter_AddRefs(aEnumerator));
+	if(NS_FAILED(rv)) 
+		return rv;
+
+	char *uri = nsnull;
+	rv = GetURI(&uri);
+
+	if (folderCache)
+	{
+		nsCOMPtr <nsIMsgFolderCacheElement> cacheElement;
+		rv = folderCache->GetCacheElement(uri, PR_TRUE, getter_AddRefs(cacheElement));
+		if (NS_SUCCEEDED(rv) && cacheElement)
+			rv = WriteToFolderCacheElem(cacheElement);
+	}
+	PR_FREEIF(uri);
+
+	
+	nsCOMPtr<nsISupports> aItem;
+
+	rv = aEnumerator->First();
+	if (!NS_SUCCEEDED(rv))
+		return NS_OK;	// it's OK, there are no sub-folders.
+
+	while(NS_SUCCEEDED(rv))
+	{
+		rv = aEnumerator->CurrentItem(getter_AddRefs(aItem));
+		if (NS_FAILED(rv)) break;
+		nsCOMPtr<nsIMsgFolder> aMsgFolder(do_QueryInterface(aItem, &rv));
+		if (NS_SUCCEEDED(rv))
+		{
+			if (folderCache)
+			{
+				rv = aMsgFolder->WriteToFolderCache(folderCache);
+				if (!NS_SUCCEEDED(rv))
+					break;
+			}
+		}
+		rv = aEnumerator->Next();
+		if (!NS_SUCCEEDED(rv))
+		{
+			rv = NS_OK;
+			break;
+		}
+	}
+	return rv;
+}
+
+NS_IMETHODIMP nsMsgDBFolder::WriteToFolderCacheElem(nsIMsgFolderCacheElement *element)
+{
+	nsresult rv = NS_OK;
+
+	element->SetInt32Property("flags", mPrefFlags);
+	element->SetInt32Property("totalMsgs", mNumTotalMessages);
+	element->SetInt32Property("totalUnreadMsgs", mNumUnreadMessages);
+
+	element->SetStringProperty("charset", (const char *) nsCAutoString(mCharset));
+
+#ifdef DEBUG_bienvenu1
+	char *uri;
+
+	GetURI(&uri);
+	printf("writing total %ld for %s\n", mNumTotalMessages, uri);
+	PR_Free(uri);
+#endif
+	return rv;
+}
+
+NS_IMETHODIMP
+nsMsgDBFolder::MarkAllMessagesRead(void)
+{
+	nsresult rv = GetDatabase();
+	
+	if(NS_SUCCEEDED(rv))
+		return mDatabase->MarkAllRead(nsnull);
+
+	return rv;
+}
+
+NS_IMETHODIMP
+nsMsgDBFolder::OnStartRunningUrl(nsIURI *aUrl)
+{
+	NS_PRECONDITION(aUrl, "just a sanity check");
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMsgDBFolder::OnStopRunningUrl(nsIURI *aUrl, nsresult aExitCode)
+{
+	NS_PRECONDITION(aUrl, "just a sanity check");
+	nsCOMPtr<nsIMsgMailNewsUrl> mailUrl = do_QueryInterface(aUrl);
+	if (mailUrl)
+	{
+		PRBool updatingFolder = PR_FALSE;
+		if (NS_SUCCEEDED(mailUrl->GetUpdatingFolder(&updatingFolder)) && updatingFolder)
+		{
+			NotifyFolderLoaded();
+		}
+	}
+    return NS_OK;
+}

mozilla/mailnews/base/util/nsMsgDBFolder.h

@@ -0,0 +1,80 @@
+/* -*- 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 nsMsgDBFolder_h__
+#define nsMsgDBFolder_h__
+
+#include "msgCore.h"
+#include "nsMsgFolder.h" 
+#include "nsIDBFolderInfo.h"
+#include "nsIMsgDatabase.h"
+#include "nsIMessage.h"
+#include "nsCOMPtr.h"
+#include "nsIDBChangeListener.h"
+#include "nsIUrlListener.h"
+
+class nsIMsgFolderCacheElement;
+ /* 
+  * nsMsgDBFolder
+  * class derived from nsMsgFolder for those folders that use an nsIMsgDatabase
+  */ 
+
+class NS_MSG_BASE nsMsgDBFolder:  public nsMsgFolder,
+                                        public nsIDBChangeListener,
+                                        public nsIUrlListener
+{
+public: 
+	nsMsgDBFolder(void);
+	virtual ~nsMsgDBFolder(void);
+  NS_DECL_NSIDBCHANGELISTENER
+  
+	NS_IMETHOD  StartFolderLoading(void);
+	NS_IMETHOD  EndFolderLoading(void);
+	NS_IMETHOD GetThreads(nsISimpleEnumerator** threadEnumerator);
+	NS_IMETHOD GetThreadForMessage(nsIMessage *message, nsIMsgThread **thread);
+	NS_IMETHOD HasMessage(nsIMessage *message, PRBool *hasMessage);
+	NS_IMETHOD GetCharset(PRUnichar * *aCharset);
+	NS_IMETHOD SetCharset(const PRUnichar * aCharset);
+
+  NS_IMETHOD GetMsgDatabase(nsIMsgDatabase** aMsgDatabase);
+
+	NS_DECL_ISUPPORTS_INHERITED
+
+	NS_DECL_NSIURLLISTENER
+
+	NS_IMETHOD WriteToFolderCache(nsIMsgFolderCache *folderCache);
+	NS_IMETHOD WriteToFolderCacheElem(nsIMsgFolderCacheElement *element);
+	NS_IMETHOD ManyHeadersToDownload(PRBool *_retval);
+
+	NS_IMETHOD MarkAllMessagesRead(void);
+
+protected:
+	virtual nsresult ReadDBFolderInfo(PRBool force);
+	virtual nsresult GetDatabase() = 0;
+	virtual nsresult SendFlagNotifications(nsISupports *item, PRUint32 oldFlags, PRUint32 newFlags);
+	nsresult ReadFromFolderCache(nsIMsgFolderCacheElement *element);
+
+protected:
+	nsCOMPtr<nsIMsgDatabase> mDatabase;  
+	nsString mCharset;
+	PRBool mAddListener;
+
+
+};
+
+#endif

mozilla/mailnews/base/util/nsMsgFolder.h

@@ -0,0 +1,268 @@
+/* -*- 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.
+ */
+
+/********************************************************************************************************
+ 
+   Interface for representing Messenger folders.
+ 
+*********************************************************************************************************/
+
+#ifndef nsMsgFolder_h__
+#define nsMsgFolder_h__
+
+#include "msgCore.h"
+#include "nsIMsgFolder.h" /* include the interface we are going to support */
+#include "nsRDFResource.h"
+#include "nsIDBFolderInfo.h"
+#include "nsIMsgDatabase.h"
+#include "nsIMsgIncomingServer.h"
+#include "nsCOMPtr.h"
+#include "nsIURL.h"
+ /* 
+  * MsgFolder
+  */ 
+
+class NS_MSG_BASE nsMsgFolder: public nsRDFResource, public nsIMsgFolder
+{
+public: 
+  nsMsgFolder(void);
+  virtual ~nsMsgFolder(void);
+
+  NS_DECL_ISUPPORTS_INHERITED
+
+  NS_DECL_NSICOLLECTION
+  NS_DECL_NSIFOLDER
+  // eventually this will be an instantiable class, and we should
+  // use this macro:
+  // NS_DECL_NSIMSGFOLDER
+  
+  // right now a few of these methods are left abstract, and
+  // are commented out below
+  
+  // begin NS_DECL_NSIMSGFOLDER
+  NS_IMETHOD AddUnique(nsISupports *element);
+  NS_IMETHOD ReplaceElement(nsISupports *element, nsISupports *newElement);
+  NS_IMETHOD GetMessages(nsISimpleEnumerator **_retval);
+  NS_IMETHOD GetThreads(nsISimpleEnumerator **_retval);
+  NS_IMETHOD StartFolderLoading(void);
+  NS_IMETHOD EndFolderLoading(void);
+  NS_IMETHOD UpdateFolder(void);
+  NS_IMETHOD GetThreadForMessage(nsIMessage *message, nsIMsgThread **_retval);
+  NS_IMETHOD HasMessage(nsIMessage *message, PRBool *_retval);
+  NS_IMETHOD GetVisibleSubFolders(nsIEnumerator **_retval);
+  NS_IMETHOD GetPrettiestName(PRUnichar * *aPrettiestName);
+  NS_IMETHOD GetFolderURL(char * *aFolderURL);
+  NS_IMETHOD GetDeleteIsMoveToTrash(PRBool *aDeleteIsMoveToTrash);
+  NS_IMETHOD GetShowDeletedMessages(PRBool *aShowDeletedMessages);
+  NS_IMETHOD GetServer(nsIMsgIncomingServer * *aServer);
+  NS_IMETHOD GetIsServer(PRBool *aIsServer);
+  NS_IMETHOD OnCloseFolder(void);
+  NS_IMETHOD Delete(void);
+  NS_IMETHOD DeleteSubFolders(nsISupportsArray *folders);
+  NS_IMETHOD PropagateDelete(nsIMsgFolder *folder, PRBool deleteStorage);
+  NS_IMETHOD RecursiveDelete(PRBool deleteStorage);
+  NS_IMETHOD CreateSubfolder(const char *folderName);
+  NS_IMETHOD Compact(void);
+  NS_IMETHOD EmptyTrash(void);
+  NS_IMETHOD Rename(const char *name);
+  NS_IMETHOD Adopt(nsIMsgFolder *srcFolder, PRUint32 *outPos);
+  NS_IMETHOD ContainsChildNamed(const char *name, PRBool *_retval);
+  NS_IMETHOD IsAncestorOf(nsIMsgFolder *folder, PRBool *_retval);
+  NS_IMETHOD GenerateUniqueSubfolderName(const char *prefix, nsIMsgFolder *otherFolder, char **_retval); 
+  NS_IMETHOD UpdateSummaryTotals(PRBool force);
+  NS_IMETHOD SummaryChanged(void);
+  NS_IMETHOD GetNumUnread(PRBool deep, PRInt32 *_retval);
+  NS_IMETHOD GetTotalMessages(PRBool deep, PRInt32 *_retval);
+  NS_IMETHOD GetExpungedBytesCount(PRUint32 *aExpungedBytesCount);
+  NS_IMETHOD GetDeletable(PRBool *aDeletable);
+  NS_IMETHOD GetCanCreateChildren(PRBool *aCanCreateChildren);
+  NS_IMETHOD GetCanBeRenamed(PRBool *aCanBeRenamed);
+  NS_IMETHOD GetRequiresCleanup(PRBool *aRequiresCleanup);
+  NS_IMETHOD ClearRequiresCleanup(void);
+  NS_IMETHOD ManyHeadersToDownload(PRBool *_retval);
+  NS_IMETHOD GetKnowsSearchNntpExtension(PRBool *aKnowsSearchNntpExtension);
+  NS_IMETHOD GetAllowsPosting(PRBool *aAllowsPosting);
+  NS_IMETHOD GetDisplayRecipients(PRBool *aDisplayRecipients);
+   NS_IMETHOD GetRelativePathName(char * *aRelativePathName);
+  NS_IMETHOD GetSizeOnDisk(PRUint32 *aSizeOnDisk);
+  NS_IMETHOD RememberPassword(const char *password);
+  NS_IMETHOD GetRememberedPassword(char * *aRememberedPassword);
+  NS_IMETHOD UserNeedsToAuthenticateForFolder(PRBool displayOnly, PRBool *_retval);
+  NS_IMETHOD GetUsername(char * *aUsername);
+  NS_IMETHOD GetHostname(char * *aHostname);
+  NS_IMETHOD SetFlag(PRUint32 flag);
+  NS_IMETHOD ClearFlag(PRUint32 flag);
+  NS_IMETHOD GetFlag(PRUint32 flag, PRBool *_retval);
+  NS_IMETHOD ToggleFlag(PRUint32 flag);
+  NS_IMETHOD OnFlagChange(PRUint32 flag);
+  NS_IMETHOD GetFlags(PRUint32 *aFlags);
+  NS_IMETHOD GetFoldersWithFlag(PRUint32 flags, nsIMsgFolder **result, PRUint32 resultsize, PRUint32 *numFolders);
+  NS_IMETHOD GetExpansionArray(nsISupportsArray *expansionArray);
+  // NS_IMETHOD DeleteMessages(nsISupportsArray *message, nsITransactionManager *txnMgr, PRBool deleteStorage);
+  NS_IMETHOD CopyMessages(nsIMsgFolder *srcFolder, nsISupportsArray *messages, PRBool isMove, nsITransactionManager *txnMgr, nsIMsgCopyServiceListener *listener);
+  NS_IMETHOD CopyFileMessage(nsIFileSpec *fileSpec, nsIMessage *msgToReplace, PRBool isDraft, nsITransactionManager *txnMgr, nsIMsgCopyServiceListener *listener);
+  NS_IMETHOD AcquireSemaphore(nsISupports *semHolder);
+  NS_IMETHOD ReleaseSemaphore(nsISupports *semHolder);
+  NS_IMETHOD TestSemaphore(nsISupports *semHolder, PRBool *_retval);
+  NS_IMETHOD GetLocked(PRBool *aLocked);
+  // NS_IMETHOD CreateMessageFromMsgDBHdr(nsIMsgDBHdr *msgDBHdr, nsIMessage **_retval);
+  NS_IMETHOD GetNewMessages(void);
+  // NS_IMETHOD WriteToFolderCache(nsIMsgFolderCache *folderCache);
+  // NS_IMETHOD GetCharset(PRUnichar * *aCharset);
+  // NS_IMETHOD SetCharset(const PRUnichar * aCharset);
+  NS_IMETHOD GetBiffState(PRUint32 *aBiffState);
+  NS_IMETHOD SetBiffState(PRUint32 aBiffState);
+  NS_IMETHOD GetNumNewMessages(PRInt32 *aNumNewMessages);
+  NS_IMETHOD SetNumNewMessages(PRInt32 aNumNewMessages);
+  NS_IMETHOD GetNewMessagesNotificationDescription(PRUnichar * *aNewMessagesNotificationDescription);
+  NS_IMETHOD GetRootFolder(nsIMsgFolder * *aRootFolder);
+  NS_IMETHOD GetMsgDatabase(nsIMsgDatabase * *aMsgDatabase);
+  NS_IMETHOD GetPath(nsIFileSpec * *aPath);
+  NS_IMETHOD MarkMessagesRead(nsISupportsArray *messages, PRBool markRead);
+  NS_IMETHOD MarkAllMessagesRead(void);
+  NS_IMETHOD MarkMessagesFlagged(nsISupportsArray *messages, PRBool markFlagged);
+  NS_IMETHOD GetChildWithURI(const char *uri, PRBool deep, nsIMsgFolder **_retval); 
+
+  // end NS_DECL_NSIMSGFOLDER
+  
+  // nsRDFResource overrides
+  NS_IMETHOD Init(const char* aURI);
+  
+#if 0
+  static nsresult GetRoot(nsIMsgFolder* *result);
+#endif
+  // Gets the URL that represents the given message.  Returns a newly
+  // created string that must be free'd using XP_FREE().
+  // If the db is NULL, then returns a URL that represents the entire
+  // folder as a whole.
+#ifdef HAVE_DB
+  NS_IMETHOD BuildUrl(nsMsgDatabase *db, nsMsgKey key, char ** url);
+  
+  // updates num messages and num unread - should be pure virtual
+  // when I get around to implementing in all subclasses?
+  NS_IMETHOD GetTotalMessagesInDB(PRUint32 *totalMessages) const;					// How many messages in database.
+	// These functions are used for tricking the front end into thinking that we have more 
+	// messages than are really in the DB.  This is usually after and IMAP message copy where
+	// we don't want to do an expensive select until the user actually opens that folder
+	// These functions are called when MSG_Master::GetFolderLineById is populating a MSG_FolderLine
+	// struct used by the FE
+	int32			GetNumPendingUnread(PRBool deep = PR_FALSE);
+	int32			GetNumPendingTotalMessages(PRBool deep = PR_FALSE);
+	
+  void			ChangeNumPendingUnread(int32 delta);
+  void			ChangeNumPendingTotalMessages(int32 delta);
+
+
+  NS_IMETHOD SetFolderPrefFlags(PRUint32 flags);
+  NS_IMETHOD GetFolderPrefFlags(PRUint32 *flags);
+
+
+  NS_IMETHOD SetLastMessageLoaded(nsMsgKey lastMessageLoaded);
+  NS_IMETHOD GetLastMessageLoaded();
+#endif
+
+
+#ifdef HAVE_ADMINURL
+  NS_IMETHOD GetAdminUrl(MWContext *context, MSG_AdminURLType type);
+  NS_IMETHOD HaveAdminUrl(MSG_AdminURLType type, PRBool *hadAdminUrl);
+#endif
+
+
+#ifdef HAVE_PANE
+  NS_IMETHOD	MarkAllRead(MSG_Pane *pane, PRBool deep);
+  NS_IMETHOD SetFlagInAllFolderPanes(PRUint32 which);
+#endif
+
+#ifdef HAVE_NET
+  NS_IMETHOD EscapeMessageId(const char *messageId, const char **escapeMessageID);
+  NS_IMETHOD ShouldPerformOperationOffline(PRBool *performOffline);
+#endif
+
+#ifdef HAVE_CACHE
+	virtual nsresult WriteToCache(XP_File);
+	virtual nsresult ReadFromCache(char *);
+	virtual PRBool IsCachable();
+	void SkipCacheTokens(char **ppBuf, int numTokens);
+#endif
+
+#ifdef DOES_FOLDEROPERATIONS
+	int DownloadToTempFileAndUpload(MessageCopyInfo *copyInfo, nsMsgKeyArray &keysToSave, MSG_FolderInfo *dstFolder, nsMsgDatabase *sourceDB);
+	void UpdateMoveCopyStatus(MWContext *context, PRBool isMove, int32 curMsgCount, int32 totMessages);
+#endif
+
+	virtual nsresult GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo, nsIMsgDatabase **db) = 0;
+
+
+	NS_IMETHOD MatchName(nsString *name, PRBool *matches);
+
+
+protected:
+	nsresult NotifyPropertyChanged(char *property, char* oldValue, char* newValue);
+	nsresult NotifyPropertyFlagChanged(nsISupports *item, char *property, PRUint32 oldValue,
+												PRUint32 newValue);
+	nsresult NotifyItemAdded(nsISupports *item);
+	nsresult NotifyItemDeleted(nsISupports *item);
+
+	nsresult NotifyFolderLoaded();
+	// this is a little helper function that is not part of the public interface. 
+	// we use it to get the IID of the incoming server for the derived folder.
+	// w/out a function like this we would have to implement GetServer in each
+	// derived folder class.
+	virtual const char* GetIncomingServerType() = 0;
+
+protected:
+  PRUint32 mFlags;
+  nsIFolder *mParent;     //This won't be refcounted for ownership reasons.
+  PRInt32 mNumUnreadMessages;        /* count of unread messages (-1 means
+                                         unknown; -2 means unknown but we already
+                                         tried to find out.) */
+  PRInt32 mNumTotalMessages;         /* count of existing messages. */
+  nsCOMPtr<nsISupportsArray> mSubFolders;
+  nsVoidArray *mListeners; //This can't be an nsISupportsArray because due to
+													 //ownership issues, listeners can't be AddRef'd
+
+  PRInt32 mPrefFlags;       // prefs like MSG_PREF_OFFLINE, MSG_PREF_ONE_PANE, etc
+  nsISupports *mSemaphoreHolder; // set when the folder is being written to
+								//Due to ownership issues, this won't be AddRef'd.
+
+  nsIMsgIncomingServer* m_server; //this won't be addrefed....ownership issue here
+
+#ifdef HAVE_DB
+  nsMsgKey	m_lastMessageLoaded;
+#endif
+  // These values are used for tricking the front end into thinking that we have more 
+  // messages than are really in the DB.  This is usually after and IMAP message copy where
+  // we don't want to do an expensive select until the user actually opens that folder
+  PRInt32 mNumPendingUnreadMessages;
+  PRInt32 mNumPendingTotalMessages;
+
+  PRUint32	mBiffState;
+  PRInt32	mNumNewBiffMessages;
+
+  PRBool mIsCachable;
+
+  //
+  // stuff from the uri
+  //
+  
+  PRBool mIsServer;
+  nsString mName;
+  
+};
+
+#endif

mozilla/mailnews/base/util/nsMsgGroupRecord.cpp

@@ -0,0 +1,598 @@
+/* -*- 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 "msgCore.h"    // precompiled header...
+#include "prlog.h"
+
+#include "nsMsgGroupRecord.h"
+
+#include "plstr.h"
+#include "prmem.h"
+#include "nsEscape.h"
+#include "nsCRT.h"
+
+// mscott: this is lame...I know....
+#define MK_OUT_OF_MEMORY  1
+
+const PRUint32 F_ISGROUP			 = 0x00000001;
+const PRUint32 F_EXPANDED			 = 0x00000002;
+const PRUint32 F_CATCONT			 = 0x00000004;
+const PRUint32 F_VIRTUAL			 = 0x00000008;
+const PRUint32 F_DIRTY			 = 0x00000010;
+const PRUint32 F_DESCENDENTSLOADED = 0x00000020;
+const PRUint32 F_HTMLOKGROUP		 = 0x00000040;
+const PRUint32 F_HTMLOKTREE		 = 0x00000080;
+const PRUint32 F_NEEDEXTRAINFO	 = 0x00000100;
+const PRUint32 F_DOESNOTEXIST		 = 0x00000200;
+const PRUint32 RUNTIMEFLAGS =		// Flags to be sure *not* to write to disk.
+	F_DIRTY | F_DESCENDENTSLOADED | F_EXPANDED;
+
+
+
+int
+nsMsgGroupRecord::GroupNameCompare(const char* name1, const char* name2,
+								  char delimiter, PRBool caseInsensitive)
+{
+	if (caseInsensitive)
+	{
+		while (*name1 && (nsCRT::ToUpper(*name1) == nsCRT::ToUpper(*name2))) {
+			name1++;
+			name2++;
+		}		
+	}
+	else
+	{
+		while (*name1 && *name1 == *name2) {
+			name1++;
+			name2++;
+		}
+	}
+
+	if (*name1 && *name2) {
+		if (*name1 == delimiter) return -1;
+		if (*name2 == delimiter) return 1;
+	}
+
+	if (caseInsensitive)
+		return int(nsCRT::ToUpper(*name1)) - int(nsCRT::ToUpper(*name2));
+	else
+		return int(*name1) - int(*name2);
+}
+
+
+nsMsgGroupRecord*
+nsMsgGroupRecord::Create(nsMsgGroupRecord* parent, const char* partname,
+						PRInt64 aTime, PRInt32 uniqueid, PRInt32 fileoffset)
+{
+	nsMsgGroupRecord* result = new nsMsgGroupRecord(parent, partname,
+												  aTime, uniqueid, fileoffset);
+	if (result && partname && !result->m_partname) {
+		// We ran out of memory.
+		delete result;
+		result = NULL;
+	}
+	result->InitializeSibling();
+	return result;
+}
+
+MOZ_DECL_CTOR_COUNTER(nsMsgGroupRecord);
+
+nsMsgGroupRecord::nsMsgGroupRecord(nsMsgGroupRecord* parent, const char* partname,
+								 PRInt64 aTime, PRInt32 uniqueid, PRInt32 fileoffset,
+								 char delimiter /* = '.' */)
+{
+	MOZ_COUNT_CTOR(nsMsgGroupRecord);
+	int length;
+	m_prettyname = NULL;
+	m_parent = parent;
+	m_children = NULL;
+	m_sibling = NULL;
+	m_flags = 0;
+	m_partname = NULL;
+	m_addtime = aTime;
+	m_uniqueId = uniqueid;
+	m_fileoffset = fileoffset;
+	m_delimiter = delimiter;
+	if (partname) {
+		length = PL_strlen(partname);
+		// PR_ASSERT(parent != NULL);
+		m_partname = new char [length + 1];
+		if (!m_partname) {
+			m_parent = NULL;
+			return;
+		}
+		PL_strcpy(m_partname, partname);
+	}
+}
+
+
+nsMsgGroupRecord::~nsMsgGroupRecord()
+{
+	MOZ_COUNT_DTOR(nsMsgGroupRecord);
+	delete [] m_partname;
+	m_partname = NULL;
+	delete [] m_prettyname;
+	m_prettyname = NULL;
+	while (m_children) {
+		delete m_children;
+	}
+	m_children = NULL;
+	if (m_parent) {
+		nsMsgGroupRecord** ptr;
+		for (ptr = &(m_parent->m_children);
+			 *ptr;
+			 ptr = &((*ptr)->m_sibling)) {
+			if (*ptr == this) {
+				*ptr = m_sibling;
+				break;
+			}
+		}
+	}
+}
+
+void nsMsgGroupRecord::InitializeSibling()
+{
+	if (m_parent) {
+		PR_ASSERT(m_partname != NULL);
+		nsMsgGroupRecord** ptr;
+		for (ptr = &(m_parent->m_children) ; *ptr ; ptr = &((*ptr)->m_sibling)) {
+			int comp = GroupNameCompare((*ptr)->m_partname, m_partname, m_delimiter, IsIMAPGroupRecord());
+			PR_ASSERT(comp != 0);
+			if (comp >= 0) break;
+		}
+		m_sibling = *ptr;
+		*ptr = this;
+	}
+}
+
+
+nsMsgGroupRecord*
+nsMsgGroupRecord::FindDescendant(const char* name)
+{
+	if (!name || !*name) return this;
+	char* ptr = PL_strchr(name, m_delimiter);
+	if (ptr) *ptr = '\0';
+	nsMsgGroupRecord* child;
+	for (child = m_children ; child ; child = child->m_sibling) {
+		if (PL_strcmp(child->m_partname, name) == 0) {
+			break;
+		}
+	}
+	if (ptr) {
+		*ptr++ = m_delimiter;
+		if (child) {
+			return child->FindDescendant(ptr);
+		}
+	}
+	return child;
+}
+
+
+nsMsgGroupRecord*
+nsMsgGroupRecord::GetSiblingOrAncestorSibling()
+{
+	if (m_sibling) return m_sibling;
+	if (m_parent) return m_parent->GetSiblingOrAncestorSibling();
+	return NULL;
+}
+
+nsMsgGroupRecord*
+nsMsgGroupRecord::GetNextAlphabetic()
+{
+	nsMsgGroupRecord* result;
+	if (m_children) result = m_children;
+	else result = GetSiblingOrAncestorSibling();
+#ifdef DEBUG_slowAndParanoid
+	if (result) {
+		char* ptr1 = GetFullName();
+		char* ptr2 = result->GetFullName();
+		PR_ASSERT(GroupNameCompare(ptr1, ptr2) < 0);
+		delete [] ptr1;
+		delete [] ptr2;
+	}
+#endif
+	return result;
+}
+
+nsMsgGroupRecord*
+nsMsgGroupRecord::GetNextAlphabeticNoCategories()
+{
+	if (IsCategoryContainer()) {
+		return GetSiblingOrAncestorSibling();
+	} else {
+		return GetNextAlphabetic();
+	}
+}
+
+
+char*
+nsMsgGroupRecord::GetFullName()
+{
+	int length = 0;
+	nsMsgGroupRecord* ptr;
+	for (ptr = this ; ptr ; ptr = ptr->m_parent) {
+		if (ptr->m_partname) length += PL_strlen(ptr->m_partname) + 1;
+	}
+	PR_ASSERT(length > 0);
+	if (length <= 0) return NULL;
+	char* result = new char [length];
+	if (result) {
+		SuckInName(result);
+		PR_ASSERT(int(PL_strlen(result)) + 1 == length);
+	}
+	return result;
+}
+
+
+char* 
+nsMsgGroupRecord::SuckInName(char* ptr)
+{
+	if (m_parent && m_parent->m_partname) {
+		ptr = m_parent->SuckInName(ptr);
+		*ptr++ = m_delimiter;
+	}
+	PL_strcpy(ptr, m_partname);
+	return ptr + PL_strlen(ptr);
+}
+
+
+
+int
+nsMsgGroupRecord::SetPrettyName(const char* name)
+{
+	if (name == NULL && m_prettyname == NULL) return 0;
+	m_flags |= F_DIRTY;
+	delete [] m_prettyname;
+	m_prettyname = NULL;
+	if (!name || !*name) {
+		return 0;
+	}
+	int length = PL_strlen(name);
+	m_prettyname = new char [length + 1];
+	if (!m_prettyname) {
+		return MK_OUT_OF_MEMORY;
+	}
+	PL_strcpy(m_prettyname, name);
+	return 1;
+}
+
+
+PRBool
+nsMsgGroupRecord::IsCategory()
+{
+	return GetCategoryContainer() != NULL;
+}
+
+PRBool
+nsMsgGroupRecord::IsCategoryContainer()
+{
+	return (m_flags & F_CATCONT) != 0;
+}
+
+PRBool
+nsMsgGroupRecord::NeedsExtraInfo()
+{
+	return (m_flags & F_NEEDEXTRAINFO) != 0;
+}
+
+int
+nsMsgGroupRecord::SetNeedsExtraInfo(PRBool value)
+{
+	return TweakFlag(F_NEEDEXTRAINFO, value);
+}
+
+
+int
+nsMsgGroupRecord::SetIsCategoryContainer(PRBool value)
+{
+	// refuse to set a group to be a category container if it has a parent
+	// that's a category container.
+	if (! (value && GetCategoryContainer()))
+		return TweakFlag(F_CATCONT, value);
+	else
+		return 0;
+}
+
+
+nsMsgGroupRecord*
+nsMsgGroupRecord::GetCategoryContainer()
+{
+	if (IsCategoryContainer()) return NULL;
+	for (nsMsgGroupRecord* ptr = m_parent ; ptr ; ptr = ptr->m_parent) {
+		if (ptr->IsCategoryContainer()) return ptr;
+	}
+	return NULL;
+}
+
+
+nsresult
+nsMsgGroupRecord::IsVirtual(PRBool *retval)
+{
+	*retval =( (m_flags & F_VIRTUAL) != 0);
+    return NS_OK;
+}
+
+nsresult
+nsMsgGroupRecord::SetIsVirtual(PRBool value)
+{
+	TweakFlag(F_VIRTUAL, value);
+    return NS_OK;
+}
+
+
+
+PRBool
+nsMsgGroupRecord::IsExpanded()
+{
+	return (m_flags & F_EXPANDED) != 0;
+}
+
+int
+nsMsgGroupRecord::SetIsExpanded(PRBool value)
+{
+	return TweakFlag(F_EXPANDED, value);
+}
+
+
+PRBool
+nsMsgGroupRecord::IsHTMLOKGroup()
+{
+	return (m_flags & F_HTMLOKGROUP) != 0;
+}
+
+int
+nsMsgGroupRecord::SetIsHTMLOKGroup(PRBool value)
+{
+	return TweakFlag(F_HTMLOKGROUP, value);
+}
+
+
+
+PRBool
+nsMsgGroupRecord::IsHTMLOKTree()
+{
+	return (m_flags & F_HTMLOKTREE) != 0;
+}
+
+int
+nsMsgGroupRecord::SetIsHTMLOKTree(PRBool value)
+{
+	return TweakFlag(F_HTMLOKTREE, value);
+}
+
+
+
+PRBool
+nsMsgGroupRecord::IsGroup()
+{
+	return (m_flags & F_ISGROUP) != 0;
+}
+
+int
+nsMsgGroupRecord::SetIsGroup(PRBool value)
+{
+	return TweakFlag(F_ISGROUP, value);
+}
+
+
+PRBool
+nsMsgGroupRecord::IsDescendentsLoaded()
+{
+	return (m_flags & F_DESCENDENTSLOADED) != 0;
+}
+
+
+int
+nsMsgGroupRecord::SetIsDescendentsLoaded(PRBool value)
+{
+	PR_ASSERT(value);			// No reason we'd ever unset this.
+	TweakFlag(F_DESCENDENTSLOADED, PR_TRUE);
+	nsMsgGroupRecord* child;
+	for (child = m_children ; child ; child = child->m_sibling) {
+		child->SetIsDescendentsLoaded(value);
+	}
+	return 0;
+}
+
+PRBool nsMsgGroupRecord::DoesNotExistOnServer()
+{
+	return (m_flags & F_DOESNOTEXIST) != 0;
+}
+
+int nsMsgGroupRecord::SetDoesNotExistOnServer(PRBool value)
+{
+	if (value)		// turn off group flag if doesn't exist on server.
+		TweakFlag(F_ISGROUP, PR_FALSE);
+	return TweakFlag(F_DOESNOTEXIST, value);
+}
+
+int
+nsMsgGroupRecord::TweakFlag(PRUint32 flagbit, PRBool value)
+{
+	if (value) {
+		if (!(m_flags & flagbit)) {
+			m_flags |= flagbit;
+			if (flagbit & ~RUNTIMEFLAGS)
+				m_flags |= F_DIRTY;
+			return 1;
+		}
+	} else {
+		if (m_flags & flagbit) {
+			m_flags &= ~flagbit;
+			if (flagbit & ~RUNTIMEFLAGS)
+				m_flags |= F_DIRTY;
+			return 1;
+		}
+	}
+	return 0;
+}
+
+
+PRInt32
+nsMsgGroupRecord::GetNumKids()
+{
+	PRInt32 result = 0;
+	nsMsgGroupRecord* child;
+	for (child = m_children ; child ; child = child->m_sibling) {
+		if (IsIMAPGroupRecord())
+			result++;
+		else
+			if (child->m_flags & F_ISGROUP) result++;
+
+		if (!IsIMAPGroupRecord())
+			result += child->GetNumKids();
+	}
+	return result;
+}
+
+
+
+
+char*
+nsMsgGroupRecord::GetSaveString()
+{
+	char* pretty = NULL;
+	char* result = nsnull;
+	
+	if (m_prettyname) {
+		pretty = nsEscape(m_prettyname, url_XAlphas);
+		if (!pretty) return NULL;
+	}
+	char* fullname = GetFullName();
+	if (!fullname) return NULL; {
+		long nAddTime;
+		LL_L2I(nAddTime, m_addtime);
+        result = PR_smprintf("%s,%s,%lx,%lx,%lx" MSG_LINEBREAK,
+							   fullname, pretty ? pretty : "",
+							   (long) (m_flags & ~RUNTIMEFLAGS),
+							   nAddTime,
+							   (long) m_uniqueId);
+	}
+	delete [] fullname;
+	if (pretty) nsCRT::free(pretty);
+	m_flags &= ~F_DIRTY;
+	return result;
+}
+
+
+PRBool
+nsMsgGroupRecord::IsDirty()
+{
+	return (m_flags & F_DIRTY) != 0;
+}
+
+
+PRInt32
+nsMsgGroupRecord::GetDepth()
+{
+	PRInt32 result = 0;
+	nsMsgGroupRecord* tmp = m_parent;
+	while (tmp) {
+		tmp = tmp->m_parent;
+		result++;
+	}
+	return result;
+}
+
+
+
+
+nsMsgGroupRecord*
+nsMsgGroupRecord::Create(nsMsgGroupRecord* parent, const char* saveline,
+						PRInt32 savelinelength, PRInt32 fileoffset)
+{
+	char* tmp;
+	char* ptr;
+	char* endptr;
+	char* partname;
+	char* prettyname;
+	PRInt32 flags;
+	PRInt32 addtime;
+	PRInt32 uniqueid;
+	nsMsgGroupRecord* result = NULL;
+
+	if (savelinelength < 0) savelinelength = PL_strlen(saveline);
+	tmp = (char*) PR_Malloc(savelinelength + 1);
+	if (!tmp) return NULL;
+	PL_strncpy(tmp, saveline, savelinelength);
+	tmp[savelinelength] = '\0';
+	ptr = PL_strchr(tmp, ',');
+	PR_ASSERT(ptr);
+	if (!ptr) goto FAIL;
+	*ptr++ = '\0';
+	partname = PL_strrchr(tmp, '.');
+	if (!partname) partname = tmp;
+	else partname++;
+
+#ifdef DEBUG_slowAndParanoid
+	if (parent->m_partname) {
+		char* parentname = parent->GetFullName();
+		PR_ASSERT(partname > tmp && partname[-1] == '.');
+		partname[-1] = '\0';
+		PR_ASSERT(PL_strcmp(parentname, tmp) == 0);
+		partname[-1] = '.';
+		delete [] parentname;
+		parentname = NULL;
+	} else {
+		PR_ASSERT(partname == tmp);
+	}
+#endif
+
+	endptr = PL_strchr(ptr, ',');
+	PR_ASSERT(endptr);
+	if (!endptr) goto FAIL;
+	*endptr++ = '\0';
+	prettyname = nsUnescape(ptr);
+
+	ptr = endptr;
+	endptr = PL_strchr(ptr, ',');
+	PR_ASSERT(endptr);
+	if (!endptr) goto FAIL;
+	*endptr++ = '\0';
+	flags = strtol(ptr, NULL, 16);
+
+	ptr = endptr;
+	endptr = PL_strchr(ptr, ',');
+	PR_ASSERT(endptr);
+	if (!endptr) goto FAIL;
+	*endptr++ = '\0';
+	addtime = strtol(ptr, NULL, 16);
+
+	ptr = endptr;
+	uniqueid = strtol(ptr, NULL, 16);
+
+	PRInt64 llAddtime;
+	LL_I2L(llAddtime, addtime);
+	result = Create(parent, partname, llAddtime, uniqueid, fileoffset);
+	if (result) {
+		PRBool maybeCategoryContainer = flags & F_CATCONT;
+		flags &= ~F_CATCONT;
+		result->m_flags = flags;
+		if (maybeCategoryContainer)
+			result->SetIsCategoryContainer(PR_TRUE);
+		if (prettyname && *prettyname) result->SetPrettyName(prettyname);
+	}
+
+FAIL:
+	PR_Free(tmp);
+	return result;
+	
+}
+
+
+

mozilla/mailnews/base/util/nsMsgGroupRecord.h

@@ -0,0 +1,160 @@
+/* -*- 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.
+ */
+
+// This class should only be used by the subscribe UI and by newshost.cpp.
+// And, well, a bit by the category code.  Everyone else should use the stuff
+// in newshost.h.
+
+#ifndef _nsMsgGroupRecord_h_
+#define _nsMsgGroupRecord_h__
+
+#include "msgCore.h"
+#include "prtypes.h"
+#include "nsISupports.h"
+
+class nsIMAPGroupRecord;
+
+class NS_MSG_BASE nsMsgGroupRecord {
+public:
+	static nsMsgGroupRecord* Create(nsMsgGroupRecord* parent,
+								   const char* partname,
+                                   PRInt64 m_addtime,
+								   PRInt32 uniqueid,
+								   PRInt32 fileoffset);
+	static nsMsgGroupRecord* Create(nsMsgGroupRecord* parent,
+								   const char* saveline,
+								   PRInt32 savelinelength,
+								   PRInt32 fileoffset);
+
+
+	virtual void	InitializeSibling();
+	virtual PRBool IsIMAPGroupRecord() { return PR_FALSE; }
+	virtual nsIMAPGroupRecord *GetIMAPGroupRecord() { return 0; }
+	
+	// This is just like PL_strcmp(), except it works on news group names.
+	// A container groupname is always less than any contained groups.
+	// So, "netscape.devs-client-technical" > "netscape.devs.directory", even
+	// though PL_strcmp says otherwise.  (YICK!)
+	static int GroupNameCompare(const char* name1,
+								const char* name2,
+								char delimiter = '.',
+								PRBool caseInsensitive = PR_FALSE);
+
+
+	virtual ~nsMsgGroupRecord();
+
+	nsMsgGroupRecord* FindDescendant(const char* name);
+
+	nsMsgGroupRecord* GetParent() {return m_parent;}
+	nsMsgGroupRecord* GetChildren() {return m_children;}
+	nsMsgGroupRecord* GetSibling() {return m_sibling;}
+	nsMsgGroupRecord* GetSiblingOrAncestorSibling();
+	nsMsgGroupRecord* GetNextAlphabetic();
+
+	nsMsgGroupRecord* GetNextAlphabeticNoCategories();
+
+	const char* GetPartName() {return m_partname;}
+
+	// The resulting string must be free'd using delete[].
+	char* GetFullName();
+
+	const char* GetPrettyName() {return m_prettyname;}
+	int SetPrettyName(const char* prettyname);
+
+	PRInt64 GetAddTime() {return m_addtime;}
+
+	virtual PRBool IsCategory();
+	virtual PRBool IsCategoryContainer();
+	virtual int SetIsCategoryContainer(PRBool value);
+
+	nsMsgGroupRecord* GetCategoryContainer();
+
+	// Get/Set whether this is a virtual newsgroup.
+	nsresult IsVirtual(PRBool *retval);
+    nsresult SetIsVirtual(PRBool value);
+
+	// Get/Set whether this is really a newsgroup (and not just a container
+	// for newsgroups).
+	virtual PRBool IsGroup();
+	int SetIsGroup(PRBool value);
+
+	PRBool IsDescendentsLoaded();
+	int SetIsDescendentsLoaded(PRBool value);
+
+	PRBool IsExpanded();
+	int SetIsExpanded(PRBool value);
+
+	PRBool IsHTMLOKGroup();
+	int SetIsHTMLOKGroup(PRBool value);
+
+	PRBool IsHTMLOKTree();
+	int SetIsHTMLOKTree(PRBool value);
+
+	PRBool NeedsExtraInfo();
+	int SetNeedsExtraInfo(PRBool value);
+
+	PRBool DoesNotExistOnServer();
+	int SetDoesNotExistOnServer(PRBool value);
+
+	PRInt32 GetUniqueID() {return m_uniqueId;}
+
+	PRInt32 GetFileOffset() {return m_fileoffset;}
+	int SetFileOffset(PRInt32 value) {m_fileoffset = value; return 0;}
+
+	// Get the number of descendents (not including ourself) that are
+	// really newsgroups.
+	PRInt32 GetNumKids();
+
+	// Gets the string that represents this group in the save file.  The
+	// resulting string must be free'd with PR_Free().
+	char* GetSaveString();
+
+	PRBool IsDirty();			// Whether this record has had changes made
+								// to it.  Cleared by calls to GetSaveString().
+
+	PRInt32 GetDepth();			// Returns how deep in the heirarchy we are.
+								// Basically, the number of dots in the full
+								// newsgroup name, plus 1.
+	virtual char GetHierarchySeparator() { return '.'; }
+
+protected:
+	nsMsgGroupRecord(nsMsgGroupRecord* parent,
+								   const char* partname,
+								   PRInt64 m_addtime,
+								   PRInt32 uniqueid,
+								   PRInt32 fileoffset,
+								   char delimiter = '.');
+	int TweakFlag(PRUint32 flagbit, PRBool value);
+	char* SuckInName(char* ptr);
+
+	char* m_partname;
+	char* m_prettyname;
+	nsMsgGroupRecord* m_parent;
+	nsMsgGroupRecord* m_children;
+	nsMsgGroupRecord* m_sibling;
+	PRUint32 m_flags;
+	PRInt64 m_addtime;
+	PRInt32 m_uniqueId;
+	PRInt32 m_fileoffset;
+	char m_delimiter;
+};
+
+
+
+
+#endif /* _grec_h_ */

mozilla/mailnews/base/util/nsMsgI18N.cpp

@@ -0,0 +1,363 @@
+/* -*- 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.
+ */ 
+
+// as does this
+#define NS_IMPL_IDS
+#include "nsIServiceManager.h"
+#include "nsICharsetConverterManager.h"
+
+#include "nsISupports.h"
+#include "nsIPref.h"
+#include "nsIMimeConverter.h"
+#include "msgCore.h"
+#include "rosetta_mailnews.h"
+#include "nsMsgI18N.h"
+#include "nsFileSpec.h"
+#include "nsFileStream.h"
+#include "nsMsgMimeCID.h"
+#include "nsMimeTypes.h"
+#include "nsIEntityConverter.h"
+#include "nsISaveAsCharset.h"
+
+static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
+static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
+static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
+static NS_DEFINE_CID(kEntityConverterCID, NS_ENTITYCONVERTER_CID);
+static NS_DEFINE_CID(kSaveAsCharsetCID, NS_SAVEASCHARSET_CID);
+
+//
+// International functions necessary for composition
+//
+
+// Convert an unicode string to a C string with a given charset.
+nsresult ConvertFromUnicode(const nsString& aCharset, 
+                            const nsString& inString,
+                            char** outCString)
+{
+  nsresult res;
+
+  NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); 
+
+  if(NS_SUCCEEDED(res) && (nsnull != ccm)) {
+    nsIUnicodeEncoder* encoder = nsnull;
+    nsString convCharset;
+
+    // map to converter charset
+    if (aCharset.EqualsIgnoreCase("us-ascii")) {
+      convCharset.SetString("iso-8859-1");
+    }
+    else {
+      convCharset = aCharset; 
+    }
+
+    // get an unicode converter
+    res = ccm->GetUnicodeEncoder(&convCharset, &encoder);
+    if(NS_SUCCEEDED(res) && (nsnull != encoder)) {
+      PRUnichar *unichars = (PRUnichar *) inString.GetUnicode();
+      PRInt32 unicharLength = inString.Length();
+      PRInt32 dstLength;
+      res = encoder->GetMaxLength(unichars, unicharLength, &dstLength);
+      // allocale an output buffer
+      *outCString = (char *) PR_Malloc(dstLength + 1);
+      if (nsnull != *outCString) {
+        PRInt32 oldUnicharLength = unicharLength;
+        char *tempCString = *outCString;
+        PRInt32 totalCLength = 0;
+        while (1) {
+          res = encoder->Convert(unichars, &unicharLength, tempCString, &dstLength);
+
+          // increment for destination
+          tempCString += dstLength;
+          totalCLength += dstLength;
+
+          // break: this is usually the case
+          // source length <= zero and no error or unrecoverable error
+          if (0 >= unicharLength || NS_ERROR_UENC_NOMAPPING != res) {
+            break;
+          }
+          // could not map unicode to the destination charset, skip one unichar and continue
+          // increment for source unicode, skip one unichar
+          unichars += unicharLength + 1;
+          oldUnicharLength -= (unicharLength + 1);
+          unicharLength = oldUnicharLength;
+          // estimate target length again
+          (void) encoder->GetMaxLength(unichars, unicharLength, &dstLength);
+        }
+        (*outCString)[totalCLength] = '\0';
+      }
+      else {
+        res = NS_ERROR_OUT_OF_MEMORY;
+      }
+      NS_IF_RELEASE(encoder);
+    }    
+  }
+  return res;
+}
+
+// Convert a C string to an unicode string.
+nsresult ConvertToUnicode(const nsString& aCharset, 
+                          const char* inCString, 
+                          nsString& outString)
+{
+  nsresult res;
+  NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); 
+
+  if(NS_SUCCEEDED(res) && (nsnull != ccm)) {
+    nsIUnicodeDecoder* decoder = nsnull;
+    PRUnichar *unichars;
+    PRInt32 unicharLength;
+    nsString convCharset;
+
+    // map to converter charset
+    if (aCharset.EqualsIgnoreCase("us-ascii")) {
+      convCharset.SetString("iso-8859-1");
+    }
+    else {
+      convCharset = aCharset; 
+    }
+    // get an unicode converter
+    res = ccm->GetUnicodeDecoder(&convCharset, &decoder);
+    if(NS_SUCCEEDED(res) && (nsnull != decoder)) {
+      PRInt32 srcLen = PL_strlen(inCString);
+      res = decoder->GetMaxLength(inCString, srcLen, &unicharLength);
+      // allocale an output buffer
+      unichars = (PRUnichar *) PR_Malloc(unicharLength * sizeof(PRUnichar));
+      if (unichars != nsnull) {
+        // convert to unicode
+        res = decoder->Convert(inCString, &srcLen, unichars, &unicharLength);
+        outString.SetString(unichars, unicharLength);
+        PR_Free(unichars);
+      }
+      else {
+        res = NS_ERROR_OUT_OF_MEMORY;
+      }
+      NS_IF_RELEASE(decoder);
+    }    
+  }  
+  return res;
+}
+
+// Charset to be used for the internatl processing.
+const char *msgCompHeaderInternalCharset()
+{
+  // UTF-8 is a super set of us-ascii. 
+  // We can use the same string manipulation methods as us-ascii without breaking non us-ascii characters. 
+  return "UTF-8";
+}
+
+// MIME encoder, output string should be freed by PR_FREE
+char * nsMsgI18NEncodeMimePartIIStr(const char *header, const char *charset, PRBool bUseMime) 
+{
+  // No MIME, just duplicate the string.
+  if (PR_FALSE == bUseMime) {
+    return PL_strdup(header);
+  }
+
+  char *encodedString = nsnull;
+  nsIMimeConverter *converter;
+  nsresult res = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull, 
+                                           nsCOMTypeInfo<nsIMimeConverter>::GetIID(), (void **)&converter);
+  if (NS_SUCCEEDED(res) && nsnull != converter) {
+    res = converter->EncodeMimePartIIStr_UTF8(header, charset, kMIME_ENCODED_WORD_SIZE, &encodedString);
+    NS_RELEASE(converter);
+  }
+  return NS_SUCCEEDED(res) ? encodedString : nsnull;
+}
+
+// MIME decoder
+nsresult nsMsgI18NDecodeMimePartIIStr(const nsString& header, nsString& charset, nsString& decodedString)
+{
+  nsIMimeConverter *converter;
+  nsresult res = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull, 
+                                                    nsCOMTypeInfo<nsIMimeConverter>::GetIID(), (void **)&converter);
+  if (NS_SUCCEEDED(res) && nsnull != converter) {
+    res = converter->DecodeMimePartIIStr(header, charset, decodedString);
+    NS_RELEASE(converter);
+  }
+  return res;
+}
+
+// Get a default mail character set.
+char * nsMsgI18NGetDefaultMailCharset()
+{
+  nsresult res = NS_OK;
+  char * retVal = nsnull;
+  NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); 
+  if (nsnull != prefs && NS_SUCCEEDED(res))
+  {
+      char *prefValue;
+	  res = prefs->CopyCharPref("intl.character_set_name", &prefValue);
+	  
+	  if (NS_SUCCEEDED(res)) 
+	  {
+  		//TODO: map to mail charset (e.g. Shift_JIS -> ISO-2022-JP) bug#3941.
+  		 retVal = prefValue;
+	  }
+	  else 
+		  retVal = PL_strdup("iso-8859-1");
+  }
+
+  return (nsnull != retVal) ? retVal : PL_strdup("iso-8859-1");
+}
+
+// Return True if a charset is stateful (e.g. JIS).
+PRBool nsMsgI18Nstateful_charset(const char *charset)
+{
+  //TODO: use charset manager's service
+  return (PL_strcasecmp(charset, "iso-2022-jp") == 0);
+}
+
+// Check 7bit in a given buffer.
+// This is expensive (both memory and performance).
+// The check would be very simple if applied to an unicode text (e.g. nsString or utf-8).
+// Possible optimazaion is to search ESC(0x1B) in case of iso-2022-jp and iso-2022-kr.
+// Or convert and check line by line.
+PRBool nsMsgI18N7bit_data_part(const char *charset, const char *inString, const PRUint32 size)
+{
+  char *aCString;
+  nsString aCharset(charset);
+  nsString outString;
+  nsresult res;
+  
+  aCString = (char *) PR_Malloc(size + 1);
+  if (nsnull != aCString) {
+    PL_strncpy(aCString, inString, size); // make a C string
+    res = ConvertToUnicode(aCharset, aCString, outString);
+    PR_Free(aCString);
+    if (NS_SUCCEEDED(res)) {
+      for (PRInt32 i = 0; i < outString.Length(); i++) {
+        if (outString.CharAt(i) > 127) {
+          return PR_FALSE;
+        }
+      }
+    }
+  }
+  return PR_TRUE;  // all 7 bit
+}
+
+// Simple parser to parse META charset. 
+// It only supports the case when the description is within one line. 
+const char * 
+nsMsgI18NParseMetaCharset(nsFileSpec* fileSpec) 
+{ 
+  static char charset[65]; 
+  char buffer[512]; 
+  nsInputFileStream fileStream(*fileSpec); 
+
+  *charset = '\0'; 
+
+  while (!fileStream.eof() && !fileStream.failed() && 
+         fileStream.is_open()) { 
+    fileStream.readline(buffer, 512); 
+    if (*buffer == CR || *buffer == LF || *buffer == 0) 
+      continue; 
+
+    for (int i = 0; i < (int)PL_strlen(buffer); i++) { 
+      buffer[i] = toupper(buffer[i]); 
+    } 
+
+    if (PL_strstr(buffer, "/HEAD")) 
+      break; 
+
+    if (PL_strstr(buffer, "META") && 
+        PL_strstr(buffer, "HTTP-EQUIV") && 
+        PL_strstr(buffer, "CONTENT-TYPE") && 
+        PL_strstr(buffer, "CHARSET") 
+        ) 
+    { 
+      char *cp = PL_strstr(PL_strstr(buffer, "CHARSET"), "=") + 1; 
+      char seps[]   = " \"\'"; 
+      char *token; 
+      char* newStr; 
+      token = nsCRT::strtok(cp, seps, &newStr); 
+      if (token != NULL) 
+      { 
+        PL_strcpy(charset, token); 
+      } 
+    } 
+  } 
+
+  return charset; 
+} 
+
+nsresult nsMsgI18NConvertToEntity(const nsString& inString, nsString* outString)
+{
+  nsresult res;
+
+  outString->SetString("");
+  nsCOMPtr <nsIEntityConverter> entityConv;
+  res = nsComponentManager::CreateInstance(kEntityConverterCID, NULL, 
+                                           nsIEntityConverter::GetIID(), getter_AddRefs(entityConv));
+  if(NS_SUCCEEDED(res)) {
+    PRUnichar *entities = NULL;
+    res = entityConv->ConvertToEntities(inString.GetUnicode(), nsIEntityConverter::html40Latin1, &entities);
+    if (NS_SUCCEEDED(res) && (NULL != entities)) {
+      outString->SetString(entities);
+      nsAllocator::Free(entities);
+     }
+   }
+ 
+  return res;
+}
+
+nsresult nsMsgI18NSaveAsCharset(const char* contentType, const char *charset, const PRUnichar* inString, char** outString)
+{
+  NS_ASSERTION(contentType, "null ptr- contentType");
+  NS_ASSERTION(charset, "null ptr- charset");
+  NS_ASSERTION(outString, "null ptr- outString");
+  if(!contentType || !charset || !outString)
+    return NS_ERROR_NULL_POINTER;
+  *outString = NULL;
+
+  PRBool bTEXT_HTML = PR_FALSE;
+  nsresult res;
+
+  if (!nsCRT::strcasecmp(contentType, TEXT_HTML)) {
+    bTEXT_HTML = PR_TRUE;
+  }
+  else if (nsCRT::strcasecmp(contentType, TEXT_PLAIN)) {
+    return NS_ERROR_ILLEGAL_VALUE;  // not supported type
+  }
+
+  nsCOMPtr <nsISaveAsCharset> aConv;  // charset converter plus entity, NCR generation
+  res = nsComponentManager::CreateInstance(kSaveAsCharsetCID, NULL, 
+                                           nsISaveAsCharset::GetIID(), getter_AddRefs(aConv));
+  if(NS_SUCCEEDED(res)) {
+    // attribute: 
+    // html text - charset conv then fallback to entity or NCR
+    // plain text - charset conv then fallback to '?'
+    res = aConv->Init(charset, 
+                      bTEXT_HTML ? 
+                      nsISaveAsCharset::attr_EntityAfterCharsetConv + nsISaveAsCharset::attr_FallbackDecimalNCR : 
+                      nsISaveAsCharset::attr_plainTextDefault + nsISaveAsCharset::attr_FallbackQuestionMark, 
+                      nsIEntityConverter::html40);
+    if (NS_SUCCEEDED(res)) {
+      res = aConv->Convert(inString, outString);
+    }
+  }
+ 
+  return res;
+}
+
+// RICHIE - not sure about this one?? need to see what it did in the old
+// world.
+char *
+nsMsgI18NGetAcceptLanguage(void)
+{
+  return "en";
+}

mozilla/mailnews/base/util/nsMsgI18N.h

@@ -0,0 +1,49 @@
+/* -*- 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 _nsMsgI18N_H_
+#define _nsMsgI18N_H_
+
+#include "nscore.h"
+#include "msgCore.h"
+
+
+NS_MSG_BASE char      *nsMsgI18NEncodeMimePartIIStr(const char *header, const char *charset, PRBool bUseMime);
+NS_MSG_BASE PRBool    nsMsgI18Nstateful_charset(const char *charset);
+NS_MSG_BASE PRBool    nsMsgI18N7bit_data_part(const char *charset, const char *string, const PRUint32 size);
+NS_MSG_BASE char      *nsMsgI18NGetAcceptLanguage(void); 
+
+NS_MSG_BASE const char *msgCompHeaderInternalCharset(void);
+
+NS_MSG_BASE char * nsMsgI18NGetDefaultMailCharset(void);
+NS_MSG_BASE nsresult ConvertFromUnicode(const nsString& aCharset, 
+                                   const nsString& inString,
+                                   char** outCString);
+NS_MSG_BASE nsresult ConvertToUnicode(const nsString& aCharset, 
+                                 const char* inCString, 
+                                 nsString& outString);
+
+NS_MSG_BASE nsresult nsMsgI18NDecodeMimePartIIStr(const nsString& header, nsString& charset, nsString& decodedString);
+
+NS_MSG_BASE const char *nsMsgI18NParseMetaCharset(nsFileSpec* fileSpec);
+
+NS_MSG_BASE nsresult nsMsgI18NConvertToEntity(const nsString& inString, nsString* outString);
+
+NS_MSG_BASE nsresult nsMsgI18NSaveAsCharset(const char* contentType, const char* charset, const PRUnichar* inString, char** outString);
+
+#endif /* _nsMsgI18N_H_ */

mozilla/mailnews/base/util/nsMsgIdentity.cpp

@@ -0,0 +1,356 @@
+/* -*- 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.
+ */
+
+#include "msgCore.h" // for pre-compiled headers
+#include "nsMsgIdentity.h"
+#include "nsIPref.h"
+#include "nsXPIDLString.h"
+
+static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
+
+NS_IMPL_ISUPPORTS2(nsMsgIdentity,
+                   nsIMsgIdentity,
+                   nsIShutdownListener)
+
+nsMsgIdentity::nsMsgIdentity():
+  m_signature(0),
+  m_vCard(0),
+  m_identityKey(0),
+  m_prefs(0)
+{
+	NS_INIT_REFCNT();
+}
+
+nsMsgIdentity::~nsMsgIdentity()
+{
+  PR_FREEIF(m_identityKey);
+  if (m_prefs) nsServiceManager::ReleaseService(kPrefServiceCID,
+                                                m_prefs,
+                                                nsnull);
+}
+
+nsresult
+nsMsgIdentity::getPrefService()
+{
+  if (m_prefs) return NS_OK;
+  return nsServiceManager::GetService(kPrefServiceCID,
+                                      nsCOMTypeInfo<nsIPref>::GetIID(),
+                                      (nsISupports**)&m_prefs,
+                                      this);
+}
+
+
+/* called if the prefs service goes offline */
+NS_IMETHODIMP
+nsMsgIdentity::OnShutdown(const nsCID& aClass, nsISupports *service)
+{
+  if (aClass.Equals(kPrefServiceCID)) {
+    if (m_prefs) nsServiceManager::ReleaseService(kPrefServiceCID, m_prefs);
+    m_prefs = nsnull;
+  }
+
+  return NS_OK;
+}
+
+/*
+ * accessors for pulling values directly out of preferences
+ * instead of member variables, etc
+ */
+
+/* convert an identity key and preference name
+   to mail.identity.<identityKey>.<prefName>
+*/
+char *
+nsMsgIdentity::getPrefName(const char *identityKey,
+                           const char *prefName)
+{
+  return PR_smprintf("mail.identity.%s.%s", identityKey, prefName);
+}
+
+// this will be slightly faster than the above, and allows
+// the "default" identity preference root to be set in one place
+char *
+nsMsgIdentity::getDefaultPrefName(const char *fullPrefName)
+{
+  return PR_smprintf("mail.identity.default.%s", fullPrefName);
+}
+
+/* The following are equivalent to the nsIPref's Get/CopyXXXPref
+   except they construct the preference name with the above function
+*/
+nsresult
+nsMsgIdentity::getBoolPref(const char *prefname,
+                           PRBool *val)
+{
+  nsresult rv = getPrefService();
+  if (NS_FAILED(rv)) return rv;
+  
+  char *fullPrefName = getPrefName(m_identityKey, prefname);
+  rv = m_prefs->GetBoolPref(fullPrefName, val);
+  PR_Free(fullPrefName);
+
+  if (NS_FAILED(rv))
+    rv = getDefaultBoolPref(prefname, val);
+  
+  return rv;
+}
+
+nsresult
+nsMsgIdentity::getDefaultBoolPref(const char *prefname,
+                                        PRBool *val) {
+  
+  nsresult rv = getPrefService();
+  if (NS_FAILED(rv)) return rv;
+  
+  char *fullPrefName = getDefaultPrefName(prefname);
+  rv = m_prefs->GetBoolPref(fullPrefName, val);
+  PR_Free(fullPrefName);
+
+  if (NS_FAILED(rv)) {
+    *val = PR_FALSE;
+    rv = NS_OK;
+  }
+  return rv;
+}
+
+nsresult
+nsMsgIdentity::setBoolPref(const char *prefname,
+                           PRBool val)
+{
+  nsresult rv = getPrefService();
+  if (NS_FAILED(rv)) return rv;
+  
+  char *prefName = getPrefName(m_identityKey, prefname);
+  rv = m_prefs->SetBoolPref(prefName, val);
+  PR_Free(prefName);
+  return rv;
+}
+
+nsresult
+nsMsgIdentity::getCharPref(const char *prefname,
+                           char **val)
+{
+  nsresult rv = getPrefService();
+  if (NS_FAILED(rv)) return rv;
+  
+  char *fullPrefName = getPrefName(m_identityKey, prefname);
+  rv = m_prefs->CopyCharPref(fullPrefName, val);
+  PR_Free(fullPrefName);
+
+  if (NS_FAILED(rv))
+    rv = getDefaultCharPref(prefname, val);
+
+  return rv;
+}
+
+nsresult
+nsMsgIdentity::getDefaultCharPref(const char *prefname,
+                                        char **val)
+{
+  nsresult rv = getPrefService();
+  if (NS_FAILED(rv)) return rv;
+  
+  char *fullPrefName = getDefaultPrefName(prefname);
+  rv = m_prefs->CopyCharPref(fullPrefName, val);
+  PR_Free(fullPrefName);
+
+  if (NS_FAILED(rv)) {
+    *val = nsnull;              // null is ok to return here
+    rv = NS_OK;
+  }
+  return rv;
+}
+
+nsresult
+nsMsgIdentity::setCharPref(const char *prefname,
+                           const char *val)
+{
+  nsresult rv = getPrefService();
+  if (NS_FAILED(rv)) return rv;
+  
+  rv = NS_OK;
+  char *prefName = getPrefName(m_identityKey, prefname);
+  if (val) 
+    rv = m_prefs->SetCharPref(prefName, val);
+  else
+    m_prefs->ClearUserPref(prefName);
+  PR_Free(prefName);
+  return rv;
+}
+
+nsresult
+nsMsgIdentity::getIntPref(const char *prefname,
+                                PRInt32 *val)
+{
+  nsresult rv = getPrefService();
+  if (NS_FAILED(rv)) return rv;
+  
+  char *fullPrefName = getPrefName(m_identityKey, prefname);
+  rv = m_prefs->GetIntPref(fullPrefName, val);
+  PR_Free(fullPrefName);
+
+  if (NS_FAILED(rv))
+	rv = getDefaultIntPref(prefname, val);
+
+  return rv;
+}
+
+nsresult
+nsMsgIdentity::getDefaultIntPref(const char *prefname,
+                                        PRInt32 *val) {
+  
+  nsresult rv = getPrefService();
+  if (NS_FAILED(rv)) return rv;
+  
+  char *fullPrefName = getDefaultPrefName(prefname);
+  rv = m_prefs->GetIntPref(fullPrefName, val);
+  PR_Free(fullPrefName);
+
+  if (NS_FAILED(rv)) {
+    *val = 0;
+    rv = NS_OK;
+  }
+  
+  return rv;
+}
+
+nsresult
+nsMsgIdentity::setIntPref(const char *prefname,
+                                 PRInt32 val)
+{
+  nsresult rv = getPrefService();
+  if (NS_FAILED(rv)) return rv;
+  
+  char *prefName = getPrefName(m_identityKey, prefname);
+  rv = m_prefs->SetIntPref(prefName, val);
+  PR_Free(prefName);
+  return rv;
+}
+
+nsresult
+nsMsgIdentity::SetKey(const char* identityKey)
+{
+  PR_FREEIF(m_identityKey);
+  m_identityKey = PL_strdup(identityKey);
+  return NS_OK;
+}
+
+nsresult
+nsMsgIdentity::GetIdentityName(char **idName) {
+  if (!idName) return NS_ERROR_NULL_POINTER;
+
+  *idName = nsnull;
+  nsresult rv = getCharPref("identityName",idName);
+  if (NS_FAILED(rv)) return rv;
+
+  // there's probably a better way of doing this
+  // thats unicode friendly?
+  if (!(*idName)) {
+    nsXPIDLCString fullName;
+    rv = GetFullName(getter_Copies(fullName));
+    if (NS_FAILED(rv)) return rv;
+    
+    nsXPIDLCString email;
+    rv = GetEmail(getter_Copies(email));
+    if (NS_FAILED(rv)) return rv;
+    
+    *idName = PR_smprintf("%s <%s>", (const char*)fullName,
+                          (const char*)email);
+    rv = NS_OK;
+  }
+
+  return rv;
+}
+
+nsresult nsMsgIdentity::SetIdentityName(const char *idName) {
+  return setCharPref("identityName", idName);
+}
+
+NS_IMETHODIMP
+nsMsgIdentity::ToString(PRUnichar **aResult)
+{
+  nsString idname("[nsIMsgIdentity: ");
+  idname += m_identityKey;
+  idname += "]";
+
+  *aResult = idname.ToNewUnicode();
+  return NS_OK;
+}
+
+/* Identity attribute accessors */
+
+// XXX - these are a COM objects, use NS_ADDREF
+//NS_IMPL_GETSET(nsMsgIdentity, Signature, nsIMsgSignature*, m_signature);
+NS_IMETHODIMP
+nsMsgIdentity::GetSignature(nsIFileSpec **sig) {
+  nsresult rv = getPrefService();
+  if (NS_FAILED(rv)) return rv;
+  
+  char *prefName = getPrefName(m_identityKey, "sig_file");
+  rv = m_prefs->GetFilePref(prefName, sig);
+  if (NS_FAILED(rv))
+    *sig = nsnull;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMsgIdentity::SetSignature(nsIFileSpec *sig)
+{
+
+  nsresult rv = getPrefService();
+  if (NS_FAILED(rv)) return rv;
+  
+  rv = NS_OK;
+  char *prefName = getPrefName(m_identityKey, "sig_file");
+  if (sig) 
+    rv = m_prefs->SetFilePref(NS_CONST_CAST(const char*,prefName), sig,
+                              PR_FALSE);
+  /*
+  else
+    m_prefs->ClearFilePref(prefName);
+  */
+  PR_Free(prefName);
+  return rv;
+  
+  return NS_OK;
+}
+
+NS_IMPL_GETSET(nsMsgIdentity, VCard, nsIMsgVCard*, m_vCard);
+  
+NS_IMPL_GETTER_STR(nsMsgIdentity::GetKey, m_identityKey);
+
+NS_IMPL_IDPREF_STR(FullName, "fullName");
+NS_IMPL_IDPREF_STR(Email, "useremail");
+NS_IMPL_IDPREF_STR(ReplyTo, "reply_to");
+NS_IMPL_IDPREF_STR(Organization, "organization");
+NS_IMPL_IDPREF_BOOL(ComposeHtml, "compose_html");
+NS_IMPL_IDPREF_BOOL(AttachVCard, "attach_vcard");
+NS_IMPL_IDPREF_BOOL(AttachSignature, "attach_signature");
+
+NS_IMPL_IDPREF_BOOL(DoFcc, "fcc");
+NS_IMPL_IDPREF_STR(FccFolder, "fcc_folder");
+
+NS_IMPL_IDPREF_BOOL(BccSelf, "bcc_self");
+NS_IMPL_IDPREF_BOOL(BccOthers, "bcc_other");
+NS_IMPL_IDPREF_STR (BccList, "bcc_other_list");
+
+NS_IMPL_IDPREF_STR (DraftFolder, "draft_folder");
+NS_IMPL_IDPREF_STR (StationaryFolder, "stationary_folder");
+NS_IMPL_IDPREF_STR (JunkMailFolder, "spam_folder");
+
+

mozilla/mailnews/base/util/nsMsgIdentity.h

@@ -0,0 +1,110 @@
+/* -*- 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 nsMsgIdentity_h___
+#define nsMsgIdentity_h___
+
+#include "nsIMsgIdentity.h"
+#include "nsIPref.h"
+#include "msgCore.h"
+
+///////////////////////////////////////////////////////////////////////////////////
+// an identity is an object designed to encapsulate all the information we need 
+// to know about a user identity. I expect this interface to grow and change a lot
+// as we flesh out our thoughts on multiple identities and what properties go into
+// these identities.
+//////////////////////////////////////////////////////////////////////////////////
+
+
+class NS_MSG_BASE nsMsgIdentity : public nsIMsgIdentity,
+                                  public nsIShutdownListener
+{
+public:
+  nsMsgIdentity();
+  virtual ~nsMsgIdentity();
+  
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIMSGIDENTITY
+
+  // nsIShutdownListener
+  
+  NS_IMETHOD OnShutdown(const nsCID& aClass, nsISupports *service);
+  
+private:
+  nsIMsgSignature* m_signature;
+  nsIMsgVCard* m_vCard;
+  char *m_identityKey;
+  nsIPref *m_prefs;
+
+protected:
+  nsresult getPrefService();
+  char *getPrefName(const char *identityKey, const char *pref);
+  char *getDefaultPrefName(const char *pref);
+  nsresult getCharPref(const char *pref, char **);
+  nsresult getDefaultCharPref(const char *pref, char **);
+  nsresult setCharPref(const char *pref, const char *);
+
+  nsresult getBoolPref(const char *pref, PRBool *);
+  nsresult getDefaultBoolPref(const char *pref, PRBool *);
+  nsresult setBoolPref(const char *pref, PRBool);
+
+  nsresult getIntPref(const char *pref, PRInt32 *);
+  nsresult getDefaultIntPref(const char *pref, PRInt32 *);
+  nsresult setIntPref(const char *pref, PRInt32);
+
+};
+
+
+#define NS_IMPL_IDPREF_STR(_postfix, _prefname)	\
+NS_IMETHODIMP								   	\
+nsMsgIdentity::Get##_postfix(char **retval)   	\
+{											   	\
+  return getCharPref(_prefname, retval);		\
+}												\
+NS_IMETHODIMP	   								\
+nsMsgIdentity::Set##_postfix(const char *value)		\
+{												\
+  return setCharPref(_prefname, value);\
+}
+
+#define NS_IMPL_IDPREF_BOOL(_postfix, _prefname)\
+NS_IMETHODIMP								   	\
+nsMsgIdentity::Get##_postfix(PRBool *retval)   	\
+{											   	\
+  return getBoolPref(_prefname, retval);		\
+}												\
+NS_IMETHODIMP	   								\
+nsMsgIdentity::Set##_postfix(PRBool value)		\
+{												\
+  return setBoolPref(_prefname, value);			\
+}
+
+#define NS_IMPL_IDPREF_INT(_postfix, _prefname) \
+NS_IMETHODIMP								   	\
+nsMsgIdentity::Get##_postfix(PRInt32 *retval)   \
+{											   	\
+  return getIntPref(_prefname, retval);		\
+}												\
+NS_IMETHODIMP	   								\
+nsMsgIdentity::Set##_postfix(PRInt32 value)		\
+{												\
+  return setIntPref(_prefname, value);			\
+}
+
+
+#endif /* nsMsgIdentity_h___ */

mozilla/mailnews/base/util/nsMsgIncomingServer.cpp

@@ -0,0 +1,603 @@
+/* -*- 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 "nsMsgIncomingServer.h"
+#include "nscore.h"
+#include "nsCom.h"
+#include "plstr.h"
+#include "prmem.h"
+#include "prprf.h"
+
+#include "nsIServiceManager.h"
+#include "nsIPref.h"
+#include "nsCOMPtr.h"
+#include "nsIMsgFolder.h"
+#include "nsIMsgFolderCache.h"
+#include "nsIMsgFolderCacheElement.h"
+#include "nsINetSupportDialogService.h"
+#include "nsIPrompt.h"
+#include "nsXPIDLString.h"
+#include "nsIRDFService.h"
+#include "nsIMsgProtocolInfo.h"
+#include "nsRDFCID.h"
+
+static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
+static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
+static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
+
+MOZ_DECL_CTOR_COUNTER(nsMsgIncomingServer);
+
+nsMsgIncomingServer::nsMsgIncomingServer():
+    m_prefs(0),
+    m_serverKey(0),
+    m_rootFolder(0)
+{
+  MOZ_COUNT_CTOR(nsMsgIncomingServer);
+
+  NS_INIT_REFCNT();
+  m_serverBusy = PR_FALSE;
+  m_password = "";
+}
+
+nsMsgIncomingServer::~nsMsgIncomingServer()
+{
+	
+	MOZ_COUNT_DTOR(nsMsgIncomingServer);
+
+    if (m_prefs) nsServiceManager::ReleaseService(kPrefServiceCID,
+                                                  m_prefs,
+                                                  nsnull);
+    PR_FREEIF(m_serverKey)
+}
+
+NS_IMPL_ISUPPORTS1(nsMsgIncomingServer, nsIMsgIncomingServer)
+
+NS_IMPL_GETSET(nsMsgIncomingServer, ServerBusy, PRBool, m_serverBusy)
+NS_IMPL_GETTER_STR(nsMsgIncomingServer::GetKey, m_serverKey)
+
+
+NS_IMETHODIMP
+nsMsgIncomingServer::SetKey(const char * serverKey)
+{
+    nsresult rv = NS_OK;
+    // in order to actually make use of the key, we need the prefs
+    if (!m_prefs)
+        rv = nsServiceManager::GetService(kPrefServiceCID,
+                                          nsCOMTypeInfo<nsIPref>::GetIID(),
+                                          (nsISupports**)&m_prefs);
+
+    PR_FREEIF(m_serverKey);
+    m_serverKey = PL_strdup(serverKey);
+    return rv;
+}
+    
+NS_IMETHODIMP
+nsMsgIncomingServer::SetRootFolder(nsIFolder * aRootFolder)
+{
+	m_rootFolder = aRootFolder;
+	return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMsgIncomingServer::GetRootFolder(nsIFolder * *aRootFolder)
+{
+	if (!aRootFolder)
+		return NS_ERROR_NULL_POINTER;
+    if (m_rootFolder) {
+      *aRootFolder = m_rootFolder;
+      NS_ADDREF(*aRootFolder);
+    } else {
+      nsresult rv = CreateRootFolder();
+      if (NS_FAILED(rv)) return rv;
+      
+      *aRootFolder = m_rootFolder;
+      NS_IF_ADDREF(*aRootFolder);
+    }
+	return NS_OK;
+}
+  
+NS_IMETHODIMP
+nsMsgIncomingServer::PerformBiff()
+{
+	//This had to be implemented in the derived class, but in case someone doesn't implement it
+	//just return not implemented.
+	return NS_ERROR_NOT_IMPLEMENTED;	
+}
+
+NS_IMETHODIMP nsMsgIncomingServer::WriteToFolderCache(nsIMsgFolderCache *folderCache)
+{
+	nsresult rv = NS_OK;
+	if (m_rootFolder)
+	{
+		nsCOMPtr <nsIMsgFolder> msgFolder = do_QueryInterface(m_rootFolder, &rv);
+		if (NS_SUCCEEDED(rv) && msgFolder)
+			rv = msgFolder->WriteToFolderCache(folderCache);
+	}
+	return rv;
+}
+
+NS_IMETHODIMP
+nsMsgIncomingServer::CloseCachedConnections()
+{
+	// derived class should override if they cache connections.
+	return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsMsgIncomingServer::GetServerURI(char **)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+nsresult
+nsMsgIncomingServer::CreateRootFolder()
+{
+	nsresult rv;
+			  // get the URI from the incoming server
+  nsXPIDLCString serverUri;
+  rv = GetServerURI(getter_Copies(serverUri));
+  if (NS_FAILED(rv)) return rv;
+
+  NS_WITH_SERVICE(nsIRDFService, rdf,
+                        kRDFServiceCID, &rv);
+
+  // get the corresponding RDF resource
+  // RDF will create the server resource if it doesn't already exist
+  nsCOMPtr<nsIRDFResource> serverResource;
+  rv = rdf->GetResource(serverUri, getter_AddRefs(serverResource));
+  if (NS_FAILED(rv)) return rv;
+
+  // make incoming server know about its root server folder so we 
+  // can find sub-folders given an incoming server.
+  m_rootFolder = do_QueryInterface(serverResource, &rv);
+  return rv;
+}
+
+char *
+nsMsgIncomingServer::getPrefName(const char *serverKey,
+                                 const char *fullPrefName)
+{
+  return PR_smprintf("mail.server.%s.%s", serverKey, fullPrefName);
+}
+
+// this will be slightly faster than the above, and allows
+// the "default" server preference root to be set in one place
+char *
+nsMsgIncomingServer::getDefaultPrefName(const char *fullPrefName)
+{
+  return PR_smprintf("mail.server.default.%s", fullPrefName);
+}
+
+
+nsresult
+nsMsgIncomingServer::GetBoolValue(const char *prefname,
+                                 PRBool *val)
+{
+  char *fullPrefName = getPrefName(m_serverKey, prefname);
+  nsresult rv = m_prefs->GetBoolPref(fullPrefName, val);
+  PR_Free(fullPrefName);
+  
+  if (NS_FAILED(rv))
+    rv = getDefaultBoolPref(prefname, val);
+  
+  return rv;
+}
+
+nsresult
+nsMsgIncomingServer::getDefaultBoolPref(const char *prefname,
+                                        PRBool *val) {
+  
+  char *fullPrefName = getDefaultPrefName(prefname);
+  nsresult rv = m_prefs->GetBoolPref(fullPrefName, val);
+  PR_Free(fullPrefName);
+
+  if (NS_FAILED(rv)) {
+    *val = PR_FALSE;
+    rv = NS_OK;
+  }
+  return rv;
+}
+
+nsresult
+nsMsgIncomingServer::SetBoolValue(const char *prefname,
+                                 PRBool val)
+{
+  nsresult rv;
+  char *fullPrefName = getPrefName(m_serverKey, prefname);
+
+  PRBool defaultValue;
+  rv = getDefaultBoolPref(prefname, &defaultValue);
+
+  if (NS_SUCCEEDED(rv) &&
+      val == defaultValue)
+    m_prefs->ClearUserPref(fullPrefName);
+  else
+    rv = m_prefs->SetBoolPref(fullPrefName, val);
+  
+  PR_Free(fullPrefName);
+  
+  return rv;
+}
+
+nsresult
+nsMsgIncomingServer::GetIntValue(const char *prefname,
+                                PRInt32 *val)
+{
+  char *fullPrefName = getPrefName(m_serverKey, prefname);
+  nsresult rv = m_prefs->GetIntPref(fullPrefName, val);
+  PR_Free(fullPrefName);
+
+  if (NS_FAILED(rv))
+    rv = getDefaultIntPref(prefname, val);
+  
+  return rv;
+}
+
+nsresult
+nsMsgIncomingServer::GetFileValue(const char* prefname,
+                                  nsIFileSpec **spec)
+{
+  char *fullPrefName = getPrefName(m_serverKey, prefname);
+  nsresult rv = m_prefs->GetFilePref(fullPrefName, spec);
+  PR_Free(fullPrefName);
+
+  return rv;
+}
+
+nsresult
+nsMsgIncomingServer::SetFileValue(const char* prefname,
+                                    nsIFileSpec *spec)
+{
+  char *fullPrefName = getPrefName(m_serverKey, prefname);
+  nsresult rv = m_prefs->SetFilePref(fullPrefName, spec, PR_FALSE);
+  PR_Free(fullPrefName);
+
+  return rv;
+}
+
+nsresult
+nsMsgIncomingServer::getDefaultIntPref(const char *prefname,
+                                        PRInt32 *val) {
+  
+  char *fullPrefName = getDefaultPrefName(prefname);
+  nsresult rv = m_prefs->GetIntPref(fullPrefName, val);
+  PR_Free(fullPrefName);
+
+  if (NS_FAILED(rv)) {
+    *val = 0;
+    rv = NS_OK;
+  }
+  
+  return rv;
+}
+
+nsresult
+nsMsgIncomingServer::SetIntValue(const char *prefname,
+                                 PRInt32 val)
+{
+  nsresult rv;
+  char *fullPrefName = getPrefName(m_serverKey, prefname);
+  
+  PRInt32 defaultVal;
+  rv = getDefaultIntPref(prefname, &defaultVal);
+  
+  if (NS_SUCCEEDED(rv) && defaultVal == val)
+    m_prefs->ClearUserPref(fullPrefName);
+  else
+    rv = m_prefs->SetIntPref(fullPrefName, val);
+  
+  PR_Free(fullPrefName);
+  
+  return rv;
+}
+
+nsresult
+nsMsgIncomingServer::GetCharValue(const char *prefname,
+                                 char  **val)
+{
+  char *fullPrefName = getPrefName(m_serverKey, prefname);
+  nsresult rv = m_prefs->CopyCharPref(fullPrefName, val);
+  PR_Free(fullPrefName);
+  
+  if (NS_FAILED(rv))
+    rv = getDefaultCharPref(prefname, val);
+  
+  return rv;
+}
+
+nsresult
+nsMsgIncomingServer::getDefaultCharPref(const char *prefname,
+                                        char **val) {
+  
+  char *fullPrefName = getDefaultPrefName(prefname);
+  nsresult rv = m_prefs->CopyCharPref(fullPrefName, val);
+  PR_Free(fullPrefName);
+
+  if (NS_FAILED(rv)) {
+    *val = nsnull;              // null is ok to return here
+    rv = NS_OK;
+  }
+  return rv;
+}
+
+nsresult
+nsMsgIncomingServer::SetCharValue(const char *prefname,
+                                 const char * val)
+{
+  nsresult rv;
+  char *fullPrefName = getPrefName(m_serverKey, prefname);
+
+  if (!val) {
+    m_prefs->ClearUserPref(fullPrefName);
+    return NS_OK;
+  }
+  
+  char *defaultVal=nsnull;
+  rv = getDefaultCharPref(prefname, &defaultVal);
+  
+  if (NS_SUCCEEDED(rv) &&
+      PL_strcmp(defaultVal, val) == 0)
+    m_prefs->ClearUserPref(fullPrefName);
+  else
+    rv = m_prefs->SetCharPref(fullPrefName, val);
+  
+  PR_FREEIF(defaultVal);
+  PR_Free(fullPrefName);
+  
+  return rv;
+}
+
+// pretty name is the display name to show to the user
+NS_IMETHODIMP
+nsMsgIncomingServer::GetPrettyName(PRUnichar **retval) {
+
+  char *val=nsnull;
+  nsresult rv = GetCharValue("name", &val);
+  if (NS_FAILED(rv)) return rv;
+
+  nsString prettyName;
+  
+  // if there's no name, then just return the hostname
+  if (val) {
+    prettyName = val;
+  } else {
+    
+    nsXPIDLCString username;
+    rv = GetUsername(getter_Copies(username));
+    if (NS_FAILED(rv)) return rv;
+    if ((const char*)username &&
+        PL_strcmp((const char*)username, "")!=0) {
+      prettyName = username;
+      prettyName += " on ";
+    }
+    
+    nsXPIDLCString hostname;
+    rv = GetHostName(getter_Copies(hostname));
+    if (NS_FAILED(rv)) return rv;
+
+
+    prettyName += hostname;
+  }
+
+  *retval = prettyName.ToNewUnicode();
+  
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMsgIncomingServer::SetPrettyName(const PRUnichar *value) {
+  // this is lossy. Not sure what to do.
+  nsCString str(value);
+  return SetCharValue("name", str.GetBuffer());
+}
+
+NS_IMETHODIMP
+nsMsgIncomingServer::ToString(PRUnichar** aResult) {
+  nsString servername("[nsIMsgIncomingServer: ");
+  servername += m_serverKey;
+  servername += "]";
+  
+  *aResult = servername.ToNewUnicode();
+  NS_ASSERTION(*aResult, "no server name!");
+  return NS_OK;
+}
+  
+
+NS_IMETHODIMP nsMsgIncomingServer::SetPassword(const char * aPassword)
+{
+	// if remember password is turned on, write the password to preferences
+	// otherwise, just set the password so we remember it for the rest of the current
+	// session.
+
+	PRBool rememberPassword = PR_FALSE;
+	GetRememberPassword(&rememberPassword);
+	
+	if (rememberPassword)
+	{
+		SetPrefPassword((char *) aPassword);
+	}
+
+	m_password = aPassword;
+
+	return NS_OK;
+}
+
+NS_IMETHODIMP nsMsgIncomingServer::GetPassword(char ** aPassword)
+{
+	nsresult rv = NS_OK;
+	PRBool rememberPassword = PR_FALSE;
+	// okay, here's the scoop for this messs...
+	// (1) if we have a password already, go ahead and use it!
+	// (2) if remember password is turned on, try reading in from the prefs and if we have one, go ahead
+	//	   and use it
+	// (3) otherwise prompt the user for a password and then remember that password in the server
+
+	if (m_password.IsEmpty())
+	{
+
+		// case (2)
+		GetRememberPassword(&rememberPassword);
+		if (rememberPassword)
+		{
+			nsXPIDLCString password;
+			GetPrefPassword(getter_Copies(password));
+			m_password = password;
+		}
+	}
+    
+	*aPassword = m_password.ToNewCString();
+    return rv;
+}
+
+NS_IMETHODIMP
+nsMsgIncomingServer::GetPasswordWithUI(const PRUnichar * aPromptMessage, char **aPassword) 
+{
+
+    nsXPIDLCString prefvalue;
+    GetPassword(getter_Copies(prefvalue));
+
+    nsresult rv = NS_OK;
+    if (m_password.IsEmpty()) {
+		// prompt the user for the password
+		NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &rv);
+		if (NS_SUCCEEDED(rv))
+		{
+			PRUnichar * uniPassword;
+			PRBool okayValue = PR_TRUE;
+			dialog->PromptPassword(aPromptMessage, &uniPassword, &okayValue);
+				
+			if (!okayValue) // if the user pressed cancel, just return NULL;
+			{
+				*aPassword = nsnull;
+				return rv;
+			}
+
+			// we got a password back...so remember it
+			nsCString aCStr(uniPassword); 
+
+			SetPassword((const char *) aCStr);
+		} // if we got a prompt dialog
+	} // if the password is empty
+
+	*aPassword = m_password.ToNewCString();
+	return rv;
+}
+
+NS_IMETHODIMP
+nsMsgIncomingServer::SetDefaultLocalPath(nsIFileSpec *aDefaultLocalPath)
+{
+    nsresult rv;
+    nsXPIDLCString type;
+    GetType(getter_Copies(type));
+
+    nsCAutoString progid(NS_MSGPROTOCOLINFO_PROGID_PREFIX);
+    progid += type;
+
+    NS_WITH_SERVICE(nsIMsgProtocolInfo, protocolInfo, progid, &rv);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = protocolInfo->SetDefaultLocalPath(aDefaultLocalPath);
+    return rv;
+}
+
+NS_IMETHODIMP
+nsMsgIncomingServer::GetLocalPath(nsIFileSpec **aLocalPath)
+{
+    nsresult rv;
+
+    // if the local path has already been set, use it
+    rv = GetFileValue("directory", aLocalPath);
+    if (NS_SUCCEEDED(rv) && *aLocalPath) return rv;
+    
+    // otherwise, create the path using.  note we are using the
+    // server key instead of the hostname
+    //
+    // TODO:  handle the case where they migrated a server of hostname "server4"
+    // and we create a server (with the account wizard) with key "server4"
+    // we'd get a collision.
+    // need to modify the code that creates keys to check for disk collision
+    nsXPIDLCString type;
+    GetType(getter_Copies(type));
+
+    nsCAutoString progid(NS_MSGPROTOCOLINFO_PROGID_PREFIX);
+    progid += type;
+
+    NS_WITH_SERVICE(nsIMsgProtocolInfo, protocolInfo, progid, &rv);
+    if (NS_FAILED(rv)) return rv;
+    
+    nsCOMPtr<nsIFileSpec> path;
+    rv = protocolInfo->GetDefaultLocalPath(getter_AddRefs(path));
+    if (NS_FAILED(rv)) return rv;
+    
+    path->CreateDir();
+    
+    nsXPIDLCString key;
+    rv = GetKey(getter_Copies(key));
+    if (NS_FAILED(rv)) return rv;
+    rv = path->AppendRelativeUnixPath(key);
+    if (NS_FAILED(rv)) return rv;
+    rv = SetLocalPath(path);
+    if (NS_FAILED(rv)) return rv;
+
+    *aLocalPath = path;
+    NS_ADDREF(*aLocalPath);
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMsgIncomingServer::SetLocalPath(nsIFileSpec *spec)
+{
+    if (spec) {
+        spec->CreateDir();
+        return SetFileValue("directory", spec);
+    }
+    else {
+        return NS_ERROR_NULL_POINTER;
+    }
+}
+
+NS_IMETHODIMP
+nsMsgIncomingServer::SetRememberPassword(PRBool value)
+{
+    if (value)
+        SetPrefPassword(m_password);
+    else
+        SetPrefPassword(nsnull);
+    return SetBoolValue("remember_password", value);
+}
+
+NS_IMETHODIMP
+nsMsgIncomingServer::GetRememberPassword(PRBool* value)
+{
+    return GetBoolValue("remember_password", value);
+}
+
+// use the convenience macros to implement the accessors
+NS_IMPL_SERVERPREF_STR(nsMsgIncomingServer, HostName, "hostname");
+NS_IMPL_SERVERPREF_STR(nsMsgIncomingServer, Username, "userName");
+NS_IMPL_SERVERPREF_STR(nsMsgIncomingServer, PrefPassword, "password");
+NS_IMPL_SERVERPREF_BOOL(nsMsgIncomingServer, DoBiff, "check_new_mail");
+NS_IMPL_SERVERPREF_INT(nsMsgIncomingServer, BiffMinutes, "check_time");
+NS_IMPL_SERVERPREF_STR(nsMsgIncomingServer, Type, "type");
+
+/* what was this called in 4.x? */
+// pref("mail.pop3_gets_new_mail",				true);
+
+NS_IMPL_SERVERPREF_BOOL(nsMsgIncomingServer, DownloadOnBiff, "download_on_biff");

mozilla/mailnews/base/util/nsMsgIncomingServer.h

@@ -0,0 +1,70 @@
+/* -*- 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 nsMsgIncomingServer_h__
+#define nsMsgIncomingServer_h__
+
+#include "nsIMsgIncomingServer.h"
+#include "nsIPref.h"
+#include "msgCore.h"
+#include "nsIFolder.h"
+#include "nsCOMPtr.h"
+
+class nsIMsgFolderCache;
+
+/*
+ * base class for nsIMsgIncomingServer - derive your class from here
+ * if you want to get some free implementation
+ * 
+ * this particular implementation is not meant to be used directly.
+ */
+
+class NS_MSG_BASE nsMsgIncomingServer : public nsIMsgIncomingServer {
+ public:
+  nsMsgIncomingServer();
+  virtual ~nsMsgIncomingServer();
+
+  NS_DECL_ISUPPORTS
+
+  NS_DECL_NSIMSGINCOMINGSERVER
+  
+private:
+  nsIPref *m_prefs;
+  char *m_serverKey;
+  nsCString m_password;
+  PRBool m_serverBusy;
+
+protected:
+  char *getPrefName(const char *serverKey, const char *pref);
+  char *getDefaultPrefName(const char *pref);
+
+  // these are private pref getters and setters for the password
+  // field. Callers should be using Get/Set Password
+  NS_IMETHOD GetPrefPassword(char * *aPassword);
+  NS_IMETHOD SetPrefPassword(const char * aPassword);
+  
+  nsCOMPtr <nsIFolder> m_rootFolder;
+  nsresult getDefaultCharPref(const char *pref, char **);
+  nsresult getDefaultBoolPref(const char *pref, PRBool *);
+  nsresult getDefaultIntPref(const char *pref, PRInt32 *);
+  
+  nsresult CreateRootFolder();
+
+};
+
+#endif // nsMsgIncomingServer_h__

mozilla/mailnews/base/util/nsMsgKeySet.h

@@ -0,0 +1,115 @@
+/* -*- 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 _nsMsgKeySet_H_
+#define _nsMsgKeySet_H_
+
+#include "msgCore.h"
+
+// nsMsgKeySet represents a set of articles.  Typically, it is the set of
+// read articles from a .newsrc file, but it can be used for other purposes
+// too.
+
+#if 0
+// If a MSG_NewsHost* is supplied to the creation routine, then that
+// MSG_NewsHost will be notified whenever a change is made to set.
+class MSG_NewsHost;
+#endif
+
+class NS_MSG_BASE nsMsgKeySet {
+public:
+  // Creates an empty set.
+  static nsMsgKeySet* Create(/* MSG_NewsHost* host = NULL*/);
+
+  // Creates a set from the list of numbers, as might be found in a
+  // newsrc file.
+  static nsMsgKeySet* Create(const char* str/* , MSG_NewsHost* host = NULL*/);
+  ~nsMsgKeySet();
+  
+  // FirstNonMember() returns the lowest non-member of the set that is
+  // greater than 0.
+  PRInt32 FirstNonMember();
+
+  // Output() converts to a string representation suitable for writing to a
+  // .newsrc file.  (The result must be freed by the caller using delete[].)
+  char* Output();		
+
+  // IsMember() returns whether the given article is a member of this set.
+  PRBool IsMember(PRInt32 art);
+  
+  // Add() adds the given article to the set.  (Returns 1 if a change was
+  // made, 0 if it was already there, and negative on error.)
+  int Add(PRInt32 art);
+  
+  // Remove() removes the given article from the set. 
+  int Remove(PRInt32 art);
+  
+  // AddRange() adds the (inclusive) given range of articles to the set.
+  int AddRange(PRInt32 first, PRInt32 last);
+  
+  // CountMissingInRange() takes an inclusive range of articles and returns
+  // the number of articles in that range which are not in the set.
+  PRInt32 CountMissingInRange(PRInt32 start, PRInt32 end);
+  
+  // FirstMissingRange() takes an inclusive range and finds the first range
+  // of articles that are not in the set.  If none, return zeros. 
+  int FirstMissingRange(PRInt32 min, PRInt32 max, PRInt32* first, PRInt32* last);
+  
+
+  // LastMissingRange() takes an inclusive range and finds the last range
+  // of articles that are not in the set.  If none, return zeros. 
+  int LastMissingRange(PRInt32 min, PRInt32 max, PRInt32* first, PRInt32* last);
+  
+  PRInt32 GetLastMember();
+  PRInt32 GetFirstMember();
+  void  SetLastMember(PRInt32 highWaterMark);
+  // For debugging only...
+  PRInt32 getLength() {return m_length;}
+  
+#ifdef DEBUG
+  static void RunTests();
+#endif
+
+protected:
+  nsMsgKeySet(/* MSG_NewsHost* host */);
+  nsMsgKeySet(const char* /* , MSG_NewsHost* host */);
+  PRBool Grow();
+  PRBool Optimize();
+  
+#ifdef DEBUG
+  static void test_decoder(const char*);
+  static void test_adder();
+  static void test_ranges();
+  static void test_member(PRBool with_cache);
+#endif
+  
+  PRInt32 *m_data;					/* the numbers composing the `chunks' */
+  PRInt32 m_data_size;				/* size of that malloc'ed block */
+  PRInt32 m_length;				/* active area */
+  
+  PRInt32 m_cached_value;			/* a potential set member, or -1 if unset*/
+  PRInt32 m_cached_value_index;		/* the index into `data' at which a search
+									   to determine whether `cached_value' was
+									   a member of the set ended. */
+#ifdef NEWSRC_DOES_HOST_STUFF
+  MSG_NewsHost* m_host;
+#endif
+};
+
+
+#endif /* _nsMsgKeySet_H_ */

mozilla/mailnews/base/util/nsMsgLineBuffer.cpp

@@ -0,0 +1,384 @@
+/* -*- 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) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "msgCore.h"
+#include "prlog.h"
+#include "nsMsgLineBuffer.h"
+
+#include "nsIInputStream.h" // used by nsMsgLineStreamBuffer
+
+MOZ_DECL_CTOR_COUNTER(nsByteArray);
+
+nsByteArray::nsByteArray()
+{
+	MOZ_COUNT_CTOR(nsByteArray);
+	m_buffer = NULL;
+	m_bufferSize = 0;
+	m_bufferPos = 0;
+}
+
+nsByteArray::~nsByteArray()
+{
+	MOZ_COUNT_DTOR(nsByteArray);
+	PR_FREEIF(m_buffer);
+}
+
+nsresult nsByteArray::GrowBuffer(PRUint32 desired_size, PRUint32 quantum)
+{
+	if (m_bufferSize < desired_size)
+	{
+		char *new_buf;
+		PRUint32 increment = desired_size - m_bufferSize;
+		if (increment < quantum) /* always grow by a minimum of N bytes */
+			increment = quantum;
+
+
+		new_buf = (m_buffer
+				 ? (char *) PR_REALLOC (m_buffer, (m_bufferSize + increment))
+				 : (char *) PR_MALLOC (m_bufferSize + increment));
+		if (! new_buf)
+			return NS_ERROR_OUT_OF_MEMORY;
+		m_buffer = new_buf;
+		m_bufferSize += increment;
+	}
+  return 0;
+}
+
+nsresult nsByteArray::AppendString(const char *string)
+{
+	PRUint32 strLength = (string) ? PL_strlen(string) : 0;
+	return AppendBuffer(string, strLength);
+
+}
+
+nsresult nsByteArray::AppendBuffer(const char *buffer, PRUint32 length)
+{
+	nsresult ret = NS_OK;
+	if (m_bufferPos + length > m_bufferSize)
+		ret = GrowBuffer(m_bufferPos + length, 1024);
+	if (ret == NS_OK)
+	{
+		memcpy(m_buffer + m_bufferPos, buffer, length);
+		m_bufferPos += length;
+	}
+	return ret;
+}
+
+MOZ_DECL_CTOR_COUNTER(nsMsgLineBuffer);
+
+nsMsgLineBuffer::nsMsgLineBuffer(nsMsgLineBufferHandler *handler, PRBool convertNewlinesP)
+{
+	MOZ_COUNT_CTOR(nsMsgLineBuffer);
+	m_handler = handler;
+	m_convertNewlinesP = convertNewlinesP;
+    m_lookingForCRLF = PR_TRUE;
+}
+
+nsMsgLineBuffer::~nsMsgLineBuffer()
+{
+	MOZ_COUNT_DTOR(nsMsgLineBuffer);
+}
+
+void
+nsMsgLineBuffer::SetLookingForCRLF(PRBool b)
+{
+  m_lookingForCRLF = b;
+}
+
+PRInt32	nsMsgLineBuffer::BufferInput(const char *net_buffer, PRInt32 net_buffer_size)
+{
+    int status = 0;
+    if (m_bufferPos > 0 && m_buffer && m_buffer[m_bufferPos - 1] == CR &&
+        net_buffer_size > 0 && net_buffer[0] != LF) {
+        /* The last buffer ended with a CR.  The new buffer does not start
+           with a LF.  This old buffer should be shipped out and discarded. */
+        PR_ASSERT(m_bufferSize > m_bufferPos);
+        if (m_bufferSize <= m_bufferPos) return -1;
+        status = ConvertAndSendBuffer();
+        if (status < 0) 
+			return status;
+        m_bufferPos = 0;
+    }
+    while (net_buffer_size > 0)
+	{
+        const char *net_buffer_end = net_buffer + net_buffer_size;
+        const char *newline = 0;
+        const char *s;
+        
+        
+        for (s = net_buffer; s < net_buffer_end; s++)
+		{
+          if (m_lookingForCRLF) {
+            /* Move forward in the buffer until the first newline.
+               Stop when we see CRLF, CR, or LF, or the end of the buffer.
+               *But*, if we see a lone CR at the *very end* of the buffer,
+               treat this as if we had reached the end of the buffer without
+               seeing a line terminator.  This is to catch the case of the
+               buffers splitting a CRLF pair, as in "FOO\r\nBAR\r" "\nBAZ\r\n".
+            */
+            if (*s == CR || *s == LF) {
+              newline = s;
+              if (newline[0] == CR) {
+                if (s == net_buffer_end - 1) {
+                  /* CR at end - wait for the next character. */
+                  newline = 0;
+                  break;
+                }
+                else if (newline[1] == LF) {
+                  /* CRLF seen; swallow both. */
+                  newline++;
+                }
+              }
+              newline++;
+              break;
+			}
+          }
+          else {
+            /* if not looking for a CRLF, stop at CR or LF.  (for example, when parsing the newsrc file).  this fixes #9896, where we'd lose the last line of anything we'd parse that used CR as the line break. */
+            if (*s == CR || *s == LF) {
+              newline = s;
+              newline++;
+              break;
+            }
+          }
+		}
+        
+        /* Ensure room in the net_buffer and append some or all of the current
+           chunk of data to it. */
+        {
+            const char *end = (newline ? newline : net_buffer_end);
+            PRUint32 desired_size = (end - net_buffer) + m_bufferPos + 1;
+            
+            if (desired_size >= m_bufferSize)
+            {
+                status = GrowBuffer (desired_size, 1024);
+                if (status < 0) 
+					return status;
+            }
+            memcpy (m_buffer + m_bufferPos, net_buffer, (end - net_buffer));
+            m_bufferPos += (end - net_buffer);
+        }
+        
+        /* Now m_buffer contains either a complete line, or as complete
+           a line as we have read so far.
+           
+           If we have a line, process it, and then remove it from `m_buffer'.
+           Then go around the loop again, until we drain the incoming data.
+           */
+        if (!newline)
+            return 0;
+        
+        status = ConvertAndSendBuffer();
+        if (status < 0) return status;
+        
+        net_buffer_size -= (newline - net_buffer);
+        net_buffer = newline;
+        m_bufferPos = 0;
+	}
+#ifdef DEBUG_bienvenu
+	printf("returning from buffer input m_bufferPos = %ld\n", m_bufferPos);
+#endif	
+    return 0;
+}
+
+PRInt32 nsMsgLineBuffer::HandleLine(char *line, PRUint32 line_length)
+{
+	NS_ASSERTION(PR_FALSE, "must override this method if you don't provide a handler");
+	return 0;
+}
+
+PRInt32 nsMsgLineBuffer::ConvertAndSendBuffer()
+{
+    /* Convert the line terminator to the native form.
+     */
+
+	char *buf = m_buffer;
+	PRInt32 length = m_bufferPos;
+
+    char* newline;
+    
+    PR_ASSERT(buf && length > 0);
+    if (!buf || length <= 0) 
+		return -1;
+    newline = buf + length;
+    
+    PR_ASSERT(newline[-1] == CR || newline[-1] == LF);
+    if (newline[-1] != CR && newline[-1] != LF)
+		return -1;
+    
+    if (!m_convertNewlinesP)
+	{
+	}
+#if (MSG_LINEBREAK_LEN == 1)
+    else if ((newline - buf) >= 2 &&
+             newline[-2] == CR &&
+             newline[-1] == LF)
+	{
+        /* CRLF -> CR or LF */
+        buf [length - 2] = MSG_LINEBREAK[0];
+        length--;
+	}
+    else if (newline > buf + 1 &&
+             newline[-1] != MSG_LINEBREAK[0])
+	{
+        /* CR -> LF or LF -> CR */
+        buf [length - 1] = MSG_LINEBREAK[0];
+	}
+#else
+    else if (((newline - buf) >= 2 && newline[-2] != CR) ||
+             ((newline - buf) >= 1 && newline[-1] != LF))
+	{
+        /* LF -> CRLF or CR -> CRLF */
+        length++;
+        buf[length - 2] = MSG_LINEBREAK[0];
+        buf[length - 1] = MSG_LINEBREAK[1];
+	}
+#endif
+    
+    return (m_handler) ? m_handler->HandleLine(buf, length) : HandleLine(buf, length);
+}
+
+// If there's still some data (non CRLF terminated) flush it out
+PRInt32 nsMsgLineBuffer::FlushLastLine()
+{
+	char *buf = m_buffer + m_bufferPos;
+	PRInt32 length = m_bufferPos - 1;
+	if (length > 0)
+		return (m_handler) ? m_handler->HandleLine(buf, length) : HandleLine(buf, length);
+	else
+		return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// This is a utility class used to efficiently extract lines from an input stream by buffering
+// read but unprocessed stream data in a buffer. 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+nsMsgLineStreamBuffer::nsMsgLineStreamBuffer(PRUint32 aBufferSize, const char * aEndOfLineToken, 
+											 PRBool aAllocateNewLines, PRBool aEatCRLFs) 
+											: m_eatCRLFs(aEatCRLFs), m_allocateNewLines(aAllocateNewLines),
+											  m_endOfLineToken(aEndOfLineToken)
+{
+	NS_PRECONDITION(aBufferSize > 0, "invalid buffer size!!!");
+	m_dataBuffer = nsnull;
+	m_startPos = nsnull;
+
+	// used to buffer incoming data by ReadNextLineFromInput
+	if (aBufferSize > 0)
+	{
+		m_dataBuffer = (char *) PR_CALLOC(sizeof(char) * aBufferSize);
+		m_startPos = m_dataBuffer;
+	}
+
+	m_dataBufferSize = aBufferSize;
+}
+
+nsMsgLineStreamBuffer::~nsMsgLineStreamBuffer()
+{
+	PR_FREEIF(m_dataBuffer); // release our buffer...
+}
+
+// the design for this method has an inherit bug: if the length of the line is greater than the size of m_dataBufferSize, 
+// then we'll never find the next line because we can't hold the whole line in memory. 
+// aInputStream - the input stream we want to read a line from
+// aPauseForMoreData is returned as PR_TRUE if the stream does not yet contain a line and we must wait for more
+// data to come into the stream.
+
+// Note to people wishing to modify this function: Be *VERY CAREFUL* this is a critical function used by all of
+// our mail protocols including imap, nntp, and pop. If you screw it up, you could break a lot of stuff.....
+
+char * nsMsgLineStreamBuffer::ReadNextLine(nsIInputStream * aInputStream, PRUint32 &aNumBytesInLine, PRBool &aPauseForMoreData)
+{
+	// try to extract a line from m_inputBuffer. If we don't have an entire line, 
+	// then read more bytes out from the stream. If the stream is empty then wait
+	// on the monitor for more data to come in.
+
+	NS_PRECONDITION(m_startPos && m_dataBufferSize > 0, "invalid input arguments for read next line from input");
+	
+	// initialize out values
+	aPauseForMoreData = PR_FALSE;
+	aNumBytesInLine = 0;
+	char * endOfLine = nsnull;
+
+	PRUint32 numBytesInBuffer = PL_strlen(m_startPos);
+	
+	if (numBytesInBuffer > 0) // any data in our internal buffer?
+		endOfLine = PL_strstr(m_startPos, m_endOfLineToken); // see if we already have a line ending...
+
+	// it's possible that we got here before the first time we receive data from the server
+	// so aInputStream will be nsnull...
+	if (!endOfLine && aInputStream) // get some more data from the server
+	{
+		PRUint32 numBytesInStream = 0;
+		PRUint32 numBytesCopied = 0;
+		aInputStream->Available(&numBytesInStream);
+		// if the number of bytes we want to read from the stream, is greater than the number
+		// of bytes left in our buffer, then we need to shift the start pos and its contents
+		// down to the beginning of m_dataBuffer...
+		PRUint32 numFreeBytesInBuffer = (m_dataBuffer + m_dataBufferSize) - (m_startPos + numBytesInBuffer);
+		if (numBytesInStream >= numFreeBytesInBuffer)
+		{
+			nsCRT::memcpy(m_dataBuffer, m_startPos, numBytesInBuffer);
+			m_dataBuffer[numBytesInBuffer] = '\0'; // make sure the end of the buffer is terminated
+			m_startPos = m_dataBuffer; // update the new start position
+			// update the number of free bytes in the buffer
+			numFreeBytesInBuffer = m_dataBufferSize - numBytesInBuffer;
+		}
+
+		PRUint32 numBytesToCopy = PR_MIN(numFreeBytesInBuffer - 1 /* leave one for a null terminator */, numBytesInStream);
+		// read the data into the end of our data buffer
+		if (numBytesToCopy > 0)
+		{
+			aInputStream->Read(m_startPos + numBytesInBuffer, numBytesToCopy, &numBytesCopied);
+			m_startPos[numBytesInBuffer + numBytesCopied] = '\0';
+		}
+
+		// okay, now that we've tried to read in more data from the stream, look for another end of line 
+		// character 
+		endOfLine = PL_strstr(m_startPos, m_endOfLineToken);
+
+	}
+
+	// okay, now check again for endOfLine.
+	if (endOfLine)
+	{
+		if (!m_eatCRLFs)
+			endOfLine += PL_strlen(m_endOfLineToken); // count for CRLF
+
+		// PR_CALLOC zeros out the allocated line
+		char* newLine = (char*) PR_CALLOC(endOfLine-m_startPos+1);
+		if (!newLine)
+			return nsnull;
+
+		nsCRT::memcpy(newLine, m_startPos, endOfLine-m_startPos); // copy the string into the new line buffer
+		aNumBytesInLine = endOfLine - m_startPos;
+
+		if (m_eatCRLFs)
+			endOfLine += PL_strlen(m_endOfLineToken); // advance past CRLF if we haven't already done so...
+
+		// now we need to update the data buffer to go past the line we just read out. 
+		if (PL_strlen(endOfLine) <= 0) // if no more data in the buffer, then just zero out the buffer...
+			m_startPos[0] = '\0';
+		else  // advance 
+			m_startPos = endOfLine; // move us up to the end of the line
+		return newLine;
+	}
+
+	aPauseForMoreData = PR_TRUE;
+	return nsnull; // if we somehow got here. we don't have another line in the buffer yet...need to wait for more data...
+}

mozilla/mailnews/base/util/nsMsgLineBuffer.h

@@ -0,0 +1,113 @@
+/* -*- 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) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef _nsMsgLineBuffer_H
+#define _nsMsgLineBuffer_H
+
+#include "msgCore.h"    // precompiled header...
+
+// I can't believe I have to have this stupid class, but I can't find
+// anything suitable (nsStrImpl might be, when its done). nsIByteBuffer
+// would do, if I had a stream for input, which I don't.
+
+class NS_MSG_BASE nsByteArray 
+{
+public:
+	nsByteArray();
+	virtual ~nsByteArray();
+	PRUint32	GetSize() {return m_bufferSize;}
+	PRUint32	GetBufferPos() {return m_bufferPos;}
+	nsresult	GrowBuffer(PRUint32 desired_size, PRUint32 quantum = 1024);
+	nsresult	AppendString(const char *string);
+	nsresult	AppendBuffer(const char *buffer, PRUint32 length);
+	void		ResetWritePos() {m_bufferPos = 0;}
+	char		*GetBuffer() {return m_buffer;}
+protected:
+	char		*m_buffer;
+	PRUint32	m_bufferSize;
+	PRUint32	m_bufferPos;	// write Pos in m_buffer - where the next byte should go.
+};
+
+
+class NS_MSG_BASE nsMsgLineBufferHandler : public nsByteArray
+{
+public:
+	virtual PRInt32 HandleLine(char *line, PRUint32 line_length) = 0;
+};
+
+class NS_MSG_BASE nsMsgLineBuffer : public nsByteArray
+{
+public:
+	nsMsgLineBuffer(nsMsgLineBufferHandler *handler, PRBool convertNewlinesP);
+
+	virtual ~nsMsgLineBuffer();
+	PRInt32	BufferInput(const char *net_buffer, PRInt32 net_buffer_size);
+	// Not sure why anyone cares, by NNTPHost seems to want to know the buf pos.
+	PRUint32	GetBufferPos() {return m_bufferPos;}
+
+	virtual PRInt32 HandleLine(char *line, PRUint32 line_length);
+	// flush last line, though it won't be CRLF terminated.
+	virtual PRInt32 FlushLastLine();
+protected:
+	nsMsgLineBuffer(PRBool convertNewlinesP);
+
+	PRInt32 ConvertAndSendBuffer();
+    void SetLookingForCRLF(PRBool b);
+
+	nsMsgLineBufferHandler *m_handler;
+	PRBool		m_convertNewlinesP;
+    PRBool      m_lookingForCRLF; 
+};
+
+// I'm adding this utility class here for lack of a better place. This utility class is similar to nsMsgLineBuffer
+// except it works from an input stream. It is geared towards efficiently parsing new lines out of a stream by storing
+// read but unprocessed bytes in a buffer. I envision the primary use of this to be our mail protocols such as imap, news and
+// pop which need to process line by line data being returned in the form of a proxied stream from the server.
+
+class nsIInputStream;
+
+class NS_MSG_BASE nsMsgLineStreamBuffer
+{
+public:
+	// aBufferSize -- size of the buffer you want us to use for buffering stream data
+	// aEndOfLinetoken -- The delimeter string to be used for determining the end of line. This 
+	//				      allows us to parse platform specific end of line endings by making it
+	//					  a parameter.
+	// aAllocateNewLines -- PR_TRUE if you want calls to ReadNextLine to allocate new memory for the line. 
+	//						if false, the char * returned is just a ptr into the buffer. Subsequent calls to
+	//						ReadNextLine will alter the data so your ptr only has a life time of a per call.
+	// aEatCRLFs  -- PR_TRUE if you don't want to see the CRLFs on the lines returned by ReadNextLine. 
+	//				 PR_FALSE if you do want to see them.
+	nsMsgLineStreamBuffer(PRUint32 aBufferSize, const char * aEndOfLineToken, PRBool aAllocateNewLines, PRBool aEatCRLFs = PR_TRUE); // specify the size of the buffer you want the class to use....
+	virtual ~nsMsgLineStreamBuffer();
+
+	// Caller must free the line returned using PR_Free
+	// aEndOfLinetoken -- delimeter used to denote the end of a line.
+	// aNumBytesInLine -- The number of bytes in the line returned
+	// aPauseForMoreData -- There is not enough data in the stream to make a line at this time...
+	char * ReadNextLine(nsIInputStream * aInputStream, PRUint32 &anumBytesInLine, PRBool &aPauseForMoreData);
+protected:
+	PRBool m_eatCRLFs;
+	PRBool m_allocateNewLines;
+	char * m_dataBuffer;
+	char * m_startPos;
+	const char * m_endOfLineToken;
+	PRUint32 m_dataBufferSize;
+};
+
+
+#endif

mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp

@@ -0,0 +1,399 @@
+/* -*- 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) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "msgCore.h"
+#include "nsMsgMailNewsUrl.h"
+#include "nsMsgBaseCID.h"
+#include "nsIMsgMailSession.h"
+#include "nsXPIDLString.h"
+
+static NS_DEFINE_CID(kUrlListenerManagerCID, NS_URLLISTENERMANAGER_CID);
+static NS_DEFINE_CID(kStandardUrlCID, NS_STANDARDURL_CID);
+static NS_DEFINE_CID(kMsgMailSessionCID, NS_MSGMAILSESSION_CID);
+
+nsMsgMailNewsUrl::nsMsgMailNewsUrl()
+{
+    NS_INIT_REFCNT();
+ 
+	// nsIURI specific state
+	m_errorMessage = nsnull;
+	m_runningUrl = PR_FALSE;
+	m_updatingFolder = PR_FALSE;
+
+	nsComponentManager::CreateInstance(kUrlListenerManagerCID, nsnull, nsCOMTypeInfo<nsIUrlListenerManager>::GetIID(), (void **) getter_AddRefs(m_urlListeners));
+	nsComponentManager::CreateInstance(kStandardUrlCID, nsnull, nsCOMTypeInfo<nsIURL>::GetIID(), (void **) getter_AddRefs(m_baseURL));
+}
+ 
+nsMsgMailNewsUrl::~nsMsgMailNewsUrl()
+{
+	PR_FREEIF(m_errorMessage);
+}
+  
+NS_IMPL_ADDREF(nsMsgMailNewsUrl);
+NS_IMPL_RELEASE(nsMsgMailNewsUrl);
+
+nsresult nsMsgMailNewsUrl::QueryInterface(const nsIID &aIID, void** aInstancePtr)
+{
+    if (NULL == aInstancePtr) {
+        return NS_ERROR_NULL_POINTER;
+    }
+    if (aIID.Equals(nsCOMTypeInfo<nsIURI>::GetIID())) {
+        *aInstancePtr = (void*) ((nsIURI*)this);
+        NS_ADDREF_THIS();
+        return NS_OK;
+    }
+	if (aIID.Equals(nsCOMTypeInfo<nsIURL>::GetIID())) {
+        *aInstancePtr = (void*) ((nsIURL*)this);
+        NS_ADDREF_THIS();
+        return NS_OK;
+    }
+	if (aIID.Equals(nsCOMTypeInfo<nsIMsgMailNewsUrl>::GetIID()))
+	{
+		*aInstancePtr = (void *) ((nsIMsgMailNewsUrl*) this);
+		NS_ADDREF_THIS();
+		return NS_OK;
+	}
+ 
+	if (aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID()))    
+	{
+		*aInstancePtr = (void *) ((nsIMsgMailNewsUrl*) this);
+		NS_ADDREF_THIS();
+		return NS_OK;
+	}
+#if defined(NS_DEBUG)
+    /*
+     * Check for the debug-only interface indicating thread-safety
+     */
+    static NS_DEFINE_IID(kIsThreadsafeIID, NS_ISTHREADSAFE_IID);
+    if (aIID.Equals(kIsThreadsafeIID)) {
+        return NS_OK;
+    }
+#endif
+    return NS_NOINTERFACE;
+}
+
+////////////////////////////////////////////////////////////////////////////////////
+// Begin nsIMsgMailNewsUrl specific support
+////////////////////////////////////////////////////////////////////////////////////
+
+nsresult nsMsgMailNewsUrl::GetUrlState(PRBool * aRunningUrl)
+{
+	if (aRunningUrl)
+		*aRunningUrl = m_runningUrl;
+
+	return NS_OK;
+}
+
+nsresult nsMsgMailNewsUrl::SetUrlState(PRBool aRunningUrl, nsresult aExitCode)
+{
+	m_runningUrl = aRunningUrl;
+	nsCOMPtr <nsIMsgStatusFeedback> statusFeedback;
+
+	if (NS_SUCCEEDED(GetStatusFeedback(getter_AddRefs(statusFeedback))) && statusFeedback)
+	{
+		if (m_runningUrl)
+			statusFeedback->StartMeteors();
+		else
+		{
+			statusFeedback->ShowProgress(0);
+			statusFeedback->StopMeteors();
+		}
+	}
+	if (m_urlListeners)
+	{
+		if (m_runningUrl)
+		{
+			m_urlListeners->OnStartRunningUrl(this);
+		}
+		else
+		{
+			m_urlListeners->OnStopRunningUrl(this, aExitCode);
+		}
+	}
+
+	return NS_OK;
+}
+
+nsresult nsMsgMailNewsUrl::RegisterListener (nsIUrlListener * aUrlListener)
+{
+	if (m_urlListeners)
+		m_urlListeners->RegisterListener(aUrlListener);
+	return NS_OK;
+}
+
+nsresult nsMsgMailNewsUrl::UnRegisterListener (nsIUrlListener * aUrlListener)
+{
+	if (m_urlListeners)
+		m_urlListeners->UnRegisterListener(aUrlListener);
+	return NS_OK;
+}
+
+nsresult nsMsgMailNewsUrl::SetErrorMessage (const char * errorMessage)
+{
+	// functionality has been moved to nsIMsgStatusFeedback
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+nsresult nsMsgMailNewsUrl::GetErrorMessage (char ** errorMessage)
+{
+	// functionality has been moved to nsIMsgStatusFeedback
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::GetServer(nsIMsgIncomingServer ** aIncomingServer)
+{
+	// mscott --> we could cache a copy of the server here....but if we did, we run
+	// the risk of leaking the server if any single url gets leaked....of course that
+	// shouldn't happen...but it could. so i'm going to look it up every time and
+	// we can look at caching it later.
+
+	nsXPIDLCString host;
+	nsXPIDLCString scheme;
+
+	nsresult rv = GetHost(getter_Copies(host));
+	rv = GetScheme(getter_Copies(scheme));
+    if (NS_SUCCEEDED(rv))
+    {
+        NS_WITH_SERVICE(nsIMsgMailSession, session, kMsgMailSessionCID, &rv); 
+        if (NS_FAILED(rv)) return rv;
+        
+        nsCOMPtr<nsIMsgAccountManager> accountManager;
+        rv = session->GetAccountManager(getter_AddRefs(accountManager));
+        if(NS_FAILED(rv)) return rv;
+        
+        nsCOMPtr<nsIMsgIncomingServer> server;
+        rv = accountManager->FindServer(GetUserName(),
+                                        host,
+                                        scheme,
+                                        aIncomingServer);
+    }
+
+    return rv;
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::SetStatusFeedback(nsIMsgStatusFeedback *aMsgFeedback)
+{
+	if (aMsgFeedback)
+		m_statusFeedback = do_QueryInterface(aMsgFeedback);
+	return NS_OK;
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::GetStatusFeedback(nsIMsgStatusFeedback **aMsgFeedback)
+{
+	nsresult rv = NS_OK;
+	// note: it is okay to return a null status feedback and not return an error
+	// it's possible the url really doesn't have status feedback
+	if (!m_statusFeedback)
+	{
+		NS_WITH_SERVICE(nsIMsgMailSession, mailSession, kMsgMailSessionCID, &rv); 
+
+		if(NS_SUCCEEDED(rv))
+			mailSession->GetTemporaryMsgStatusFeedback(getter_AddRefs(m_statusFeedback));
+	}
+	if (aMsgFeedback)
+	{
+		*aMsgFeedback = m_statusFeedback;
+		NS_IF_ADDREF(*aMsgFeedback);
+	}
+	else
+		rv = NS_ERROR_NULL_POINTER;
+	return rv;
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::GetUpdatingFolder(PRBool *aResult)
+{
+	if (!aResult)
+		return NS_ERROR_NULL_POINTER;
+	*aResult = m_updatingFolder;
+	return NS_OK;
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::SetUpdatingFolder(PRBool updatingFolder)
+{
+	m_updatingFolder = updatingFolder;
+	return NS_OK;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////
+// End nsIMsgMailNewsUrl specific support
+////////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////////
+// Begin nsIURI support
+////////////////////////////////////////////////////////////////////////////////////
+
+
+NS_IMETHODIMP nsMsgMailNewsUrl::GetSpec(char * *aSpec)
+{
+	return m_baseURL->GetSpec(aSpec);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::SetSpec(const char * aSpec)
+{
+	return m_baseURL->SetSpec(aSpec);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::GetScheme(char * *aScheme)
+{
+	return m_baseURL->GetScheme(aScheme);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::SetScheme(const char * aScheme)
+{
+	return m_baseURL->SetScheme(aScheme);
+}
+
+
+NS_IMETHODIMP nsMsgMailNewsUrl::GetPreHost(char * *aPreHost)
+{
+	return m_baseURL->GetPreHost(aPreHost);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::SetPreHost(const char * aPreHost)
+{
+	return m_baseURL->SetPreHost(aPreHost);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::GetHost(char * *aHost)
+{
+	return m_baseURL->GetHost(aHost);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::SetHost(const char * aHost)
+{
+	return m_baseURL->SetHost(aHost);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::GetPort(PRInt32 *aPort)
+{
+	return m_baseURL->GetPort(aPort);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::SetPort(PRInt32 aPort)
+{
+	return m_baseURL->SetPort(aPort);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::GetPath(char * *aPath)
+{
+	return m_baseURL->GetPath(aPath);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::SetPath(const char * aPath)
+{
+	return m_baseURL->SetPath(aPath);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::Equals(nsIURI *other, PRBool *_retval)
+{
+	return m_baseURL->Equals(other, _retval);
+}
+
+
+NS_IMETHODIMP nsMsgMailNewsUrl::Clone(nsIURI **_retval)
+{
+	return m_baseURL->Clone(_retval);
+}	
+
+NS_IMETHODIMP nsMsgMailNewsUrl::SetRelativePath(const char *i_RelativePath)
+{
+	return m_baseURL->SetRelativePath(i_RelativePath);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::GetDirectory(char * *aDirectory)
+{
+	return m_baseURL->GetDirectory(aDirectory);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::SetDirectory(const char *aDirectory)
+{
+
+	return m_baseURL->SetDirectory(aDirectory);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::GetFileName(char * *aFileName)
+{
+	return m_baseURL->GetFileName(aFileName);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::GetFileBaseName(char * *aFileBaseName)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::SetFileBaseName(const char * aFileBaseName)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::GetFileExtension(char * *aFileExtension)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::SetFileExtension(const char * aFileExtension)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::SetFileName(const char * aFileName)
+{
+	return m_baseURL->SetFileName(aFileName);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::GetParam(char * *aParam)
+{
+	return m_baseURL->GetParam(aParam);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::SetParam(const char *aParam)
+{
+	return m_baseURL->SetParam(aParam);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::GetQuery(char * *aQuery)
+{
+	return m_baseURL->GetQuery(aQuery);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::SetQuery(const char *aQuery)
+{
+	return m_baseURL->SetQuery(aQuery);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::GetRef(char * *aRef)
+{
+	return m_baseURL->GetRef(aRef);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::SetRef(const char *aRef)
+{
+	return m_baseURL->SetRef(aRef);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::GetFilePath(char **o_DirFile)
+{
+	return m_baseURL->GetFilePath(o_DirFile);
+}
+
+NS_IMETHODIMP nsMsgMailNewsUrl::SetFilePath(const char *i_DirFile)
+{
+	return m_baseURL->SetFilePath(i_DirFile);
+}
+

mozilla/mailnews/base/util/nsMsgMailNewsUrl.h

@@ -0,0 +1,66 @@
+/* -*- 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 nsMsgMailNewsUrl_h___
+#define nsMsgMailNewsUrl_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+#include "nsIUrlListener.h"
+#include "nsIUrlListenerManager.h"
+#include "nsIMsgStatusFeedback.h"
+#include "nsCOMPtr.h"
+#include "nsIMsgMailNewsUrl.h"
+#include "nsIURL.h"
+
+///////////////////////////////////////////////////////////////////////////////////
+// Okay, I found that all of the mail and news url interfaces needed to support
+// several common interfaces (in addition to those provided through nsIURI). 
+// So I decided to group them all in this implementation so we don't have to
+// duplicate the code.
+//
+//////////////////////////////////////////////////////////////////////////////////
+
+class NS_MSG_BASE nsMsgMailNewsUrl : public nsIMsgMailNewsUrl
+{
+public:
+	nsMsgMailNewsUrl();
+
+	NS_DECL_ISUPPORTS
+    NS_DECL_NSIMSGMAILNEWSURL
+    NS_DECL_NSIURI
+    NS_DECL_NSIURL
+
+protected:
+	virtual ~nsMsgMailNewsUrl();
+
+	// a helper function I needed from derived urls...
+	virtual const char * GetUserName() = 0;
+
+	nsCOMPtr<nsIURL> m_baseURL;
+	nsCOMPtr<nsIMsgStatusFeedback> m_statusFeedback;
+	char		*m_errorMessage;
+	PRBool		m_runningUrl;
+	PRBool		m_updatingFolder;
+
+	// manager of all of current url listeners....
+	nsCOMPtr<nsIUrlListenerManager> m_urlListeners;
+};
+
+
+#endif /* nsMsgMailNewsUrl_h___ */

mozilla/mailnews/base/util/nsMsgProtocol.cpp

@@ -0,0 +1,369 @@
+/* -*- 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 "msgCore.h"
+#include "nsMsgProtocol.h"
+#include "nsIMsgMailNewsUrl.h"
+#include "nsISocketTransportService.h"
+#include "nsXPIDLString.h"
+#include "nsSpecialSystemDirectory.h"
+#include "nsILoadGroup.h"
+#include "nsIIOService.h"
+
+static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
+static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
+
+NS_IMPL_ISUPPORTS3(nsMsgProtocol, nsIStreamListener, nsIStreamObserver, nsIChannel)
+
+nsMsgProtocol::nsMsgProtocol()
+{
+	NS_INIT_REFCNT();
+	m_flags = 0;
+	m_startPosition = 0;
+	m_readCount = 0;
+	m_socketIsOpen = PR_FALSE;
+		
+	m_tempMsgFileSpec = nsSpecialSystemDirectory(nsSpecialSystemDirectory::OS_TemporaryDirectory);
+	m_tempMsgFileSpec += "tempMessage.eml";
+}
+
+nsMsgProtocol::~nsMsgProtocol()
+{}
+
+nsresult nsMsgProtocol::OpenNetworkSocket(nsIURI * aURL) // open a connection on this url
+{
+	nsresult rv = NS_OK;
+	nsXPIDLCString hostName;
+	PRInt32 port = 0;
+
+	m_readCount = -1; // with socket connections we want to read as much data as arrives
+	m_startPosition = 0;
+
+    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
+
+	if (NS_SUCCEEDED(rv) && aURL)
+	{
+		aURL->GetPort(&port);
+		aURL->GetHost(getter_Copies(hostName));
+
+		rv = socketService->CreateTransport(hostName, port, nsnull, getter_AddRefs(m_channel));
+		if (NS_SUCCEEDED(rv) && m_channel)
+		{
+			m_socketIsOpen = PR_FALSE;
+			rv = SetupTransportState();
+		}
+	}
+
+	return rv;
+}
+
+nsresult nsMsgProtocol::OpenFileSocket(nsIURI * aURL, const nsFileSpec * aFileSpec, PRUint32 aStartPosition, PRInt32 aReadCount)
+{
+	// mscott - file needs to be encoded directly into aURL. I should be able to get
+	// rid of this method completely.
+
+	nsresult rv = NS_OK;
+	m_startPosition = aStartPosition;
+	m_readCount = aReadCount;
+
+    NS_WITH_SERVICE(nsIIOService, netService, kIOServiceCID, &rv);
+	if (NS_SUCCEEDED(rv) && aURL)
+	{
+		// extract the file path from the uri...
+		nsXPIDLCString filePath;
+		aURL->GetPath(getter_Copies(filePath));
+		char * urlSpec = PR_smprintf("file://%s", (const char *) filePath);
+
+		rv = netService->NewChannel("Load", urlSpec, 
+                                    nsnull,     // null base URI
+                                    nsnull,     // null load group
+                                    nsnull,     // null eventsink getter
+                                    getter_AddRefs(m_channel));
+		PR_FREEIF(urlSpec);
+
+		if (NS_SUCCEEDED(rv) && m_channel)
+		{
+			m_socketIsOpen = PR_FALSE;
+			// rv = SetupTransportState();
+		}
+	}
+
+	return rv;
+}
+
+nsresult nsMsgProtocol::SetupTransportState()
+{
+	nsresult rv = NS_OK;
+
+	if (!m_socketIsOpen && m_channel)
+	{
+		rv = m_channel->OpenOutputStream(0 /* start position */, getter_AddRefs(m_outputStream));
+
+		NS_ASSERTION(NS_SUCCEEDED(rv), "unable to create an output stream");
+		// we want to open the stream 
+	} // if m_transport
+
+	return rv;
+}
+
+nsresult nsMsgProtocol::CloseSocket()
+{
+	// release all of our socket state
+	m_socketIsOpen = PR_FALSE;
+	m_outputStream = null_nsCOMPtr();
+	m_channel = null_nsCOMPtr();
+
+	return NS_OK;
+}
+
+/*
+ * Writes the data contained in dataBuffer into the current output stream. It also informs
+ * the transport layer that this data is now available for transmission.
+ * Returns a positive number for success, 0 for failure (not all the bytes were written to the
+ * stream, etc). We need to make another pass through this file to install an error system (mscott)
+ */
+
+PRInt32 nsMsgProtocol::SendData(nsIURI * aURL, const char * dataBuffer)
+{
+	PRUint32 writeCount = 0; 
+	PRInt32 status = 0; 
+
+//	NS_PRECONDITION(m_outputStream, "oops....we don't have an output stream...how did that happen?");
+	if (dataBuffer && m_outputStream)
+	{
+		status = m_outputStream->Write(dataBuffer, PL_strlen(dataBuffer), &writeCount);
+	}
+
+	return status;
+}
+
+// Whenever data arrives from the connection, core netlib notifices the protocol by calling
+// OnDataAvailable. We then read and process the incoming data from the input stream. 
+NS_IMETHODIMP nsMsgProtocol::OnDataAvailable(nsIChannel * /* aChannel */, nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
+{
+	// right now, this really just means turn around and churn through the state machine
+	nsCOMPtr<nsIURI> uri = do_QueryInterface(ctxt);
+	return ProcessProtocolState(uri, inStr, sourceOffset, count);
+}
+
+NS_IMETHODIMP nsMsgProtocol::OnStartRequest(nsIChannel * aChannel, nsISupports *ctxt)
+{
+	nsresult rv = NS_OK;
+	nsCOMPtr <nsIMsgMailNewsUrl> aMsgUrl = do_QueryInterface(ctxt, &rv);
+	if (NS_SUCCEEDED(rv) && aMsgUrl)
+		rv = aMsgUrl->SetUrlState(PR_TRUE, NS_OK);
+
+	// if we are set up as a channel, we should notify our channel listener that we are starting...
+	// so pass in ourself as the channel and not the underlying socket or file channel the protocol
+	// happens to be using
+	if (m_channelListener)
+		rv = m_channelListener->OnStartRequest(this, m_channelContext);
+
+	return rv;
+}
+
+// stop binding is a "notification" informing us that the stream associated with aURL is going away. 
+NS_IMETHODIMP nsMsgProtocol::OnStopRequest(nsIChannel * aChannel, nsISupports *ctxt, nsresult aStatus, const PRUnichar* aMsg)
+{
+	nsresult rv = NS_OK;
+	nsCOMPtr <nsIMsgMailNewsUrl> aMsgUrl = do_QueryInterface(ctxt, &rv);
+	if (NS_SUCCEEDED(rv) && aMsgUrl)
+		rv = aMsgUrl->SetUrlState(PR_FALSE, aStatus);
+
+	// if we are set up as a channel, we should notify our channel listener that we are starting...
+	// so pass in ourself as the channel and not the underlying socket or file channel the protocol
+	// happens to be using
+	if (m_channelListener)
+		rv = m_channelListener->OnStopRequest(this, m_channelContext, aStatus, aMsg);
+
+	return rv;
+}
+
+nsresult nsMsgProtocol::LoadUrl(nsIURI * aURL, nsISupports * aConsumer)
+{
+	// okay now kick us off to the next state...
+	// our first state is a process state so drive the state machine...
+	nsresult rv = NS_OK;
+	nsCOMPtr <nsIMsgMailNewsUrl> aMsgUrl = do_QueryInterface(aURL);
+
+	if (NS_SUCCEEDED(rv))
+	{
+		rv = aMsgUrl->SetUrlState(PR_TRUE, NS_OK); // set the url as a url currently being run...
+
+    // if the url is given a stream consumer then we should use it to forward calls to...
+    if (!m_channelListener && aConsumer) // if we don't have a registered listener already
+    {
+      m_channelListener = do_QueryInterface(aConsumer);
+      if (!m_channelContext)
+        m_channelContext = do_QueryInterface(aURL);
+    }
+
+		if (!m_socketIsOpen)
+		{
+			nsCOMPtr<nsISupports> urlSupports = do_QueryInterface(aURL);
+
+			// put us in a state where we are always notified of incoming data
+			m_channel->AsyncRead(m_startPosition, m_readCount, urlSupports ,this /* stream observer */);
+			m_socketIsOpen = PR_TRUE; // mark the channel as open
+		} // if we got an event queue service
+		else  // the connection is already open so we should begin processing our new url...
+			rv = ProcessProtocolState(aURL, nsnull, 0, 0); 
+	}
+
+	return rv;
+}
+
+///////////////////////////////////////////////////////////////////////
+// The rest of this file is mostly nsIChannel mumbo jumbo stuff
+///////////////////////////////////////////////////////////////////////
+
+nsresult nsMsgProtocol::SetUrl(nsIURI * aURL)
+{
+	m_url = dont_QueryInterface(aURL);
+	return NS_OK;
+}
+
+nsresult nsMsgProtocol::SetLoadGroup(nsILoadGroup * aLoadGroup)
+{
+	m_loadGroup = dont_QueryInterface(aLoadGroup);
+	return NS_OK;
+}
+
+NS_IMETHODIMP nsMsgProtocol::GetURI(nsIURI * *aURI)
+{
+	nsresult rv = NS_OK;
+	if (aURI)
+	{
+		if (m_url)
+			rv = m_url->QueryInterface(NS_GET_IID(nsIURI), (void **) aURI);
+		else
+			*aURI = nsnull;
+	}
+	else
+		rv = NS_ERROR_NULL_POINTER;
+	return rv;
+}
+ 
+NS_IMETHODIMP nsMsgProtocol::OpenInputStream(PRUint32 startPosition, PRInt32 readCount, nsIInputStream **_retval)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMsgProtocol::OpenOutputStream(PRUint32 startPosition, nsIOutputStream **_retval)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMsgProtocol::AsyncOpen(nsIStreamObserver *observer, nsISupports* ctxt)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMsgProtocol::AsyncRead(PRUint32 startPosition, PRInt32 readCount, nsISupports *ctxt, nsIStreamListener *listener)
+{
+	// set the stream listener and then load the url
+	m_channelContext = ctxt;
+	m_channelListener = listener;
+
+	// the following load group code is completely bogus....
+	nsresult rv = NS_OK;
+	if (m_loadGroup)
+	{
+		nsCOMPtr<nsILoadGroupListenerFactory> factory;
+		//
+		// Create a load group "proxy" listener...
+		//
+		rv = m_loadGroup->GetGroupListenerFactory(getter_AddRefs(factory));
+		if (factory) 
+		{
+			nsCOMPtr<nsIStreamListener> newListener;
+			rv = factory->CreateLoadGroupListener(m_channelListener, getter_AddRefs(newListener));
+			if (NS_SUCCEEDED(rv)) 
+				m_channelListener = newListener;
+		}
+	} // if aLoadGroup
+
+	return LoadUrl(m_url, nsnull);
+}
+
+NS_IMETHODIMP nsMsgProtocol::AsyncWrite(nsIInputStream *fromStream, PRUint32 startPosition, PRInt32 writeCount, nsISupports *ctxt, nsIStreamObserver *observer)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMsgProtocol::GetLoadAttributes(nsLoadFlags *aLoadAttributes)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMsgProtocol::SetLoadAttributes(nsLoadFlags aLoadAttributes)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMsgProtocol::GetContentType(char * *aContentType)
+{
+	*aContentType = nsCRT::strdup("message/rfc822");
+	return NS_OK;
+}
+
+NS_IMETHODIMP nsMsgProtocol::GetContentLength(PRInt32 * aContentLength)
+{
+  *aContentLength = -1;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsMsgProtocol::GetOwner(nsISupports * *aPrincipal)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMsgProtocol::SetOwner(nsISupports * aPrincipal)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMsgProtocol::GetLoadGroup(nsILoadGroup * *aLoadGroup)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// From nsIRequest
+////////////////////////////////////////////////////////////////////////////////
+
+NS_IMETHODIMP nsMsgProtocol::IsPending(PRBool *result)
+{
+    *result = PR_TRUE;
+    return NS_OK; 
+}
+
+NS_IMETHODIMP nsMsgProtocol::Cancel()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMsgProtocol::Suspend()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMsgProtocol::Resume()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}

mozilla/mailnews/base/util/nsMsgProtocol.h

@@ -0,0 +1,108 @@
+/* -*- 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 nsMsgProtocol_h__
+#define nsMsgProtocol_h__
+
+#include "nsIStreamListener.h"
+#include "nsIInputStream.h"
+#include "nsIOutputStream.h"
+#include "nsIEventQueue.h"
+#include "nsIChannel.h"
+#include "nsIURL.h"
+#include "nsILoadGroup.h"
+#include "nsCOMPtr.h"
+
+// This is a helper class used to encapsulate code shared between all of the
+// mailnews protocol objects (imap, news, pop, smtp, etc.) In particular,
+// it unifies the core networking code for the protocols. My hope is that
+// this will make unification with Necko easier as we'll only have to change
+// this class and not all of the mailnews protocols.
+class NS_MSG_BASE nsMsgProtocol : public nsIStreamListener, public nsIChannel
+{
+public:
+	nsMsgProtocol();
+	virtual ~nsMsgProtocol();
+
+	NS_DECL_ISUPPORTS
+	// nsIChannel support
+	NS_DECL_NSICHANNEL
+	NS_DECL_NSIREQUEST
+  
+  NS_DECL_NSISTREAMLISTENER
+  NS_DECL_NSISTREAMOBSERVER
+
+	// LoadUrl -- A protocol typically overrides this function, sets up any local state for the url and
+	// then calls the base class which opens the socket if it needs opened. If the socket is 
+	// already opened then we just call ProcessProtocolState to start the churning process.
+	// aConsumer is the consumer for the url. It can be null if this argument is not appropriate
+	virtual nsresult LoadUrl(nsIURI * aURL, nsISupports * aConsumer = nsnull);
+
+	virtual nsresult SetUrl(nsIURI * aURL); // sometimes we want to set the url before we load it
+	virtual nsresult SetLoadGroup(nsILoadGroup * aLoadGroup);
+
+	// Flag manipulators
+	PRBool TestFlag  (PRUint32 flag) {return flag & m_flags;}
+	void   SetFlag   (PRUint32 flag) { m_flags |= flag; }
+	void   ClearFlag (PRUint32 flag) { m_flags &= ~flag; }
+
+protected:
+	// methods for opening and closing a socket with core netlib....
+	// mscott -okay this is lame. I should break this up into a file protocol and a socket based
+	// protocool class instead of cheating and putting both methods here...
+	virtual nsresult OpenNetworkSocket(nsIURI * aURL); // open a connection on this url
+	virtual nsresult OpenFileSocket(nsIURI * aURL, const nsFileSpec * aFileSpec, PRUint32 aStartPosition, PRInt32 aReadCount); // used to open a file socket connection
+
+	// a Protocol typically overrides this method. They free any of their own connection state and then
+	// they call up into the base class to free the generic connection objects
+	virtual nsresult CloseSocket(); 
+
+	virtual nsresult SetupTransportState(); // private method used by OpenNetworkSocket and OpenFileSocket
+
+	// ProcessProtocolState - This is the function that gets churned by calls to OnDataAvailable. 
+	// As data arrives on the socket, OnDataAvailable calls ProcessProtocolState.
+	
+	virtual nsresult ProcessProtocolState(nsIURI * url, nsIInputStream * inputStream, 
+									      PRUint32 sourceOffset, PRUint32 length) = 0;
+
+	// SendData -- Writes the data contained in dataBuffer into the current output stream. 
+	// It also informs the transport layer that this data is now available for transmission.
+	// Returns a positive number for success, 0 for failure (not all the bytes were written to the
+	// stream, etc). 
+	virtual PRInt32 SendData(nsIURI * aURL, const char * dataBuffer);
+
+	// Ouput stream for writing commands to the socket
+	nsCOMPtr<nsIChannel>		m_channel; 
+	nsCOMPtr<nsIOutputStream>	m_outputStream;   // this will be obtained from the transport interface
+
+	PRBool	  m_socketIsOpen; // mscott: we should look into keeping this state in the nsSocketTransport...
+							  // I'm using it to make sure I open the socket the first time a URL is loaded into the connection
+	PRUint32	m_flags; // used to store flag information
+	PRUint32	m_startPosition;
+	PRInt32		m_readCount;
+
+	nsFileSpec	m_tempMsgFileSpec;  // we currently have a hack where displaying a msg involves writing it to a temp file first
+
+	// the following is a catch all for nsIChannel related data
+	nsCOMPtr<nsIURI>  m_url; // the running url
+	nsCOMPtr<nsIStreamListener> m_channelListener;
+	nsCOMPtr<nsISupports>		m_channelContext;
+	nsCOMPtr<nsILoadGroup>		m_loadGroup;
+};
+
+#endif /* nsMsgProtocol_h__ */

mozilla/mailnews/base/util/nsMsgTxn.cpp

@@ -0,0 +1,99 @@
+/* -*- 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, 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsMsgTxn.h"
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kITransactionIID, NS_ITRANSACTION_IID);
+
+NS_IMPL_ADDREF(nsMsgTxn)
+NS_IMPL_RELEASE(nsMsgTxn)
+
+// note that aEditor is not refcounted
+nsMsgTxn::nsMsgTxn()
+{
+  NS_INIT_REFCNT();
+}
+
+nsMsgTxn::~nsMsgTxn()
+{
+}
+
+NS_IMETHODIMP nsMsgTxn::Do(void)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsMsgTxn::GetIsTransient(PRBool *aIsTransient)
+{
+  if (nsnull!=aIsTransient)
+    *aIsTransient = PR_FALSE;
+  else
+	  return NS_ERROR_NULL_POINTER;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsMsgTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMsgTxn::Write(nsIOutputStream *aOutputStream)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMsgTxn::GetUndoString(nsString *aString)
+{
+  if (nsnull!=aString)
+    *aString="Undo";
+  else
+	  return NS_ERROR_NULL_POINTER;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsMsgTxn::GetRedoString(nsString *aString)
+{
+  if (nsnull!=aString)
+    *aString="Redo";
+  else
+	  return NS_ERROR_NULL_POINTER;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMsgTxn::QueryInterface(REFNSIID aIID, void** aInstancePtr)
+{
+  if (NULL == aInstancePtr) {
+    return NS_ERROR_NULL_POINTER;
+  }
+  if (aIID.Equals(kISupportsIID)) {
+    *aInstancePtr = (void*)(nsISupports*)this;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  if (aIID.Equals(kITransactionIID)) {
+    *aInstancePtr = (void*)(nsITransaction*)this;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  *aInstancePtr = 0;
+  return NS_NOINTERFACE;
+}
+
+
+

mozilla/mailnews/base/util/nsMsgTxn.h

@@ -0,0 +1,57 @@
+/* -*- 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, 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsMsgTxn_h__
+#define nsMsgTxn_h__
+
+#include "nsITransaction.h"
+#include "msgCore.h"
+
+#define NS_MESSAGETRANSACTION_IID \
+{ /* da621b30-1efc-11d3-abe4-00805f8ac968 */ \
+    0xda621b30, 0x1efc, 0x11d3, \
+	{ 0xab, 0xe4, 0x00, 0x80, 0x5f, 0x8a, 0xc9, 0x68 } }
+/**
+ * base class for all message undo/redo transactions.
+ */
+class NS_MSG_BASE nsMsgTxn : public nsITransaction
+{
+    NS_DECL_ISUPPORTS 
+
+    nsMsgTxn();
+    virtual ~nsMsgTxn();
+
+    NS_IMETHOD Do(void);
+    
+    NS_IMETHOD Undo(void) = 0;
+    
+    NS_IMETHOD Redo(void) = 0;
+    
+    NS_IMETHOD GetIsTransient(PRBool *aIsTransient);
+
+    NS_IMETHOD Merge(PRBool *aDidMerge, nsITransaction *aTransaction);
+
+    NS_IMETHOD Write(nsIOutputStream *aOutputStream);
+
+    NS_IMETHOD GetUndoString(nsString *aString);
+
+    NS_IMETHOD GetRedoString(nsString *aString);
+
+};
+
+#endif

mozilla/mailnews/base/util/nsMsgUtils.cpp

@@ -0,0 +1,326 @@
+/* -*- 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 "msgCore.h"
+#include "nsIMessage.h"
+#include "nsIMsgHdr.h"
+#include "nsMsgUtils.h"
+#include "nsString.h"
+#include "nsFileSpec.h"
+#include "nsIServiceManager.h"
+#include "nsCOMPtr.h"
+#include "nsString.h"
+#include "nsIImapUrl.h"
+#include "nsIMailboxUrl.h"
+#include "nsINntpUrl.h"
+#include "nsMsgNewsCID.h"
+#include "nsMsgLocalCID.h"
+#include "nsMsgBaseCID.h"
+#include "nsMsgImapCID.h"
+
+static NS_DEFINE_CID(kImapUrlCID, NS_IMAPURL_CID);
+static NS_DEFINE_CID(kCMailboxUrl, NS_MAILBOXURL_CID);
+static NS_DEFINE_CID(kCNntpUrlCID, NS_NNTPURL_CID);
+
+#if defined(DEBUG_sspitzer_) || defined(DEBUG_seth_)
+#define DEBUG_NS_MsgHashIfNecessary 1
+#endif
+
+nsresult GetMessageServiceProgIDForURI(const char *uri, nsString &progID)
+{
+
+	nsresult rv = NS_OK;
+	//Find protocol
+	nsString uriStr = uri;
+	PRInt32 pos = uriStr.FindChar(':');
+	if(pos == -1)
+		return NS_ERROR_FAILURE;
+	nsString protocol;
+	uriStr.Left(protocol, pos);
+
+	//Build message service progid
+	progID = "component://netscape/messenger/messageservice;type=";
+	progID += protocol;
+
+	return rv;
+}
+
+nsresult GetMessageServiceFromURI(const char *uri, nsIMsgMessageService **messageService)
+{
+
+	nsAutoString progID;
+	nsresult rv;
+
+	rv = GetMessageServiceProgIDForURI(uri, progID);
+
+	if(NS_SUCCEEDED(rv))
+	{
+		rv = nsServiceManager::GetService((const char *) nsCAutoString(progID), nsCOMTypeInfo<nsIMsgMessageService>::GetIID(),
+		           (nsISupports**)messageService, nsnull);
+	}
+
+	return rv;
+}
+
+
+nsresult ReleaseMessageServiceFromURI(const char *uri, nsIMsgMessageService *messageService)
+{
+	nsAutoString progID;
+	nsresult rv;
+
+	rv = GetMessageServiceProgIDForURI(uri, progID);
+	if(NS_SUCCEEDED(rv))
+		rv = nsServiceManager::ReleaseService(nsCAutoString(progID), messageService);
+	return rv;
+}
+
+
+nsresult CreateStartupUrl(char *uri, nsIURI** aUrl)
+{
+    nsresult rv = NS_ERROR_NULL_POINTER;
+    if (!uri || !*uri || !aUrl) return rv;
+    *aUrl = nsnull;
+    if (PL_strncasecmp(uri, "imap", 4) == 0)
+    {
+        nsCOMPtr<nsIImapUrl> imapUrl;
+        rv = nsComponentManager::CreateInstance(kImapUrlCID, nsnull,
+                                                nsIImapUrl::GetIID(),
+                                                getter_AddRefs(imapUrl));
+        if (NS_SUCCEEDED(rv) && imapUrl)
+            rv = imapUrl->QueryInterface(nsCOMTypeInfo<nsIURI>::GetIID(),
+                                         (void**) aUrl);
+    }
+    else if (PL_strncasecmp(uri, "mailbox", 7) == 0)
+    {
+        nsCOMPtr<nsIMailboxUrl> mailboxUrl;
+        rv = nsComponentManager::CreateInstance(kCMailboxUrl, nsnull,
+                                                nsIMailboxUrl::GetIID(),
+                                                getter_AddRefs(mailboxUrl));
+        if (NS_SUCCEEDED(rv) && mailboxUrl)
+            rv = mailboxUrl->QueryInterface(nsCOMTypeInfo<nsIURI>::GetIID(),
+                                            (void**) aUrl);
+    }
+    else if (PL_strncasecmp(uri, "news", 4) == 0)
+    {
+        nsCOMPtr<nsINntpUrl> nntpUrl;
+        rv = nsComponentManager::CreateInstance(kCNntpUrlCID, nsnull,
+                                                nsINntpUrl::GetIID(),
+                                                getter_AddRefs(nntpUrl));
+        if (NS_SUCCEEDED(rv) && nntpUrl)
+            rv = nntpUrl->QueryInterface(nsCOMTypeInfo<nsIURI>::GetIID(),
+                                         (void**) aUrl);
+    }
+    if (*aUrl)
+        (*aUrl)->SetSpec(uri);
+    return rv;
+}
+
+
+NS_IMPL_ISUPPORTS(nsMessageFromMsgHdrEnumerator, nsCOMTypeInfo<nsISimpleEnumerator>::GetIID())
+
+nsMessageFromMsgHdrEnumerator::nsMessageFromMsgHdrEnumerator(nsISimpleEnumerator *srcEnumerator,
+															 nsIMsgFolder *folder)
+{
+    NS_INIT_REFCNT();
+
+	mSrcEnumerator = dont_QueryInterface(srcEnumerator);
+	mFolder = dont_QueryInterface(folder);
+
+}
+
+nsMessageFromMsgHdrEnumerator::~nsMessageFromMsgHdrEnumerator()
+{
+	//member variables are nsCOMPtr's
+}
+
+
+NS_IMETHODIMP nsMessageFromMsgHdrEnumerator::GetNext(nsISupports **aItem)
+{
+	nsCOMPtr<nsISupports> currentItem;
+	nsCOMPtr<nsIMsgDBHdr> msgDBHdr;
+	nsCOMPtr<nsIMessage> message;
+	nsresult rv;
+
+	rv = mSrcEnumerator->GetNext(getter_AddRefs(currentItem));
+	if(NS_SUCCEEDED(rv))
+	{
+		msgDBHdr = do_QueryInterface(currentItem, &rv);
+	}
+
+	if(NS_SUCCEEDED(rv))
+	{
+		rv = mFolder->CreateMessageFromMsgDBHdr(msgDBHdr, getter_AddRefs(message));
+	}
+
+	if(NS_SUCCEEDED(rv))
+	{
+		currentItem = do_QueryInterface(message, &rv);
+		*aItem = currentItem;
+		NS_IF_ADDREF(*aItem);
+	}
+
+	NS_ASSERTION(NS_SUCCEEDED(rv),"getnext shouldn't fail");
+	return rv;
+}
+
+NS_IMETHODIMP nsMessageFromMsgHdrEnumerator::HasMoreElements(PRBool *aResult)
+{
+	return mSrcEnumerator->HasMoreElements(aResult);
+}
+
+nsresult NS_NewMessageFromMsgHdrEnumerator(nsISimpleEnumerator *srcEnumerator,
+										   nsIMsgFolder *folder,	
+										   nsMessageFromMsgHdrEnumerator **messageEnumerator)
+{
+	if(!messageEnumerator)
+		return NS_ERROR_NULL_POINTER;
+
+	*messageEnumerator =	new nsMessageFromMsgHdrEnumerator(srcEnumerator, folder);
+
+	if(!messageEnumerator)
+		return NS_ERROR_OUT_OF_MEMORY;
+
+	NS_ADDREF(*messageEnumerator);
+	return NS_OK;
+
+}
+
+// Where should this live? It's a utility used to convert a string priority, e.g., "High, Low, Normal" to an enum.
+// Perhaps we should have an interface that groups together all these utilities...
+nsresult NS_MsgGetPriorityFromString(const char *priority, nsMsgPriority *outPriority)
+{
+	if (!outPriority)
+		return NS_ERROR_NULL_POINTER;
+
+	nsMsgPriority retPriority = nsMsgPriorityNormal;
+
+	if (PL_strcasestr(priority, "Normal") != NULL)
+		retPriority = nsMsgPriorityNormal;
+	else if (PL_strcasestr(priority, "Lowest") != NULL)
+		retPriority = nsMsgPriorityLowest;
+	else if (PL_strcasestr(priority, "Highest") != NULL)
+		retPriority = nsMsgPriorityHighest;
+	else if (PL_strcasestr(priority, "High") != NULL || 
+			 PL_strcasestr(priority, "Urgent") != NULL)
+		retPriority = nsMsgPriorityHigh;
+	else if (PL_strcasestr(priority, "Low") != NULL ||
+			 PL_strcasestr(priority, "Non-urgent") != NULL)
+		retPriority = nsMsgPriorityLow;
+	else if (PL_strcasestr(priority, "1") != NULL)
+		retPriority = nsMsgPriorityHighest;
+	else if (PL_strcasestr(priority, "2") != NULL)
+		retPriority = nsMsgPriorityHigh;
+	else if (PL_strcasestr(priority, "3") != NULL)
+		retPriority = nsMsgPriorityNormal;
+	else if (PL_strcasestr(priority, "4") != NULL)
+		retPriority = nsMsgPriorityLow;
+	else if (PL_strcasestr(priority, "5") != NULL)
+	    retPriority = nsMsgPriorityLowest;
+	else
+		retPriority = nsMsgPriorityNormal;
+	*outPriority = retPriority;
+	return NS_OK;
+		//return nsMsgNoPriority;
+}
+
+
+nsresult NS_MsgGetUntranslatedPriorityName (nsMsgPriority p, nsString *outName)
+{
+	if (!outName)
+		return NS_ERROR_NULL_POINTER;
+	switch (p)
+	{
+	case nsMsgPriorityNotSet:
+	case nsMsgPriorityNone:
+		*outName = "None";
+		break;
+	case nsMsgPriorityLowest:
+		*outName = "Lowest";
+		break;
+	case nsMsgPriorityLow:
+		*outName = "Low";
+		break;
+	case nsMsgPriorityNormal:
+		*outName = "Normal";
+		break;
+	case nsMsgPriorityHigh:
+		*outName = "High";
+		break;
+	case nsMsgPriorityHighest:
+		*outName = "Highest";
+		break;
+	default:
+		NS_ASSERTION(PR_FALSE, "invalid priority value");
+	}
+	return NS_OK;
+}
+
+/* this used to be XP_StringHash2 from xp_hash.c */
+/* phong's linear congruential hash  */
+static PRUint32 StringHash(const char *ubuf)
+{
+  unsigned char * buf = (unsigned char*) ubuf;
+  PRUint32 h=1;
+  while(*buf) {
+    h = 0x63c63cd9*h + 0x9c39c33d + (int32)*buf;
+    buf++;
+  }
+  return h;
+}
+
+nsresult NS_MsgHashIfNecessary(nsCAutoString &name)
+{
+#if defined(XP_WIN16) || defined(XP_OS2)
+  const PRUint32 MAX_LEN = 8;
+#elif defined(XP_MAC)
+  const PRUint32 MAX_LEN = 25;
+#elif defined(XP_UNIX) || defined(XP_PC) || defined(XP_BEOS)
+  const PRUint32 MAX_LEN = 55;
+#else
+#error need_to_define_your_max_filename_length
+#endif
+  nsCAutoString str(name);
+
+#ifdef DEBUG_NS_MsgHashIfNecessary
+  printf("in: %s\n",str.GetBuffer());
+#endif
+
+  // Given a name, use either that name, if it fits on our
+  // filesystem, or a hashified version of it, if the name is too
+  // long to fit.
+  char hashedname[MAX_LEN + 1];
+  PRBool needshash = PL_strlen(str.GetBuffer()) > MAX_LEN;
+#if defined(XP_WIN16)  || defined(XP_OS2)
+  if (!needshash) {
+    needshash = PL_strchr(str.GetBuffer(), '.') != NULL ||
+      PL_strchr(str.GetBuffer(), ':') != NULL;
+  }
+#endif
+  PL_strncpy(hashedname, str.GetBuffer(), MAX_LEN + 1);
+  if (needshash) {
+    PR_snprintf(hashedname + MAX_LEN - 8, 9, "%08lx",
+                (unsigned long) StringHash(str.GetBuffer()));
+  }
+  name = hashedname;
+#ifdef DEBUG_NS_MsgHashIfNecessary
+  printf("out: %s\n",hashedname);
+#endif
+  
+  return NS_OK;
+}
+

mozilla/mailnews/base/util/nsMsgUtils.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) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _NSMSGUTILS_H
+#define _NSMSGUTILS_H
+
+#include "nsIURL.h"
+#include "nsIMsgMessageService.h"
+#include "nsString.h"
+#include "nsIEnumerator.h"
+#include "nsIMsgFolder.h"
+#include "msgCore.h"
+#include "nsCOMPtr.h"
+
+//These are utility functions that can used throughout the mailnews code
+
+//Utilities for getting a message service.
+NS_MSG_BASE nsresult GetMessageServiceProgIDForURI(const char *uri, nsString &progID);
+//Use ReleaseMessageServiceFromURI to release the service.
+NS_MSG_BASE nsresult GetMessageServiceFromURI(const char *uri, nsIMsgMessageService **messageService);
+NS_MSG_BASE nsresult ReleaseMessageServiceFromURI(const char *uri, nsIMsgMessageService *messageService);
+
+NS_MSG_BASE nsresult CreateStartupUrl(char *uri, nsIURI** aUrl);
+
+//An enumerator for converting nsIMsgHdrs to nsIMessages.
+class NS_MSG_BASE nsMessageFromMsgHdrEnumerator: public nsISimpleEnumerator
+{
+protected:
+	nsCOMPtr<nsISimpleEnumerator> mSrcEnumerator;
+	nsCOMPtr<nsIMsgFolder> mFolder;
+
+public:
+	NS_DECL_ISUPPORTS
+	nsMessageFromMsgHdrEnumerator(nsISimpleEnumerator *srcEnumerator, nsIMsgFolder *folder);
+	nsMessageFromMsgHdrEnumerator(){} //Default constructor that does nothing so nsComPtr will work.
+	virtual ~nsMessageFromMsgHdrEnumerator();
+
+  NS_DECL_NSISIMPLEENUMERATOR
+};
+
+NS_MSG_BASE nsresult NS_NewMessageFromMsgHdrEnumerator(nsISimpleEnumerator *srcEnumerator,
+										   nsIMsgFolder *folder,	
+										   nsMessageFromMsgHdrEnumerator **messageEnumerator);
+
+NS_MSG_BASE nsresult NS_MsgGetPriorityFromString(const char *priority, nsMsgPriority *outPriority);
+
+NS_MSG_BASE nsresult NS_MsgGetUntranslatedPriorityName (nsMsgPriority p, nsString *outName);
+
+NS_MSG_BASE nsresult NS_MsgHashIfNecessary(nsCAutoString &name);
+
+#endif
+

mozilla/mailnews/base/util/nsNewsSummarySpec.cpp

@@ -0,0 +1,71 @@
+/* -*- 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) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsNewsSummarySpec.h"
+#include "plstr.h"
+#include "nsString.h"
+
+MOZ_DECL_CTOR_COUNTER(nsNewsSummarySpec);
+
+nsNewsSummarySpec::~nsNewsSummarySpec()
+{
+	MOZ_COUNT_DTOR(nsNewsSummarySpec);
+}
+
+nsNewsSummarySpec::nsNewsSummarySpec()
+{
+	MOZ_COUNT_CTOR(nsNewsSummarySpec);
+}
+
+nsNewsSummarySpec::nsNewsSummarySpec(const char *folderPath)
+  : nsFileSpec(folderPath)
+{
+	MOZ_COUNT_CTOR(nsNewsSummarySpec);
+	CreateSummaryFileName();
+}
+
+nsNewsSummarySpec::nsNewsSummarySpec(const nsFileSpec& inFolderPath)
+: nsFileSpec(inFolderPath)
+{
+	MOZ_COUNT_CTOR(nsNewsSummarySpec);
+	CreateSummaryFileName();
+}
+
+nsNewsSummarySpec::nsNewsSummarySpec(const nsFilePath &inFolderPath) : nsFileSpec(inFolderPath)
+{
+	MOZ_COUNT_CTOR(nsNewsSummarySpec);
+	CreateSummaryFileName();
+}
+
+void nsNewsSummarySpec::SetFolderName(const char *folderPath)
+{
+	*this = folderPath;
+}
+
+void nsNewsSummarySpec::CreateSummaryFileName()
+{
+	char *leafName = GetLeafName();
+
+    nsCAutoString fullLeafName((const char*)leafName);
+
+	// Append .msf (message summary file) 
+	fullLeafName += ".msf";	
+
+	SetLeafName(fullLeafName.GetBuffer());
+	PL_strfree(leafName);
+}

mozilla/mailnews/base/util/nsNewsSummarySpec.h

@@ -0,0 +1,45 @@
+/* -*- 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) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef _nsNewsSummarySpec_H
+#define _nsNewsSummarySpec_H
+
+#include "nsFileSpec.h"
+#include "msgCore.h"
+
+// Class to name a summary file for a newsgroup,
+// given a full folder file spec. 
+// Note this class expects the invoking code to fully specify the folder path. 
+// This class does NOT prepend the local folder directory, or put .sbd on the containing
+// directory names.
+class NS_MSG_BASE nsNewsSummarySpec : public nsFileSpec
+{
+public:
+  nsNewsSummarySpec();
+  nsNewsSummarySpec(const char *folderPath);
+  nsNewsSummarySpec(const nsFileSpec& inFolderPath);
+  nsNewsSummarySpec(const nsFilePath &inFolderPath);
+  ~nsNewsSummarySpec();
+  void SetFolderName(const char *folderPath);
+
+protected:
+  void	CreateSummaryFileName();
+  
+};
+
+#endif /* _nsNewsSummarySpec_H */

mozilla/mailnews/base/util/nsUInt32Array.cpp

@@ -0,0 +1,277 @@
+/* -*- 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.
+ */
+
+#include "msgCore.h"    // precompiled header...
+#include "prlog.h"
+
+#include "MailNewsTypes.h"
+#include "nsUInt32Array.h"
+#include "nsQuickSort.h"
+
+MOZ_DECL_CTOR_COUNTER(nsUInt32Array);
+
+nsUInt32Array::nsUInt32Array()
+{
+	MOZ_COUNT_CTOR(nsUInt32Array);
+	m_nSize = 0;
+	m_nMaxSize = 0;
+	m_nGrowBy = 0;
+	m_pData = NULL;
+}
+
+nsUInt32Array::~nsUInt32Array()
+{
+	MOZ_COUNT_DTOR(nsUInt32Array);
+	SetSize(0);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+PRUint32 nsUInt32Array::GetSize() const
+{
+	return m_nSize;
+}
+
+PRBool nsUInt32Array::SetSize(PRUint32 nSize,
+                              PRBool adjustGrowth,
+                              PRUint32 nGrowBy)
+{
+	if (adjustGrowth)
+		m_nGrowBy = nGrowBy;
+
+#ifdef MAX_ARR_ELEMS
+	if (nSize > MAX_ARR_ELEMS);
+	{
+		PR_ASSERT(nSize <= MAX_ARR_ELEMS); // Will fail
+		return PR_FALSE;
+	}
+#endif
+
+	if (nSize == 0)
+	{
+		// Remove all elements
+		PR_Free(m_pData);
+		m_nSize = 0;
+		m_nMaxSize = 0;
+		m_pData = NULL;
+	}
+	else if (m_pData == NULL)
+	{
+		// Create a new array
+		m_nMaxSize = PR_MAX(8, nSize);
+		m_pData = (PRUint32 *)PR_Calloc(1, m_nMaxSize * sizeof(PRUint32));
+		if (m_pData)
+			m_nSize = nSize;
+		else
+			m_nSize = m_nMaxSize = 0;
+	}
+	else if (nSize <= m_nMaxSize)
+	{
+		// The new size is within the current maximum size, make sure new
+		// elements are to initialized to zero
+		if (nSize > m_nSize)
+			nsCRT::memset(&m_pData[m_nSize], 0, (nSize - m_nSize) * sizeof(PRUint32));
+
+		m_nSize = nSize;
+	}
+	else
+	{
+		// The array needs to grow, figure out how much
+		PRUint32 nMaxSize;
+		nGrowBy  = PR_MAX(m_nGrowBy, PR_MIN(1024, PR_MAX(8, m_nSize / 8)));
+		nMaxSize = PR_MAX(nSize, m_nMaxSize + nGrowBy);
+#ifdef MAX_ARR_ELEMS
+		nMaxSize = PR_MIN(MAX_ARR_ELEMS, nMaxSize);
+#endif
+
+		PRUint32 *pNewData = (PRUint32 *)PR_Malloc(nMaxSize * sizeof(PRUint32));
+		if (pNewData)
+		{
+			// Copy the data from the old array to the new one
+			nsCRT::memcpy(pNewData, m_pData, m_nSize * sizeof(PRUint32));
+
+			// Zero out the remaining elements
+			nsCRT::memset(&pNewData[m_nSize], 0, (nSize - m_nSize) * sizeof(PRUint32));
+			m_nSize = nSize;
+			m_nMaxSize = nMaxSize;
+
+			// Free the old array
+			PR_Free(m_pData);
+			m_pData = pNewData;
+		}
+	}
+
+	return nSize == m_nSize;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+PRUint32 &nsUInt32Array::ElementAt(PRUint32 nIndex)
+{
+	PR_ASSERT(nIndex < m_nSize);
+	return m_pData[nIndex];
+}
+
+PRUint32 nsUInt32Array::GetAt(PRUint32 nIndex) const
+{
+	PR_ASSERT(nIndex < m_nSize);
+	return m_pData[nIndex];
+}
+
+PRUint32 *nsUInt32Array::GetData() 
+{
+	return m_pData;
+}
+
+void nsUInt32Array::SetAt(PRUint32 nIndex, PRUint32 newElement)
+{
+	PR_ASSERT(nIndex < m_nSize);
+	m_pData[nIndex] = newElement;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+PRUint32 nsUInt32Array::Add(PRUint32 newElement)
+{
+	PRUint32 nIndex = m_nSize;
+
+#ifdef MAX_ARR_ELEMS
+	if (nIndex >= MAX_ARR_ELEMS) 
+		return -1;	     
+#endif			
+
+	SetAtGrow(nIndex, newElement);
+	return nIndex;
+}
+
+PRUint32 nsUInt32Array::Add(PRUint32 *elementPtr, PRUint32 numElements) 
+{ 
+	if (SetSize(m_nSize + numElements))
+		nsCRT::memcpy(m_pData + m_nSize, elementPtr, numElements * sizeof(PRUint32)); 
+
+	return m_nSize; 
+} 
+
+PRUint32 *nsUInt32Array::CloneData() 
+{ 
+	PRUint32 *copyOfData = (PRUint32 *)PR_Malloc(m_nSize * sizeof(PRUint32)); 
+	if (copyOfData) 
+		nsCRT::memcpy(copyOfData, m_pData, m_nSize * sizeof(PRUint32)); 
+
+	return copyOfData; 
+} 
+
+void nsUInt32Array::InsertAt(PRUint32 nIndex, PRUint32 newElement, PRUint32 nCount)
+{
+	PR_ASSERT(nCount > 0);
+
+	if (nIndex >= m_nSize)
+	{
+		// If the new element is after the end of the array, grow the array
+		SetSize(nIndex + nCount);
+	}
+	else
+	{
+		// The element is being insert inside the array
+		int nOldSize = m_nSize;
+		SetSize(m_nSize + nCount);
+
+		// Move the data after the insertion point
+		nsCRT::memmove(&m_pData[nIndex + nCount], &m_pData[nIndex],
+			       (nOldSize - nIndex) * sizeof(PRUint32));
+	}
+
+	// Insert the new elements
+	PR_ASSERT(nIndex + nCount <= m_nSize);
+	while (nCount--)
+		m_pData[nIndex++] = newElement;
+}
+
+void nsUInt32Array::InsertAt(PRUint32 nStartIndex, const nsUInt32Array *pNewArray)
+{
+	PR_ASSERT(pNewArray != NULL);
+
+	if (pNewArray->GetSize() > 0)
+	{
+		InsertAt(nStartIndex, pNewArray->GetAt(0), pNewArray->GetSize());
+		for (PRUint32 i = 1; i < pNewArray->GetSize(); i++)
+			m_pData[nStartIndex + i] = pNewArray->GetAt(i);
+	}
+}
+
+void nsUInt32Array::RemoveAll()
+{
+	SetSize(0);
+}
+
+void nsUInt32Array::RemoveAt(PRUint32 nIndex, PRUint32 nCount)
+{
+	PR_ASSERT(nIndex + nCount <= m_nSize);
+
+	if (nCount > 0)
+	{
+		// Make sure not to overstep the end of the array
+		int nMoveCount = m_nSize - (nIndex + nCount);
+		if (nCount && nMoveCount)
+			nsCRT::memmove(&m_pData[nIndex], &m_pData[nIndex + nCount],
+		               nMoveCount * sizeof(PRUint32));
+
+		m_nSize -= nCount;
+	}
+}
+
+void nsUInt32Array::SetAtGrow(PRUint32 nIndex, PRUint32 newElement)
+{
+	if (nIndex >= m_nSize)
+		SetSize(nIndex+1);
+	m_pData[nIndex] = newElement;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void nsUInt32Array::CopyArray(nsUInt32Array *oldA)
+{
+	CopyArray(*oldA);
+}
+
+void nsUInt32Array::CopyArray(nsUInt32Array &oldA)
+{
+	if (m_pData)
+		PR_Free(m_pData);
+	m_nSize = oldA.m_nSize;
+	m_nMaxSize = oldA.m_nMaxSize;
+	m_pData = (PRUint32 *)PR_Malloc(m_nSize * sizeof(PRUint32));
+	if (m_pData)
+		nsCRT::memcpy(m_pData, oldA.m_pData, m_nSize * sizeof(PRUint32));
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+static int CompareDWord (const void *v1, const void *v2, void *)
+{
+	// QuickSort callback to compare array values
+	PRUint32 i1 = *(PRUint32 *)v1;
+	PRUint32 i2 = *(PRUint32 *)v2;
+	return i1 - i2;
+}
+
+void nsUInt32Array::QuickSort (int (*compare) (const void *elem1, const void *elem2, void *data))
+{
+	if (m_nSize > 1)
+		NS_QuickSort(m_pData, m_nSize, sizeof(void*), compare ? compare : CompareDWord, nsnull);
+}

mozilla/mailnews/base/util/nsUInt32Array.h

@@ -0,0 +1,73 @@
+/* -*- 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 _nsUInt32Array_H_
+#define _nsUInt32Array_H_
+
+#include "nscore.h"
+#include "nsCRT.h"
+#include "prmem.h"
+#include "msgCore.h"
+
+class NS_MSG_BASE nsUInt32Array
+{
+public:
+	// Construction/destruction
+    nsUInt32Array();
+    virtual ~nsUInt32Array();
+
+	// State/attribute member functions
+	PRUint32          GetSize() const;
+	PRBool            SetSize(PRUint32 nNewSize, PRBool AdjustGrowth=PR_FALSE, PRUint32 nGrowBy = 0);
+
+	// Accessor member functions
+	PRUint32            &ElementAt(PRUint32 nIndex);
+	PRUint32             GetAt(PRUint32 nIndex) const;
+	PRUint32            *GetData();
+	void               SetAt(PRUint32 nIndex, PRUint32 newElement);
+
+	// Insertion/deletion member functions
+	PRUint32			Add(PRUint32 newElement);
+	PRUint32           Add(PRUint32 *elementPtr, PRUint32 numElements); 
+	void	           InsertAt(PRUint32 nIndex, PRUint32 newElement, PRUint32 nCount = 1);
+	void               InsertAt(PRUint32 nStartIndex, const nsUInt32Array *pNewArray);
+	void               RemoveAll();
+	void               RemoveAt(PRUint32 nIndex, PRUint32 nCount = 1);
+	void               SetAtGrow(PRUint32 nIndex, PRUint32 newElement);
+
+	// Sorting member functions
+	void               QuickSort(int (*compare) (const void *elem1, const void *elem2, void *) = NULL);
+
+	// Overloaded operators
+	PRUint32             operator[](PRUint32 nIndex) const { return GetAt(nIndex); }
+	PRUint32            &operator[](PRUint32 nIndex) { return ElementAt(nIndex); }
+
+	// Miscellaneous member functions
+	PRUint32            *CloneData(); 
+	void               CopyArray(nsUInt32Array *oldA);
+	void               CopyArray(nsUInt32Array &oldA);
+
+protected:
+    // Member data
+	PRUint32 m_nSize;
+	PRUint32 m_nMaxSize;
+	PRUint32 m_nGrowBy;
+	PRUint32* m_pData;
+};
+
+
+#endif // _DWordArray_H_

mozilla/parser/htmlparser/src/nsAVLTree.cpp

@@ -1,617 +0,0 @@
-/* -*- 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

@@ -1,74 +0,0 @@
-/* -*- 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

@@ -1,717 +0,0 @@
-/* -*- 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

@@ -1,450 +0,0 @@
-/* -*- 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

@@ -1,747 +0,0 @@
-/* -*- 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

@@ -1,840 +0,0 @@
-/* -*- 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

@@ -1,179 +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.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

@@ -1,302 +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.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

@@ -1,30 +0,0 @@
-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

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

mozilla/xpcom/ds/Makefile.in

@@ -1,113 +0,0 @@
-#
-# 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

@@ -1,758 +0,0 @@
-/* -*- 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

@@ -1,120 +0,0 @@
-#!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

@@ -1,617 +0,0 @@
-/* -*- 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

@@ -1,74 +0,0 @@
-/* -*- 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

@@ -1,97 +0,0 @@
-/* -*- 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

@@ -1,50 +0,0 @@
-/* -*- 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

@@ -1,172 +0,0 @@
-/* -*- 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

@@ -1,43 +0,0 @@
-/* -*- 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

@@ -1,723 +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.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

@@ -1,87 +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.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

@@ -1,40 +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.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

@@ -1,151 +0,0 @@
-/* -*- 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

@@ -1,47 +0,0 @@
-/* -*- 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

@@ -1,555 +0,0 @@
-/* -*- 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

@@ -1,239 +0,0 @@
-/* -*- 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

@@ -1,365 +0,0 @@
-/* -*- 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

@@ -1,122 +0,0 @@
-#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

@@ -1,594 +0,0 @@
-/* -*- 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

@@ -1,410 +0,0 @@
-/* -*- 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

@@ -1,75 +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.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

@@ -1,228 +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.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

@@ -1,97 +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.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

@@ -1,67 +0,0 @@
-/* -*- 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

@@ -1,82 +0,0 @@
-/* -*- 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

@@ -1,312 +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.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

@@ -1,76 +0,0 @@
-/* -*- 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

@@ -1,38 +0,0 @@
-/* -*- 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

@@ -1,95 +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.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

@@ -1,44 +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.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

@@ -1,48 +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.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

@@ -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.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

@@ -1,57 +0,0 @@
-/* -*- 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

@@ -1,150 +0,0 @@
-/* -*- 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/nsISizeOfHandler.h

@@ -1,100 +0,0 @@
-/* -*- 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

@@ -1,104 +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.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

@@ -1,263 +0,0 @@
-/* -*- 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

@@ -1,57 +0,0 @@
-/* -*- 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

@@ -1,340 +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.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

@@ -1,92 +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.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

@@ -1,50 +0,0 @@
-/* -*- 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___ */

mozilla/xpcom/ds/nsObserverList.cpp

@@ -1,133 +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.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 "nsIObserverList.h"
-#include "nsObserverList.h"
-#include "nsString.h"
-#include "nsAutoLock.h"
-
-
-#define NS_AUTOLOCK(__monitor) nsAutoLock __lock(__monitor)
-
-static NS_DEFINE_CID(kObserverListCID, NS_OBSERVERLIST_CID);
-
-
-////////////////////////////////////////////////////////////////////////////////
-// nsObserverList Implementation
-
-
-NS_IMPL_ISUPPORTS1(nsObserverList, nsIObserverList)
-
-NS_COM nsresult NS_NewObserverList(nsIObserverList** anObserverList)
-{
-
-    if (anObserverList == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }  
-    nsObserverList* it = new nsObserverList();
-
-    if (it == 0) {
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    return it->QueryInterface(NS_GET_IID(nsIObserverList), (void **) anObserverList);
-}
-
-nsObserverList::nsObserverList()
-    : mLock(nsnull),
-        mObserverList(NULL)
-{
-    NS_INIT_REFCNT();
-    mLock = PR_NewLock();
-}
-
-nsObserverList::~nsObserverList(void)
-{
-    PR_DestroyLock(mLock);
-    NS_IF_RELEASE(mObserverList);
-}
-
-
-nsresult nsObserverList::AddObserver(nsIObserver** anObserver)
-{
-	nsresult rv;
-	PRBool inserted;
-    
-	NS_AUTOLOCK(mLock);
-
-    if (anObserver == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }  
-
-	if(!mObserverList) {
-        rv = NS_NewISupportsArray(&mObserverList);
-		if (NS_FAILED(rv)) return rv;
-    }
-
-	if(*anObserver) {
-		inserted = mObserverList->AppendElement(*anObserver); 
-		return inserted ? NS_OK : NS_ERROR_FAILURE;
-    }
-
-	return NS_ERROR_FAILURE;
-}
-
-nsresult nsObserverList::RemoveObserver(nsIObserver** anObserver)
-{
-	PRBool removed;
-
- 	NS_AUTOLOCK(mLock);
-
-    if (anObserver == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }  
-
-    if(!mObserverList) {
-        return NS_ERROR_FAILURE;
-    }
-
-	if(*anObserver) {
-		removed = mObserverList->RemoveElement(*anObserver);  
-		return removed ? NS_OK : NS_ERROR_FAILURE;
-    }
-
-    return NS_ERROR_FAILURE;
-
-}
-
-NS_IMETHODIMP nsObserverList::EnumerateObserverList(nsIEnumerator** anEnumerator)
-{
-	NS_AUTOLOCK(mLock);
-
-    if (anEnumerator == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    if(!mObserverList) {
-        return NS_ERROR_FAILURE;
-    }
-    
- 	return mObserverList->Enumerate(anEnumerator);
-}
-

mozilla/xpcom/ds/nsObserverList.h

@@ -1,51 +0,0 @@
-/* -*- 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 nsObserverList_h___
-#define nsObserverList_h___
-
-#include "nsIObserverList.h"
-#include "nsIEnumerator.h"
-#include "nsISupportsArray.h"
-
-
-class nsObserverList : public nsIObserverList {
-public:
-
-    NS_IMETHOD AddObserver(nsIObserver** anObserver);
-    NS_IMETHOD RemoveObserver(nsIObserver** anObserver);
-
-	NS_IMETHOD EnumerateObserverList(nsIEnumerator** anEnumerator);
-
-    nsObserverList();
-    virtual ~nsObserverList(void);
-
-    // This is ObserverList monitor object.
-    PRLock* mLock;
-     
-    NS_DECL_ISUPPORTS
-
-   
-private:
-
- 	nsISupportsArray *mObserverList;
-
-};
-
-
-#endif /* nsObserverList_h___ */

mozilla/xpcom/ds/nsObserverService.cpp

@@ -1,249 +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.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 "prlock.h"
-#include "nsIFactory.h"
-#include "nsIServiceManager.h"
-#include "nsRepository.h"
-#include "nsIObserverService.h"
-#include "nsObserverService.h"
-#include "nsIObserverList.h"
-#include "nsObserverList.h"
-#include "nsHashtable.h"
-#include "nsString.h"
-
-static NS_DEFINE_CID(kObserverServiceCID, NS_OBSERVERSERVICE_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-
-static nsObserverService* gObserverService = nsnull; // The one-and-only ObserverService
-
-////////////////////////////////////////////////////////////////////////////////
-// nsObserverService Implementation
-
-
-NS_IMPL_ISUPPORTS1(nsObserverService, nsIObserverService)
-
-NS_COM nsresult NS_NewObserverService(nsIObserverService** anObserverService)
-{
-    return nsObserverService::GetObserverService(anObserverService);
-}
-
-nsObserverService::nsObserverService()
-    : mObserverTopicTable(NULL)
-{
-    NS_INIT_REFCNT();
-    mObserverTopicTable = nsnull;
-}
-
-nsObserverService::~nsObserverService(void)
-{
-    if(mObserverTopicTable)
-        delete mObserverTopicTable;
-    gObserverService = nsnull;
-}
-
-NS_METHOD
-nsObserverService::Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr)
-{
-    nsresult rv;
-    nsObserverService* os = new nsObserverService();
-    if (os == NULL)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(os);
-    rv = os->QueryInterface(aIID, aInstancePtr);
-    NS_RELEASE(os);
-    return rv;
-}
-
-nsresult nsObserverService::GetObserverService(nsIObserverService** anObserverService)
-{
-    if (! gObserverService) {
-        nsObserverService* it = new nsObserverService();
-        if (! it)
-            return NS_ERROR_OUT_OF_MEMORY;
-        gObserverService = it;
-    }
-
-    NS_ADDREF(gObserverService);
-    *anObserverService = gObserverService;
-    return NS_OK;
-}
-
-static PRBool
-ReleaseObserverList(nsHashKey *aKey, void *aData, void* closure)
-{
-    nsIObserverList* observerList = NS_STATIC_CAST(nsIObserverList*, aData);
-    NS_RELEASE(observerList);
-    return PR_TRUE;
-}
-
-nsresult nsObserverService::GetObserverList(const nsString& aTopic, nsIObserverList** anObserverList)
-{
-    if (anObserverList == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-	
-	if(mObserverTopicTable == NULL) {
-        mObserverTopicTable = new nsObjectHashtable(nsnull, nsnull,   // should never be cloned
-                                                    ReleaseObserverList, nsnull,
-                                                    256, PR_TRUE);
-        if (mObserverTopicTable == NULL)
-            return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-
-	 nsStringKey key(aTopic);
-
-    nsIObserverList *topicObservers = nsnull;
-    if (mObserverTopicTable->Exists(&key)) {
-        topicObservers = (nsIObserverList *) mObserverTopicTable->Get(&key);
-        if (topicObservers != NULL) {
-	        *anObserverList = topicObservers;	
-        } else {
-            NS_NewObserverList(&topicObservers);
-            mObserverTopicTable->Put(&key, topicObservers);
-        }
-    } else {
-        NS_NewObserverList(&topicObservers);
-        *anObserverList = topicObservers;
-        mObserverTopicTable->Put(&key, topicObservers);
-
-    }
-
-	return NS_OK;
-}
-
-nsresult nsObserverService::AddObserver(nsIObserver* anObserver, const PRUnichar* aTopic)
-{
-	nsIObserverList* anObserverList;
-	nsresult rv;
-
-    if (anObserver == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-	if (aTopic == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    nsAutoString topic(aTopic);
-	rv = GetObserverList(topic, &anObserverList);
-	if (NS_FAILED(rv)) return rv;
-
-	if (anObserverList) {
-        return anObserverList->AddObserver(&anObserver);
-    }
- 	
-	return NS_ERROR_FAILURE;
-}
-
-nsresult nsObserverService::RemoveObserver(nsIObserver* anObserver, const PRUnichar* aTopic)
-{
-	nsIObserverList* anObserverList;
-	nsresult rv;
-
-    if (anObserver == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-	if (aTopic == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    nsAutoString topic(aTopic);
-	rv = GetObserverList(topic, &anObserverList);
-	if (NS_FAILED(rv)) return rv;
-
-	if (anObserverList) {
-        return anObserverList->RemoveObserver(&anObserver);
-    }
- 	
-	return NS_ERROR_FAILURE;
-}
-
-nsresult nsObserverService::EnumerateObserverList(const PRUnichar* aTopic, nsIEnumerator** anEnumerator)
-{
-	nsIObserverList* anObserverList;
-	nsresult rv;
-
-    if (anEnumerator == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-	if (aTopic == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    nsAutoString topic(aTopic);
-	rv = GetObserverList(topic, &anObserverList);
-	if (NS_FAILED(rv)) return rv;
-
-	if (anObserverList) {
-        return anObserverList->EnumerateObserverList(anEnumerator);
-    }
- 	
-	return NS_ERROR_FAILURE;
-}
-
-// Enumerate observers of aTopic and call Observe on each.
-nsresult nsObserverService::Notify( nsISupports *aSubject,
-                                    const PRUnichar *aTopic,
-                                    const PRUnichar *someData ) {
-    nsresult rv = NS_OK;
-    nsIEnumerator *observers;
-    // Get observer list enumerator.
-    rv = this->EnumerateObserverList( aTopic, &observers );
-    if ( NS_SUCCEEDED( rv ) ) {
-        // Go to start of observer list.
-        rv = observers->First();
-        // Continue until error or end of list.
-        while ( observers->IsDone() != NS_OK && NS_SUCCEEDED(rv) ) {
-            // Get current item (observer).
-            nsISupports *base;
-            rv = observers->CurrentItem( &base );
-            if ( NS_SUCCEEDED( rv ) ) {                           
-                // Convert item to nsIObserver.
-                nsIObserver *observer;
-                rv = base->QueryInterface( nsIObserver::GetIID(), (void**)&observer );
-                if ( NS_SUCCEEDED( rv ) && observer ) {
-                    // Tell the observer what's up.
-                    observer->Observe( aSubject, aTopic, someData );
-                    // Release the observer.
-                    observer->Release();
-                }
-            }
-            // Go on to next observer in list.
-            rv = observers->Next();
-        }
-        // Release the observer list.
-        observers->Release();
-        rv = NS_OK;
-    }
-    return rv;
-}
-////////////////////////////////////////////////////////////////////////////////
-

mozilla/xpcom/ds/nsObserverService.h

@@ -1,56 +0,0 @@
-/* -*- 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 nsObserverService_h___
-#define nsObserverService_h___
-
-#include "nsIObserverService.h"
-#include "nsIObserverList.h"
-
-class nsObjectHashtable;
-class nsString;
-
-// {D07F5195-E3D1-11d2-8ACD-00105A1B8860}
-#define NS_OBSERVERSERVICE_CID \
-    { 0xd07f5195, 0xe3d1, 0x11d2, { 0x8a, 0xcd, 0x0, 0x10, 0x5a, 0x1b, 0x88, 0x60 } }
-
-class nsObserverService : public nsIObserverService {
-public:
-    NS_DEFINE_STATIC_CID_ACCESSOR( NS_OBSERVERSERVICE_CID )
-
-	static nsresult GetObserverService(nsIObserverService** anObserverService);
-    
-    NS_DECL_NSIOBSERVERSERVICE
-   
-  nsObserverService();
-  virtual ~nsObserverService(void);
-     
-  NS_DECL_ISUPPORTS
-
-  static NS_METHOD
-  Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr);
-
-private:
-	
-  NS_IMETHOD GetObserverList(const nsString& aTopic, nsIObserverList** anObserverList);
-
-  nsObjectHashtable* mObserverTopicTable;
-
-};
-
-#endif /* nsObserverService_h___ */

mozilla/xpcom/ds/nsPageMgr.cpp

@@ -1,914 +0,0 @@
-/* -*- 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.
- */
-
-#include "nsPageMgr.h"
-#include "prmem.h"
-
-#if defined(XP_PC)
-#include <windows.h>
-#elif defined(XP_MAC)
-#include <stdlib.h>
-#elif defined(XP_BEOS)
-#include <fcntl.h>
-#elif defined(XP_UNIX)
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <malloc.h>
-
-#ifndef MAP_FAILED
-#if defined (__STDC__) && __STDC__
-#define MAP_FAILED	((void *) -1)
-#else
-#define MAP_FAILED	((char *) -1)
-#endif
-#endif
-
-#if defined(VMS)
-#if defined(DEBUG)
-#include <stdio.h>
-#endif
-#include <starlet.h>
-#include <ssdef.h>
-#include <vadef.h>
-#include <va_rangedef.h>
-#endif
-
-#endif
-
-/******************************************************************************/
-
-#define NS_PAGEMGR_CLUSTERDESC_CLUMPSIZE    16
-
-void
-nsPageMgr::DeleteFreeClusterDesc(nsClusterDesc *desc)
-{
-    desc->mNext = mUnusedClusterDescs;
-    mUnusedClusterDescs = desc;
-}
-
-nsPageMgr::nsClusterDesc*
-nsPageMgr::NewFreeClusterDesc(void)
-{
-    nsClusterDesc *desc = mUnusedClusterDescs;
-    if (desc)
-        mUnusedClusterDescs = desc->mNext;
-    else {
-        /* Allocate a clump of cluster records at once, and link all except
-           the first onto the list of mUnusedClusterDescs */
-        desc = (nsClusterDesc*)PR_Malloc(NS_PAGEMGR_CLUSTERDESC_CLUMPSIZE * sizeof(nsClusterDesc));
-        if (desc) {
-            nsClusterDesc* desc2 = desc + (NS_PAGEMGR_CLUSTERDESC_CLUMPSIZE - 1);
-            while (desc2 != desc) {
-                DeleteFreeClusterDesc(desc2--);
-            }
-        }
-    }
-    return desc;
-}
-
-/* Search the mFreeClusters looking for the first cluster of consecutive free
-   pages that is at least size bytes long.  If there is one, remove these pages
-   from the free page list and return their address; if not, return nil. */
-nsPage*
-nsPageMgr::AllocClusterFromFreeList(PRUword nPages)
-{
-    nsClusterDesc **p = &mFreeClusters;
-    nsClusterDesc *desc;
-    while ((desc = *p) != NULL) {
-        if (desc->mPageCount >= nPages) {
-            nsPage* addr = desc->mAddr;
-            if (desc->mPageCount == nPages) {
-                *p = desc->mNext;
-                DeleteFreeClusterDesc(desc);
-            }
-            else {
-                desc->mAddr += nPages;
-                desc->mPageCount -= nPages;
-            }
-            return addr;
-        }
-        p = &desc->mNext;
-    }
-    return NULL;
-}
-
-/* Add the segment to the nsClusterDesc list, coalescing it with any
-   clusters already in the list when possible. */
-void
-nsPageMgr::AddClusterToFreeList(nsPage* addr, PRWord nPages)
-{
-    nsClusterDesc **p = &mFreeClusters;
-    nsClusterDesc *desc;
-    nsClusterDesc *newDesc;
-
-    while ((desc = *p) != NULL) {
-        if (desc->mAddr + desc->mPageCount == addr) {
-            /* Coalesce with the previous cluster. */
-            nsClusterDesc *next = desc->mNext;
-
-            desc->mPageCount += nPages;
-            if (next && next->mAddr == addr + nPages) {
-                /* We can coalesce with both the previous and the next cluster. */
-                desc->mPageCount += next->mPageCount;
-                desc->mNext = next->mNext;
-                DeleteFreeClusterDesc(next);
-            }
-            return;
-        }
-        if (desc->mAddr == addr + nPages) {
-            /* Coalesce with the next cluster. */
-            desc->mAddr -= nPages;
-            desc->mPageCount += nPages;
-            return;
-        }
-        if (desc->mAddr > addr) {
-            PR_ASSERT(desc->mAddr > addr + nPages);
-            break;
-        }
-        PR_ASSERT(desc->mAddr + desc->mPageCount < addr);
-        p = &desc->mNext;
-    }
-    newDesc = NewFreeClusterDesc();
-    /* In the unlikely event that this malloc fails, we drop the free cluster
-       on the floor. The only consequence is that the memory mapping table
-       becomes slightly larger. */
-    if (newDesc) {
-        newDesc->mNext = desc;
-        newDesc->mAddr = addr;
-        newDesc->mPageCount = nPages;
-        *p = newDesc;
-    }
-}
-
-#ifdef NS_PAGEMGR_VERIFYCLUSTERS
-
-#ifndef XP_PC
-#define OutputDebugString(x)    puts(x)
-#endif
-
-void
-nsPageMgr::VerifyClusters(PRWord nPagesDelta)
-{
-    static PRUword expectedPagesUsed = 0;
-    nsPageCount calculatedPagesUsed;
-    nsPage* lastDescEnd = 0;
-    nsClusterDesc* desc;
-    char str[256];
-    expectedPagesUsed += nPagesDelta;
-    calculatedPagesUsed = mBoundary - mMemoryBase;
-    sprintf(str, "[Clusters: %p", mMemoryBase);
-    OutputDebugString(str);
-    for (desc = mFreeClusters; desc; desc = desc->mNext) {
-        PR_ASSERT(desc->mAddr > lastDescEnd);
-        calculatedPagesUsed -= desc->mPageCount;
-        lastDescEnd = desc->mAddr + desc->mPageCount;
-        sprintf(str, "..%p, %p", desc->mAddr-1, desc->mAddr + desc->mPageCount);
-        OutputDebugString(str);
-    }
-    sprintf(str, "..%p]\n", mBoundary);
-    OutputDebugString(str);
-    PR_ASSERT(lastDescEnd < mBoundary);
-    PR_ASSERT(calculatedPagesUsed == expectedPagesUsed);
-}
-
-#endif /* NS_PAGEMGR_VERIFYCLUSTERS */
-
-/*******************************************************************************
- * Machine-dependent stuff
- ******************************************************************************/
- 
-#if defined(XP_PC)
-
-#define GC_VMBASE               0x40000000      /* XXX move */
-#define GC_VMLIMIT              0x0FFFFFFF
-
-#elif defined(XP_MAC)
-
-#define NS_PAGEMGR_MAC_SEGMENT_SIZE     
-#define NS_PAGEMGR_MAC_SEGMENT_COUNT    
-
-#endif
-
-PRStatus
-nsPageMgr::InitPages(nsPageCount minPages, nsPageCount maxPages)
-{
-#if defined(XP_PC)
-
-    nsPage* addr = NULL;
-    nsPageCount size = maxPages;
-
-#ifdef NS_PAGEMGR_DEBUG
-    /* first try to place the heap at a well-known address for debugging */
-    addr = (nsPage*)VirtualAlloc((void*)GC_VMBASE, size << NS_PAGEMGR_PAGE_BITS,
-                                 MEM_RESERVE, PAGE_READWRITE);
-#endif
-    while (addr == NULL) {
-        /* let the system place the heap */
-        addr = (nsPage*)VirtualAlloc(0, size << NS_PAGEMGR_PAGE_BITS,
-                                     MEM_RESERVE, PAGE_READWRITE);
-        if (addr == NULL) {
-            size--;
-            if (size < minPages) {
-                return PR_FAILURE;
-            }
-        }
-    }
-    PR_ASSERT(NS_PAGEMGR_IS_ALIGNED(addr, NS_PAGEMGR_PAGE_BITS));
-    mMemoryBase = addr;
-    mPageCount = size;
-    mBoundary = addr;
-
-    return PR_SUCCESS;
-
-#elif defined(XP_MAC)
-    
-    OSErr err;
-    void* seg;
-    void* segLimit;
-    Handle h;
-    PRUword segSize = (minPages + 1) * NS_PAGEMGR_PAGE_SIZE;
-    nsPage* firstPage;
-    nsPage* lastPage;
-    nsSegmentDesc* mSegTable;
-    int mSegTableCount, otherCount;
-
-    h = TempNewHandle(segSize, &err);
-    if (err || h == NULL) goto fail;
-    MoveHHi(h);
-    TempHLock(h, &err);
-    if (err) goto fail;
-    seg = *h;
-    segLimit = (void*)((char*)seg + segSize);
-    firstPage = NS_PAGEMGR_PAGE_ROUNDUP(seg);
-    lastPage = NS_PAGEMGR_PAGE_ROUNDDN(((char*)seg + segSize));
-
-    /* Put the segment table in the otherwise wasted space at one
-       end of the segment. We'll put it at which ever end is bigger. */
-    mSegTable = (nsSegmentDesc*)seg;
-    mSegTableCount = ((char*)firstPage - (char*)seg) / sizeof(nsSegmentDesc);
-    otherCount = ((char*)segLimit - (char*)lastPage) / sizeof(nsSegmentDesc);
-    if (otherCount > mSegTableCount) {
-        mSegTable = (nsSegmentDesc*)lastPage;
-        mSegTableCount = otherCount;
-    }
-    else if (mSegTableCount == 0) {
-        mSegTable = (nsSegmentDesc*)firstPage;
-        firstPage++;
-        mSegTableCount = NS_PAGEMGR_PAGE_SIZE / sizeof(nsSegmentDesc);
-    }
-    PR_ASSERT(mSegTableCount > 0);
-    mSegTable = mSegTable;
-    mSegTableCount = mSegTableCount;
-    
-    mSegTable[0].mHandle = h;
-    mSegTable[0].mFirstPage = firstPage;
-    mSegTable[0].mLastPage = lastPage;
-
-    /* XXX hack for now -- just one segment */
-    mMemoryBase = firstPage;
-    mBoundary = firstPage;
-    mPageCount = lastPage - firstPage;
-
-    return PR_SUCCESS;
-    
-  fail:
-    if (h) {
-        TempDisposeHandle(h, &err);
-    }
-    return PR_FAILURE;
-
-#elif defined(XP_BEOS)
-
-    nsPage* addr = NULL;
-    nsPageCount size = maxPages;
-
-#if (1L<<NS_PAGEMGR_PAGE_BITS) != B_PAGE_SIZE
-#error can only work with 4096 byte pages
-#endif
-    while(addr == NULL)
-	{
-        /* let the system place the heap */
-		if((mAid = create_area("MozillaHeap", (void **)&addr, B_ANY_ADDRESS,
-			size << NS_PAGEMGR_PAGE_BITS, B_NO_LOCK,
-			B_READ_AREA | B_WRITE_AREA)) < 0)
-		{
-			addr = NULL;
-            size--;
-            if (size < minPages) {
-                return PR_FAILURE;
-            }
-        }
-    }
-    PR_ASSERT(NS_PAGEMGR_IS_ALIGNED(addr, NS_PAGEMGR_PAGE_BITS));
-    mMemoryBase = addr;
-    mPageCount = size;
-    mBoundary = addr;
-
-    return PR_SUCCESS;
-
-#elif defined(VMS)
-
-    nsPage* addr = NULL;
-    nsPageCount size = maxPages;
-    struct _va_range retadr, retadr2;
-    int status;
-
-    /*
-    ** The default is 32767 pages. This is quite a lot (the pages are 4k).
-    ** Let's at least make it configurable.
-    */
-
-    char *tmp;
-    tmp = getenv("VMS_PAGE_MANAGER_SIZE");
-    if (tmp)
-       size=atoi(tmp);
-#if defined(DEBUG)
-    printf("Requested page manager size is %d 4k pages\n",size);
-#endif
-
-    /*
-    ** $EXPREG will extend the virtual address region by the requested
-    ** number of pages (or pagelets on Alpha). The process must have
-    ** sufficient PGFLQUOTA for the operation, otherwise SS$_EXQUOTA will
-    ** be returned. However, in the case of SS$_EXQUOTA, $EXPREG will have
-    ** grown the region by the largest possible amount. In this case we will
-    ** put back the maximum amount and repeat the $EXPREG requesting half of
-    ** maximum (so as to leave some memory for others), just so long as its 
-    ** over our minimum threshold.
-    */
-
-    status = sys$expreg(size << (NS_PAGEMGR_PAGE_BITS-VA$C_PAGELET_SHIFT_SIZE),
-                        &retadr,0,0);
-    switch (status) {
-        case SS$_NORMAL:
-            break;
-        case SS$_EXQUOTA:
-            size = ( (int)retadr.va_range$ps_end_va -
-                     (int)retadr.va_range$ps_start_va + 1
-                   ) >> NS_PAGEMGR_PAGE_BITS;
-            status=sys$deltva(&retadr,&retadr2,0);
-           size=size/2;
-            if (size < minPages) {
-                return PR_FAILURE;
-            }
-           status = sys$expreg(
-               size << (NS_PAGEMGR_PAGE_BITS-VA$C_PAGELET_SHIFT_SIZE),
-                &retadr,0,0);
-           if (status != SS$_NORMAL) {
-               status=sys$deltva(&retadr,&retadr2,0);
-                return PR_FAILURE;
-           }
-            size = ( (int)retadr.va_range$ps_end_va -
-                     (int)retadr.va_range$ps_start_va + 1
-                   ) >> NS_PAGEMGR_PAGE_BITS;
-            break;
-        default:
-            return PR_FAILURE;
-    }
-#if defined(DEBUG)
-    printf("Actual page manager size is %d 4k pages\n",size);
-#endif
-
-    /* We got at least something */
-    addr = (nsPage *)retadr.va_range$ps_start_va;
-
-    PR_ASSERT(NS_PAGEMGR_IS_ALIGNED(addr, NS_PAGEMGR_PAGE_BITS));
-    mMemoryBase = addr;
-    mPageCount = size;
-    mBoundary = addr;
-
-    return PR_SUCCESS;
-
-#else
-
-    nsPage* addr = NULL;
-    nsPageCount size = maxPages;
-    mZero_fd = 0;
-
-#ifdef HAVE_DEV_ZERO
-    mZero_fd = open("/dev/zero", O_RDWR);
-    while (addr == NULL) {
-    /* let the system place the heap */
-        addr = (nsPage*)mmap(0, size << NS_PAGEMGR_PAGE_BITS,
-                             PROT_READ | PROT_WRITE,
-                             MAP_PRIVATE,
-                             mZero_fd, 0);
-        if (addr == (nsPage*)MAP_FAILED) {
-            addr = NULL;
-            size--;
-            if (size < minPages) {
-                return PR_FAILURE;
-            }
-        }
-    }
-#else
-#ifdef HAVE_VALLOC 
-    while (addr == NULL) {
-        addr = (nsPage*)valloc(size << NS_PAGEMGR_PAGE_BITS);
-        if (NULL == addr) {
-            size--;
-            if (size < minPages) {
-                return PR_FAILURE;
-            }
-        }
-    }
-    memset(addr, '\0', size << NS_PAGEMGR_PAGE_BITS);
-#endif /* HAVE_VALLOC */
-#endif /* HAVE_DEV_ZERO */
-
-    PR_ASSERT(NS_PAGEMGR_IS_ALIGNED(addr, NS_PAGEMGR_PAGE_BITS));
-    mMemoryBase = addr;
-    mPageCount = size;
-    mBoundary = addr;
-
-    return PR_SUCCESS;
-#endif
-}
-
-void
-nsPageMgr::FinalizePages()
-{
-#if defined(XP_PC)
-
-    BOOL ok;
-    ok = VirtualFree((void*)mMemoryBase, 0, MEM_RELEASE);
-    PR_ASSERT(ok);
-    mMemoryBase = NULL;
-    mPageCount = 0;
-    nsAutoMonitor::DestroyMonitor(mMonitor);
-    mMonitor = NULL;
-
-#elif defined(XP_MAC)
-
-    OSErr err;
-    PRUword i;
-    for (i = 0; i < mSegTableCount; i++) {
-        if (mSegTable[i].mHandle) {
-            TempDisposeHandle(mSegTable[i].mHandle, &err);
-            PR_ASSERT(err == 0);
-        }
-    }
-
-#elif defined(XP_BEOS)
-
-	delete_area(mAid);
-
-#elif defined(VMS)
-
-    struct _va_range retadr, retadr2;
-
-    retadr.va_range$ps_start_va = mMemoryBase;
-    retadr.va_range$ps_end_va = mMemoryBase +
-		(mPageCount << NS_PAGEMGR_PAGE_BITS) - 1;
-
-    sys$deltva(&retadr,&retadr2,0);
-
-#else
-#ifdef HAVE_DEV_ZERO
-    munmap((caddr_t)mMemoryBase, mPageCount << NS_PAGEMGR_PAGE_BITS);
-    close(mZero_fd);
-#else /* HAVE_DEV_ZERO */
-#ifdef HAVE_VALLOC
-    free(mMemoryBase);
-#endif /* HAVE_VALLOC */
-#endif /* HAVE_DEV_ZERO */
-#endif
-}
-
-/*******************************************************************************
- * Page Manager
- ******************************************************************************/
- 
-nsPageMgr::nsPageMgr()
-    : mUnusedClusterDescs(nsnull),
-      mFreeClusters(nsnull),
-      mInUseClusters(nsnull),
-      mMonitor(nsnull),
-      mMemoryBase(nsnull),
-      mBoundary(nsnull),
-#ifdef XP_PC
-      mLastPageFreed(nsnull),
-      mLastPageFreedSize(0),
-      mLastPageTemp(nsnull),
-      mLastPageTempSize(0),
-#ifdef NS_PAGEMGR_DEBUG
-      mLastPageAllocTries(0),
-      mLastPageAllocHits(0),
-      mLastPageFreeTries(0),
-      mLastPageFreeHits(0),
-#endif
-#endif
-#if defined(XP_MAC)
-      mSegMap(nsnull),
-      mSegTable(nsnull),
-      mSegTableCount(0),
-#endif
-#if defined(XP_BEOS)
-      mAid(B_ERROR),
-#endif
-      mPageCount(0)
-{
-    NS_INIT_REFCNT();
-}
-
-nsresult
-nsPageMgr::Init(nsPageCount minPages, nsPageCount maxPages)
-{
-    PRStatus status;
-    
-    mMonitor = nsAutoMonitor::NewMonitor("PageMgr");
-    if (mMonitor == NULL)
-        return PR_FAILURE;
-
-    status = InitPages(minPages, maxPages);
-    if (status != PR_SUCCESS)
-        return status;
-
-    /* make sure these got set */
-    PR_ASSERT(mMemoryBase);
-    PR_ASSERT(mBoundary);
-
-    mFreeClusters = NULL;
-    mInUseClusters = NULL;
-    
-    return status == PR_SUCCESS ? NS_OK : NS_ERROR_FAILURE;
-}
-
-nsPageMgr::~nsPageMgr()
-{
-#if defined(XP_PC) && defined(NS_PAGEMGR_DEBUG)
-    if (stderr) {
-        fprintf(stderr, "Page Manager Cache: alloc hits: %u/%u %u%%, free hits: %u/%u %u%%\n",
-                mLastPageAllocHits, mLastPageAllocTries, 
-                (mLastPageAllocHits * 100 / mLastPageAllocTries), 
-                mLastPageFreeHits, mLastPageFreeTries, 
-                (mLastPageFreeHits * 100 / mLastPageFreeTries)); 
-    }
-#endif
-    FinalizePages();
-
-    nsClusterDesc* chain = mUnusedClusterDescs;
-    while (chain) {
-        nsClusterDesc* desc = chain;
-        chain = chain->mNext;
-        PR_Free(desc);
-    }
-}
-
-NS_METHOD
-nsPageMgr::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-    nsPageMgr* pageMgr = new nsPageMgr();
-    if (pageMgr == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(pageMgr);
-    nsresult rv = pageMgr->Init();
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(pageMgr);
-        return rv;
-    }
-    rv = pageMgr->QueryInterface(aIID, aResult);
-    NS_RELEASE(pageMgr);
-    return NS_OK;
-}
-
-NS_IMPL_ISUPPORTS2(nsPageMgr, nsIPageManager, nsIAllocator)
-
-/******************************************************************************/
-
-#ifdef XP_PC
-
-#ifdef NS_PAGEMGR_PAGE_HYSTERESIS
-
-#ifdef NS_PAGEMGR_DEBUG
-
-void*
-nsPageMgr::NS_PAGEMGR_COMMIT_CLUSTER(void* addr, PRUword size) 
-{
-    mLastPageAllocTries++;
-    if (mLastPageFreed == (void*)(addr) && mLastPageFreedSize == (size)) {
-#ifdef NS_PAGEMGR_COMMIT_TRACE
-        char buf[64];
-        PR_snprintf(buf, sizeof(buf), "lalloc %p %u\n",
-                    mLastPageFreed, mLastPageFreedSize);
-        OutputDebugString(buf);
-#endif
-        DBG_MEMSET(mLastPageFreed, NS_PAGEMGR_PAGE_ALLOC_PATTERN, mLastPageFreedSize);
-        mLastPageTemp = mLastPageFreed;
-        mLastPageFreed = NULL;
-        mLastPageFreedSize = 0;
-        mLastPageAllocHits++;
-        return mLastPageTemp; 
-    } 
-    else {
-        /* If the cached pages intersect the current request, we lose. 
-           Just free the cached request instead of trying to split it up. */
-        if (mLastPageFreed &&
-            nsOverlapping((char*)mLastPageFreed, ((char*)mLastPageFreed + mLastPageFreedSize),
-                          (char*)(addr), ((char*)(addr) + (size)))
-//            ((char*)mLastPageFreed < ((char*)(addr) + (size))
-//             && ((char*)mLastPageFreed + mLastPageFreedSize) > (char*)(addr))
-            ) {
-#ifdef NS_PAGEMGR_COMMIT_TRACE
-            char buf[64];
-            PR_snprintf(buf, sizeof(buf), "valloc %p %u (vfree  %p %u last=%u:%u req=%u:%u)\n",
-                        addr, size,
-                        mLastPageFreed, mLastPageFreedSize,
-                        (char*)mLastPageFreed, ((char*)mLastPageFreed + mLastPageFreedSize),
-                        (char*)(addr), ((char*)(addr) + (size)));
-            OutputDebugString(buf);
-#endif
-            VirtualFree(mLastPageFreed, mLastPageFreedSize, MEM_DECOMMIT);
-            mLastPageFreed = NULL;
-            mLastPageFreedSize = 0;
-            mLastPageFreeHits--;      /* lost after all */
-        }
-        else {
-#ifdef NS_PAGEMGR_COMMIT_TRACE
-            char buf[64];
-            PR_snprintf(buf, sizeof(buf), "valloc %p %u (skipping %p %u)\n",
-                        addr, size,
-                        mLastPageFreed, mLastPageFreedSize);
-            OutputDebugString(buf);
-#endif
-        }
-        return VirtualAlloc((void*)(addr), (size), MEM_COMMIT, PAGE_READWRITE); 
-    } 
-} 
-
-int
-nsPageMgr::NS_PAGEMGR_DECOMMIT_CLUSTER(void* addr, PRUword size) 
-{
-    mLastPageFreeTries++;
-    PR_ASSERT(mLastPageFreed != (void*)(addr));
-    if (mLastPageFreed) {
-        /* If we've already got a cached page, just keep it. Heuristically,
-           this tends to give us a higher hit rate because of the order in
-           which pages are decommitted. */
-#ifdef NS_PAGEMGR_COMMIT_TRACE
-        char buf[64];
-        PR_snprintf(buf, sizeof(buf), "vfree  %p %u (cached %p %u)\n", 
-                    addr, size, mLastPageFreed, mLastPageFreedSize);
-        OutputDebugString(buf);
-#endif
-        return VirtualFree(addr, size, MEM_DECOMMIT); 
-    }
-    mLastPageFreed = (void*)(addr); 
-    mLastPageFreedSize = (size); 
-    DBG_MEMSET(mLastPageFreed, NS_PAGEMGR_PAGE_FREE_PATTERN, mLastPageFreedSize); 
-#ifdef NS_PAGEMGR_COMMIT_TRACE
-    {
-        char buf[64];
-        PR_snprintf(buf, sizeof(buf), "lfree  %p %u\n",
-                    mLastPageFreed, mLastPageFreedSize);
-        OutputDebugString(buf);
-    }
-#endif
-    mLastPageFreeHits++;
-    return 1; 
-} 
-
-#else /* !NS_PAGEMGR_DEBUG */
-
-#define NS_PAGEMGR_COMMIT_CLUSTER(addr, size)                                           \
-    (PR_ASSERT((void*)(addr) != NULL),                                                  \
-     ((mLastPageFreed == (void*)(addr) && mLastPageFreedSize == (size))                 \
-      ? (DBG_MEMSET(mLastPageFreed, NS_PAGEMGR_PAGE_ALLOC_PATTERN, mLastPageFreedSize), \
-         mLastPageTemp = mLastPageFreed,                                                \
-         mLastPageFreed = NULL,                                                         \
-         mLastPageFreedSize = 0,                                                        \
-         mLastPageTemp)                                                                 \
-      : (((mLastPageFreed &&                                                            \
-           ((char*)mLastPageFreed < ((char*)(addr) + (size))                            \
-            && ((char*)mLastPageFreed + mLastPageFreedSize) > (char*)(addr)))           \
-          ? (VirtualFree(mLastPageFreed, mLastPageFreedSize, MEM_DECOMMIT),             \
-             mLastPageFreed = NULL,                                                     \
-             mLastPageFreedSize = 0)                                                    \
-          : ((void)0)),                                                                 \
-         VirtualAlloc((void*)(addr), (size), MEM_COMMIT, PAGE_READWRITE))))             \
-
-#define NS_PAGEMGR_DECOMMIT_CLUSTER(addr, size)                                         \
-    (PR_ASSERT(mLastPageFreed != (void*)(addr)),                                        \
-     (mLastPageFreed                                                                    \
-      ? (VirtualFree(addr, size, MEM_DECOMMIT))                                         \
-      : (mLastPageFreed = (addr),                                                       \
-         mLastPageFreedSize = (size),                                                   \
-         DBG_MEMSET(mLastPageFreed, NS_PAGEMGR_PAGE_FREE_PATTERN, mLastPageFreedSize),  \
-         1)))                                                                           \
-
-#endif /* !NS_PAGEMGR_DEBUG */
-
-#else /* !NS_PAGEMGR_PAGE_HYSTERESIS */
-
-#define NS_PAGEMGR_COMMIT_CLUSTER(addr, size) \
-    VirtualAlloc((void*)(addr), (size), MEM_COMMIT, PAGE_READWRITE)
-
-#define NS_PAGEMGR_DECOMMIT_CLUSTER(addr, size) \
-    VirtualFree((void*)(addr), (size), MEM_DECOMMIT)
-
-#endif /* !NS_PAGEMGR_PAGE_HYSTERESIS */
-
-#else /* !XP_PC */
-
-#define NS_PAGEMGR_COMMIT_CLUSTER(addr, size)      (addr)
-#define NS_PAGEMGR_DECOMMIT_CLUSTER(addr, size)    1
-
-#endif /* !XP_PC */
-
-nsPage*
-nsPageMgr::NewCluster(nsPageCount nPages)
-{
-    nsAutoMonitor mon(mMonitor);
-
-    nsPage* addr;
-    PR_ASSERT(nPages > 0);
-    addr = AllocClusterFromFreeList(nPages);
-    if (!addr && mBoundary + nPages <= mMemoryBase + mPageCount) {
-        addr = mBoundary;
-        mBoundary += nPages;
-    }
-    if (addr) {
-        /* Extend the mapping */
-        nsPage* vaddr;
-        PRUword size = nPages << NS_PAGEMGR_PAGE_BITS;
-        PR_ASSERT(NS_PAGEMGR_IS_ALIGNED(addr, NS_PAGEMGR_PAGE_BITS));
-        vaddr = (nsPage*)NS_PAGEMGR_COMMIT_CLUSTER((void*)addr, size);
-#ifdef NS_PAGEMGR_VERIFYCLUSTERS
-        VerifyClusters(nPages);
-#endif
-        if (addr) {
-            PR_ASSERT(vaddr == addr);
-        }
-        else {
-            DestroyCluster(addr, nPages);
-        }
-        DBG_MEMSET(addr, NS_PAGEMGR_PAGE_ALLOC_PATTERN, size);
-    }
-    return (nsPage*)addr;
-}
-
-void
-nsPageMgr::DestroyCluster(nsPage* basePage, nsPageCount nPages)
-{
-    nsAutoMonitor mon(mMonitor);
-
-    int freeResult;
-    PRUword size = nPages << NS_PAGEMGR_PAGE_BITS;
-
-    PR_ASSERT(nPages > 0);
-    PR_ASSERT(NS_PAGEMGR_IS_ALIGNED(basePage, NS_PAGEMGR_PAGE_BITS));
-    PR_ASSERT(mMemoryBase <= basePage);
-    PR_ASSERT(basePage + nPages <= mMemoryBase + mPageCount);
-    DBG_MEMSET(basePage, NS_PAGEMGR_PAGE_FREE_PATTERN, size);
-    freeResult = NS_PAGEMGR_DECOMMIT_CLUSTER((void*)basePage, size);
-    PR_ASSERT(freeResult);
-    if (basePage + nPages == mBoundary) {
-        nsClusterDesc **p;
-        nsClusterDesc *desc;
-        /* We deallocated the last set of clusters. Move the mBoundary lower. */
-        mBoundary = basePage;
-        /* The last free cluster might now be adjacent to the mBoundary; if so,
-           move the mBoundary before that cluster and delete that cluster
-           altogether. */
-        p = &mFreeClusters;
-        while ((desc = *p) != NULL) {
-            if (!desc->mNext && desc->mAddr + desc->mPageCount == mBoundary) {
-                *p = 0;
-                mBoundary = desc->mAddr;
-                DeleteFreeClusterDesc(desc);
-            }
-            else {
-                p = &desc->mNext;
-            }
-        }
-    }
-    else {
-        AddClusterToFreeList(basePage, nPages);
-    }
-#ifdef NS_PAGEMGR_VERIFYCLUSTERS
-    VerifyClusters(-(PRWord)nPages);
-#endif
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIPageManager methods:
-
-NS_IMETHODIMP
-nsPageMgr::AllocPages(PRUint32 pageCount, void* *result)
-{
-    nsPage* page = NewCluster(NS_STATIC_CAST(nsPageCount, pageCount));
-    if (page == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    *result = page;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPageMgr::DeallocPages(PRUint32 pageCount, void* pages)
-{
-    DestroyCluster(NS_STATIC_CAST(nsPage*, pages),
-                   NS_STATIC_CAST(nsPageCount, pageCount));
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIAllocator methods:
-//
-// Note: nsIAllocator needs to keep track of the size of the blocks it allocates
-// whereas, nsIPageManager doesn't. That means that there's a little extra 
-// overhead for users of this interface. It also means that things allocated
-// with the nsIPageManager interface can't be freed with the nsIAllocator 
-// interface and vice versa.
-
-NS_IMETHODIMP_(void*)
-nsPageMgr::Alloc(PRUint32 size)
-{
-    nsAutoMonitor mon(mMonitor);
-
-    nsresult rv;
-    void* page = nsnull;
-    PRUint32 pageCount = NS_PAGEMGR_PAGE_COUNT(size);
-
-    rv = AllocPages(pageCount, &page);
-    if (NS_FAILED(rv)) 
-        return nsnull;
-
-    // Add this cluster to the mInUseClusters list:
-    nsClusterDesc* desc = NewFreeClusterDesc();
-    if (desc == nsnull) {
-        rv = DeallocPages(pageCount, page);
-        NS_ASSERTION(NS_SUCCEEDED(rv), "DeallocPages failed");
-        return nsnull;
-    }
-    desc->mAddr = (nsPage*)page;
-    desc->mPageCount = pageCount;
-    desc->mNext = mInUseClusters;
-    mInUseClusters = desc;
-
-    return page;
-}
-
-NS_IMETHODIMP_(void*)
-nsPageMgr::Realloc(void* ptr, PRUint32 size)
-{
-    // XXX This realloc implementation could be made smarter by trying to 
-    // append to the current block, but I don't think we really care right now.
-    nsresult rv;
-    rv = Free(ptr);
-    if (NS_FAILED(rv)) return nsnull;
-    void* newPtr = Alloc(size);
-    return newPtr;
-}
-
-NS_IMETHODIMP
-nsPageMgr::Free(void* ptr)
-{
-    nsAutoMonitor mon(mMonitor);
-
-    PR_ASSERT(NS_PAGEMGR_IS_ALIGNED(ptr, NS_PAGEMGR_PAGE_BITS));
-
-    // Remove the cluster from the mInUseClusters list:
-    nsClusterDesc** list = &mInUseClusters;
-    nsClusterDesc* desc;
-    while ((desc = *list) != nsnull) {
-        if (desc->mAddr == ptr) {
-            // found -- unlink the desc and free it
-            *list = desc->mNext;
-            nsresult rv = DeallocPages(desc->mPageCount, ptr);
-            DeleteFreeClusterDesc(desc);
-            return rv;
-        }
-		list = &desc->mNext;
-    }
-    NS_ASSERTION(0, "memory not allocated with nsPageMgr::Alloc");
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsPageMgr::HeapMinimize(void)
-{
-    // can't compact this heap
-    return NS_ERROR_FAILURE;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-

mozilla/xpcom/ds/nsPageMgr.h

@@ -1,203 +0,0 @@
-/* -*- 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 nsPageMgr_h__
-#define nsPageMgr_h__
-
-#include "nsIPageManager.h"
-#include "nsIAllocator.h"
-
-#include "nscore.h"
-#include "nsAutoLock.h"
-#include "prlog.h"
-
-#ifdef XP_MAC
-#include <Types.h>
-#include <Memory.h>
-#endif
-
-#if defined(XP_BEOS)
-#include <OS.h>
-#endif
-
-/*******************************************************************************
- * Configuration/Debugging parameters:
- ******************************************************************************/
-
-#ifdef NS_DEBUG
-//#define NS_PAGEMGR_DEBUG
-#endif
-
-#define NS_PAGEMGR_PAGE_HYSTERESIS      /* undef if you want to compare */
-//#define NS_PAGEMGR_COMMIT_TRACE
-
-#ifdef NS_PAGEMGR_DEBUG
-#define NS_PAGEMGR_VERIFYCLUSTERS
-#define NS_PAGEMGR_DBG_MEMSET
-#endif
-
-#define NS_PAGEMGR_MIN_PAGES            32      // XXX bogus -- this should be a runtime parameter
-#define NS_PAGEMGR_MAX_PAGES            2560    // 10 meg    XXX bogus -- this should be a runtime parameter
-
-/******************************************************************************/
-
-#ifdef NS_PAGEMGR_DBG_MEMSET
-
-#include <string.h> /* for memset */
-#include <stdio.h>
-
-#define DBG_MEMSET(dest, pattern, size) memset(dest, pattern, size)
-
-#define NS_PAGEMGR_PAGE_ALLOC_PATTERN   0xCB
-#define NS_PAGEMGR_PAGE_FREE_PATTERN    0xCD
-
-#else
-
-#define DBG_MEMSET(dest, pattern, size) ((void)0)
-
-#endif
-
-#define NS_PAGEMGR_ALIGN(p, nBits)      ((PRWord)(p) & ~((1 << nBits) - 1))
-#define NS_PAGEMGR_IS_ALIGNED(p, nBits) ((PRWord)(p) == NS_PAGEMGR_ALIGN(p, nBits))
-
-/*******************************************************************************
- * Test for overlapping (one-dimensional) regions
- ******************************************************************************/
-
-inline PRBool nsOverlapping(char* min1, char* max1, char* min2, char* max2)
-{
-    PR_ASSERT(min1 < max1);
-    PR_ASSERT(min2 < max2);
-    return (min1 < max2 && max1 > min2);
-}
-
-/*******************************************************************************
- * Types
- ******************************************************************************/
-
-typedef PRUint8 nsPage[NS_PAGEMGR_PAGE_SIZE];
-typedef PRUword nsPageCount;    /* int big enough to count pages */
-
-/*******************************************************************************
- * Macros
- ******************************************************************************/
-
-#define NS_PAGEMGR_PAGE_ROUNDDN(addr)   ((nsPage*)NS_PAGEMGR_ALIGN((PRUword)(addr), NS_PAGEMGR_PAGE_BITS))
-#define NS_PAGEMGR_PAGE_ROUNDUP(addr)   NS_PAGEMGR_PAGE_ROUNDDN((PRUword)(addr) + NS_PAGEMGR_PAGE_SIZE)
-
-/*******************************************************************************
- * Page Manager
- ******************************************************************************/
-
-class nsPageMgr : public nsIPageManager, public nsIAllocator {
-  public:
-    NS_DECL_ISUPPORTS
-
-    static NS_METHOD
-    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-    // nsIPageManager methods:
-    NS_IMETHOD AllocPages(PRUint32 pageCount, void* *result);
-    NS_IMETHOD DeallocPages(PRUint32 pageCount, void* pages);
-
-    // nsIAllocator methods:
-    NS_IMETHOD_(void*) Alloc(PRUint32 size);
-    NS_IMETHOD_(void*) Realloc(void* ptr, PRUint32 size);
-    NS_IMETHOD Free(void* ptr);
-    NS_IMETHOD HeapMinimize(void);
-
-    // nsPageMgr methods:
-    nsPageMgr();
-    virtual ~nsPageMgr();
-
-    nsresult Init(nsPageCount minPages = NS_PAGEMGR_MIN_PAGES,
-                  nsPageCount maxPages = NS_PAGEMGR_MAX_PAGES);
-
-    struct nsClusterDesc {
-        nsClusterDesc*  mNext;   /* Link to next cluster of free pages */
-        nsPage*         mAddr;   /* First page in cluster of free pages */
-        nsPageCount     mPageCount; /* Total size of cluster of free pages in bytes */
-    };
-
-    void DeleteFreeClusterDesc(nsClusterDesc *desc);
-    nsClusterDesc* NewFreeClusterDesc(void);
-    nsPage* AllocClusterFromFreeList(PRUword nPages);
-    void AddClusterToFreeList(nsPage* addr, PRWord nPages);
-#ifdef NS_PAGEMGR_VERIFYCLUSTERS
-    void VerifyClusters(PRWord nPagesDelta);
-#endif
-
-#if defined(XP_PC) && defined(NS_PAGEMGR_DEBUG)
-    void* NS_PAGEMGR_COMMIT_CLUSTER(void* addr, PRUword size);
-    int NS_PAGEMGR_DECOMMIT_CLUSTER(void* addr, PRUword size);
-#endif
-
-    // Managing Pages:
-    PRStatus InitPages(nsPageCount minPages, nsPageCount maxPages);
-    void FinalizePages();
-
-    nsPage* NewCluster(nsPageCount nPages);
-    void DestroyCluster(nsPage* basePage, nsPageCount nPages);
-
-  protected:
-    nsClusterDesc*      mUnusedClusterDescs;
-    nsClusterDesc*      mFreeClusters;
-    nsClusterDesc*      mInUseClusters; // used by nsIAllocator methods
-    PRMonitor*          mMonitor;
-    nsPage*             mMemoryBase;
-    nsPage*             mBoundary;
-    nsPageCount         mPageCount;
-
-#ifdef XP_PC
-    /* one-page hysteresis */
-    void*               mLastPageFreed;
-    PRUword             mLastPageFreedSize;
-    void*               mLastPageTemp;
-    PRUword             mLastPageTempSize;
-# ifdef NS_PAGEMGR_DEBUG
-    PRUword             mLastPageAllocTries;
-    PRUword             mLastPageAllocHits;
-    PRUword             mLastPageFreeTries;
-    PRUword             mLastPageFreeHits;
-# endif
-#endif
-
-#if defined(XP_MAC)
-    struct nsSegmentDesc {
-        Handle          mHandle;
-        nsPage*         mFirstPage;
-        nsPage*         mLastPage;
-    };
-    PRUint8*            mSegMap;
-    nsSegmentDesc*      mSegTable;
-    PRWord              mSegTableCount;
-#endif
-
-#if defined(XP_BEOS)
-	area_id				mAid;
-#endif
-
-#if (! defined(VMS)) && (! defined(XP_BEOS)) && (! defined(XP_MAC)) && (! defined(XP_PC))
-    int mZero_fd;
-#endif
-
-};
-
-/******************************************************************************/
-
-#endif /* nsPageMgr_h__ */