From 327f6d529a28e8a282a0240fd2b67004c1a5f476 Mon Sep 17 00:00:00 2001
From: "brendan%mozilla.org" <brendan%mozilla.org>
Date: Thu, 11 Aug 2005 19:43:20 +0000
Subject: [PATCH] Add shared DHashTableOps for [const] char *key use-cases,
 clean up dhash API abusages (214839, r=dougt, sr=dbaron).

---
 xpcom/glue/nsTHashtable.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/xpcom/glue/nsTHashtable.h b/xpcom/glue/nsTHashtable.h
index f18d337559e..19972c18eae 100644
--- a/xpcom/glue/nsTHashtable.h
+++ b/xpcom/glue/nsTHashtable.h
@@ -165,7 +165,7 @@ public:
                             NS_CONST_CAST(PLDHashTable*,&mTable),
                             EntryType::KeyToPointer(aKey),
                             PL_DHASH_LOOKUP));
-    return PL_DHASH_ENTRY_IS_BUSY(entry) ?  entry : nsnull;
+    return PL_DHASH_ENTRY_IS_BUSY(entry) ? entry : nsnull;
   }
 
   /**
@@ -268,9 +268,9 @@ protected:
   static void PR_CALLBACK s_ClearEntry(PLDHashTable *table,
                                        PLDHashEntryHdr *entry);
 
-  static void PR_CALLBACK s_InitEntry(PLDHashTable     *table,
-                                      PLDHashEntryHdr  *entry,
-                                      const void       *key);
+  static PRBool PR_CALLBACK s_InitEntry(PLDHashTable     *table,
+                                        PLDHashEntryHdr  *entry,
+                                        const void       *key);
 
   /**
    * passed internally during enumeration.  Allocated on the stack.
@@ -401,12 +401,13 @@ nsTHashtable<EntryType>::s_ClearEntry(PLDHashTable    *table,
 }
 
 template<class EntryType>
-void
+PRBool
 nsTHashtable<EntryType>::s_InitEntry(PLDHashTable    *table,
                                      PLDHashEntryHdr *entry,
                                      const void      *key)
 {
   new(entry) EntryType(NS_REINTERPRET_CAST(KeyTypePointer,key));
+  return PR_TRUE;
 }
 
 template<class EntryType>