Merge pull request #994 from sipa/deladdr

Use erase instead of rewrite to remove old addr entries

diff --combined src/db.h
index 430880e,688c390..47fa402
--- 1/src/db.h
--- 2/src/db.h
+++ b/src/db.h
@@@ -34,7 -34,7 +34,7 @@@ void ThreadFlushWalletDB(void* parg)
  bool BackupWallet(const CWallet& wallet, const std::string& strDest);
  
  
 -
 +/** RAII class that provides access to a Berkeley database */
  class CDB
  {
  protected:
@@@ -266,7 -266,7 +266,7 @@@ public
  
  
  
 -
 +/** Access to the transaction database (blkindex.dat) */
  class CTxDB : public CDB
  {
  public:
@@@ -297,7 -297,7 +297,7 @@@ public
  
  
  
 -
 +/** Access to the (IP) address database (addr.dat) */
  class CAddrDB : public CDB
  {
  public:
@@@ -306,16 -306,14 +306,14 @@@ private
      CAddrDB(const CAddrDB&);
      void operator=(const CAddrDB&);
  public:
-     bool WriteAddress(const CAddress& addr);
-     bool EraseAddress(const CAddress& addr);
      bool WriteAddrman(const CAddrMan& addr);
-     bool LoadAddresses(bool &fUpdate);
+     bool LoadAddresses();
  };
  
  bool LoadAddresses();
  
  
 -
 +/** A key pool entry */
  class CKeyPool
  {
  public:
@@@ -344,7 -342,7 +342,7 @@@
  
  
  
 -
 +/** Error statuses for the wallet database */
  enum DBErrors
  {
      DB_LOAD_OK,
@@@ -354,7 -352,6 +352,7 @@@
      DB_NEED_REWRITE
  };
  
 +/** Access to the wallet database (wallet.dat) */
  class CWalletDB : public CDB
  {
  public: