diff --git a/mozilla/mailnews/base/util/nsMsgFolder.cpp b/mozilla/mailnews/base/util/nsMsgFolder.cpp index f22436ae4c9..4e670e8242d 100644 --- a/mozilla/mailnews/base/util/nsMsgFolder.cpp +++ b/mozilla/mailnews/base/util/nsMsgFolder.cpp @@ -360,28 +360,6 @@ nsMsgFolder::GetURI(char* *name) { typedef PRBool (*nsArrayFilter)(nsISupports* element, void* data); -static nsresult -nsFilterBy(nsISupportsArray* array, nsArrayFilter filter, void* data, - nsISupportsArray* *result) -{ - nsCOMPtr f; - nsresult rv = NS_NewISupportsArray(getter_AddRefs(f)); - if (NS_FAILED(rv)) return rv; - PRUint32 cnt; - rv = array->Count(&cnt); - if (NS_FAILED(rv)) return rv; - for (PRUint32 i = 0; i < cnt; i++) { - nsCOMPtr element = getter_AddRefs(array->ElementAt(i)); - if (filter(element, data)) { - if (!f->AppendElement(element)) { - return NS_ERROR_OUT_OF_MEMORY; - } - } - } - *result = f; - return NS_OK; -} - //////////////////////////////////////////////////////////////////////////////// diff --git a/mozilla/mailnews/base/util/nsMsgProtocol.cpp b/mozilla/mailnews/base/util/nsMsgProtocol.cpp index 6c1acd14b47..3cccd72d522 100644 --- a/mozilla/mailnews/base/util/nsMsgProtocol.cpp +++ b/mozilla/mailnews/base/util/nsMsgProtocol.cpp @@ -76,7 +76,6 @@ NS_INTERFACE_MAP_BEGIN(nsMsgProtocol) NS_INTERFACE_MAP_ENTRY(nsITransportEventSink) NS_INTERFACE_MAP_END_THREADSAFE -static PRUnichar *GetStringByID(PRInt32 stringID); static PRUnichar *FormatStringWithHostNameByID(PRInt32 stringID, nsIMsgMailNewsUrl *msgUri); @@ -1366,29 +1365,6 @@ PRInt32 nsMsgAsyncWriteProtocol::SendData(nsIURI * aURL, const char * dataBuffer #define MSGS_URL "chrome://messenger/locale/messenger.properties" -PRUnichar *GetStringByID(PRInt32 stringID) -{ - nsresult rv; - nsCOMPtr sBundle = nsnull; - - nsCOMPtr sBundleService = - do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); - if (NS_FAILED(rv) || (nsnull == sBundleService)) - return nsnull; - - rv = sBundleService->CreateBundle(MSGS_URL, getter_AddRefs(sBundle)); - if (NS_FAILED(rv)) - return nsnull; - - PRUnichar *ptrv = nsnull; - rv = sBundle->GetStringFromID(stringID, &ptrv); - - if (NS_FAILED(rv)) - return nsnull; - - return (ptrv); -} - PRUnichar *FormatStringWithHostNameByID(PRInt32 stringID, nsIMsgMailNewsUrl *msgUri) { if (! msgUri)