Clean up pool initialization.

rdf/base/src/nsCompositeDataSource.cpp

@@ -535,11 +535,13 @@ CompositeDataSourceImpl::CompositeDataSourceImpl(void)
 {
     NS_INIT_REFCNT();
 
-    static size_t kBucketSizes[] = {
+    static const size_t kBucketSizes[] = {
         sizeof(CompositeAssertionEnumeratorImpl),
         sizeof(CompositeArcsInOutEnumeratorImpl) };
 
-    mAllocator.Init("nsCompositeDataSource", kBucketSizes, 2,
+    static const PRInt32 kNumBuckets = sizeof(kBucketSizes) / sizeof(size_t);
+
+    mAllocator.Init("nsCompositeDataSource", kBucketSizes, kNumBuckets,
                     NS_SIZE_IN_HEAP(sizeof(CompositeArcsInOutEnumeratorImpl))
                     + NS_SIZE_IN_HEAP(sizeof(CompositeAssertionEnumeratorImpl)));
 

rdf/base/src/nsInMemoryDataSource.cpp

@@ -683,13 +683,15 @@ InMemoryDataSource::InMemoryDataSource(nsISupports* aOuter)
 {
     NS_INIT_AGGREGATED(aOuter);
 
-    static size_t kSizes[] = {
+    static const size_t kBucketSizes[] = {
         sizeof(Assertion),
         sizeof(PLHashEntry),
         sizeof(InMemoryArcsEnumeratorImpl),
         sizeof(InMemoryAssertionEnumeratorImpl) };
 
-    mAllocator.Init("nsInMemoryDataSource", kSizes, sizeof(kSizes) / sizeof(PRInt32),
+    static const PRInt32 kNumBuckets = sizeof(kBucketSizes) / sizeof(size_t);
+
+    mAllocator.Init("nsInMemoryDataSource", kBucketSizes, kNumBuckets,
                     NS_SIZE_IN_HEAP(sizeof(Assertion) * 64)
                     + NS_SIZE_IN_HEAP(sizeof(PLHashEntry) * 64)
                     + NS_SIZE_IN_HEAP(sizeof(InMemoryAssertionEnumeratorImpl))