CFX_MapByteStringToPtr considered harmful.

core/include/fxcrt/fx_basic.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_INCLUDE_FXCRT_FX_BASIC_H_
 #define CORE_INCLUDE_FXCRT_FX_BASIC_H_
 
 #include "fx_memory.h"
@@ skipping 648 matching lines @@
 
   void EstimateSize(FX_DWORD size, FX_DWORD grow_by);
 
   FX_POSITION GetStartPosition() const;
 
   void GetNextAssoc(FX_POSITION& pos, FX_DWORD& key, FX_DWORD& value) const;
 
  protected:
   CFX_BinaryBuf m_Buffer;
 };
-class CFX_MapByteStringToPtr {
- protected:
-  struct CAssoc {
-    CAssoc* pNext;
-
-    FX_DWORD nHashValue;
-
-    CFX_ByteString key;
-
-    void* value;
-  };
-
- public:
-  CFX_MapByteStringToPtr(int nBlockSize = 10);
-
-  int GetCount() const { return m_nCount; }
-
-  FX_BOOL IsEmpty() const { return m_nCount == 0; }
-
-  FX_BOOL Lookup(const CFX_ByteStringC& key, void*& rValue) const;
-
-  void*& operator[](const CFX_ByteStringC& key);
-
-  void SetAt(const CFX_ByteStringC& key, void* newValue) {
-    (*this)[key] = newValue;
-  }
-
-  FX_BOOL RemoveKey(const CFX_ByteStringC& key);
-
-  void RemoveAll();
-
-  FX_POSITION GetStartPosition() const {
-    return (m_nCount == 0) ? NULL : (FX_POSITION)-1;
-  }
-
-  void GetNextAssoc(FX_POSITION& rNextPosition,
-                    CFX_ByteString& rKey,
-                    void*& rValue) const;
-
-  void* GetNextValue(FX_POSITION& rNextPosition) const;
-
-  FX_DWORD GetHashTableSize() const { return m_nHashTableSize; }
-
-  void InitHashTable(FX_DWORD hashSize, FX_BOOL bAllocNow = TRUE);
-
-  FX_DWORD HashKey(const CFX_ByteStringC& key) const;
-
- protected:
-  CAssoc** m_pHashTable;
-
-  FX_DWORD m_nHashTableSize;
-
-  int m_nCount;
-
-  CAssoc* m_pFreeList;
-
-  struct CFX_Plex* m_pBlocks;
-
-  int m_nBlockSize;
-
-  CAssoc* NewAssoc();
-
-  void FreeAssoc(CAssoc* pAssoc);
-
-  CAssoc* GetAssocAt(const CFX_ByteStringC& key, FX_DWORD& hash) const;
-
- public:
-  ~CFX_MapByteStringToPtr();
-};
 class CFX_CMapByteStringToPtr {
  public:
   CFX_CMapByteStringToPtr();
 
   ~CFX_CMapByteStringToPtr();
 
   void RemoveAll();
 
   FX_POSITION GetStartPosition() const;
 
   void GetNextAssoc(FX_POSITION& rNextPosition,
                     CFX_ByteString& rKey,
                     void*& rValue) const;
 
   void* GetNextValue(FX_POSITION& rNextPosition) const;
 
   FX_BOOL Lookup(const CFX_ByteStringC& key, void*& rValue) const;
 
   void SetAt(const CFX_ByteStringC& key, void* value);
 
   void RemoveKey(const CFX_ByteStringC& key);
 
   int GetCount() const;
 
   void AddValue(const CFX_ByteStringC& key, void* pValue);

[Lei Zhang, 2015/08/15 00:47:33]

BTW, this is the trickier map class.

[Tom Sepez, 2015/08/17 20:15:25]

Yup.  It ripples through Dictionary objects.

 
  private:
   CFX_BaseSegmentedArray m_Buffer;
 };
 class CFX_PtrList {
  protected:
   struct CNode {
     CNode* pNext;
 
     CNode* pPrev;
@@ skipping 468 matching lines @@
   FX_FLOAT c;
   FX_FLOAT d;
   FX_FLOAT e;
   FX_FLOAT f;
   FX_FLOAT g;
   FX_FLOAT h;
   FX_FLOAT i;
 };
 
 #endif  // CORE_INCLUDE_FXCRT_FX_BASIC_H_