Bug 1160647 - Port |Bug 1159972 - Remove the fallible version of PL_DHashTableInit()| to comm-central r=rkent a=bustage fix CLOSED TREE

mailnews/db/msgdb/src/nsMsgDatabase.cpp

@@ -666,8 +666,8 @@ nsresult nsMsgDatabase::ClearHdrCache(bool reInit)
     if (reInit)
     {
       PL_DHashTableFinish(saveCachedHeaders);
-      PL_DHashTableInit(saveCachedHeaders, &gMsgDBHashTableOps, sizeof(struct MsgHdrHashElement),
-                        mozilla::fallible_t(), m_cacheSize);
+      PL_DHashTableInit(saveCachedHeaders, &gMsgDBHashTableOps,
+                        sizeof(struct MsgHdrHashElement), m_cacheSize);
       m_cachedHeaders = saveCachedHeaders;
 
     }

mailnews/extensions/bayesian-spam-filter/src/nsBayesianFilter.cpp

@@ -152,18 +152,12 @@ TokenHash::TokenHash(uint32_t aEntrySize)
 {
     mEntrySize = aEntrySize;
     PL_INIT_ARENA_POOL(&mWordPool, "Words Arena", 16384);
-    bool ok = PL_DHashTableInit(&mTokenTable, &gTokenTableOps,
-                                aEntrySize, mozilla::fallible_t(), 128);
-    mTableInitialized = ok;
-    NS_ASSERTION(ok, "mTokenTable failed to initialize");
-    if (!ok)
-      PR_LOG(BayesianFilterLogModule, PR_LOG_ERROR, ("mTokenTable failed to initialize"));
+    PL_DHashTableInit(&mTokenTable, &gTokenTableOps, aEntrySize, 128);
 }
 
 TokenHash::~TokenHash()
 {
-    if (mTableInitialized)
-        PL_DHashTableFinish(&mTokenTable);
+    PL_DHashTableFinish(&mTokenTable);
     PL_FinishArenaPool(&mWordPool);
 }
 
@@ -171,19 +165,10 @@ nsresult TokenHash::clearTokens()
 {
     // we re-use the tokenizer when classifying multiple messages,
     // so this gets called after every message classification.
-    bool ok = true;
-    if (mTableInitialized)
-    {
-        PL_DHashTableFinish(&mTokenTable);
-        PL_FreeArenaPool(&mWordPool);
-        ok = PL_DHashTableInit(&mTokenTable, &gTokenTableOps,
-                               mEntrySize, mozilla::fallible_t(), 128);
-        mTableInitialized = ok;
-        NS_ASSERTION(ok, "mTokenTable failed to initialize");
-        if (!ok)
-          PR_LOG(BayesianFilterLogModule, PR_LOG_ERROR, ("mTokenTable failed to initialize in clearTokens()"));
-    }
-    return (ok) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+    PL_DHashTableFinish(&mTokenTable);
+    PL_FreeArenaPool(&mWordPool);
+    PL_DHashTableInit(&mTokenTable, &gTokenTableOps, mEntrySize, 128);
+    return NS_OK;
 }
 
 char* TokenHash::copyWord(const char* word, uint32_t len)
@@ -1025,7 +1010,6 @@ NS_IMETHODIMP TokenStreamListener::GetProperties(nsIWritablePropertyBag2 * *aPro
 NS_IMETHODIMP TokenStreamListener::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext)
 {
     mLeftOverCount = 0;
-    NS_ENSURE_TRUE(mTokenizer, NS_ERROR_OUT_OF_MEMORY);
     if (!mBuffer)
     {
         mBuffer = new char[mBufferSize];
@@ -2120,9 +2104,7 @@ NS_IMETHODIMP nsBayesianFilter::SetMessageClassification(
 
 NS_IMETHODIMP nsBayesianFilter::ResetTrainingData()
 {
-  if (mCorpus)
-    return mCorpus.resetTrainingData();
-  return NS_ERROR_FAILURE;
+  return mCorpus.resetTrainingData();
 }
 
 NS_IMETHODIMP nsBayesianFilter::DetailMessage(const char *aMsgURI,
@@ -2152,14 +2134,10 @@ NS_IMETHODIMP nsBayesianFilter::CorpusCounts(uint32_t aTrait,
                                              uint32_t *aTokenCount)
 {
   NS_ENSURE_ARG_POINTER(aTokenCount);
-  if (mCorpus)
-  {
-    *aTokenCount = mCorpus.countTokens();
-    if (aTrait && aMessageCount)
-      *aMessageCount = mCorpus.getMessageCount(aTrait);
-    return NS_OK;
-  }
-  return NS_ERROR_FAILURE;
+  *aTokenCount = mCorpus.countTokens();
+  if (aTrait && aMessageCount)
+    *aMessageCount = mCorpus.getMessageCount(aTrait);
+  return NS_OK;
 }
 
 NS_IMETHODIMP nsBayesianFilter::ClearTrait(uint32_t aTrait)

mailnews/extensions/bayesian-spam-filter/src/nsBayesianFilter.h

@@ -91,7 +91,6 @@ public:
      * Clears out the previous message tokens.
      */
     nsresult clearTokens();
-    operator bool() { return mTableInitialized; }
     uint32_t countTokens();
     TokenEnumeration getTokens();
     BaseToken* add(const char* word);
@@ -101,7 +100,6 @@ protected:
     PLArenaPool mWordPool;
     uint32_t mEntrySize;
     PLDHashTable mTokenTable;
-    bool mTableInitialized;
     char* copyWord(const char* word, uint32_t len);
     /**
      * Calls passed-in function for each token in the table.