Merge pull request #3603

a486abd replace custom GetFilesize() with boost::filesystem::file_size() (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan
2014-03-27 11:38:26 +01:00
3 changed files with 5 additions and 21 deletions

View File

@@ -27,6 +27,8 @@
#include <miniupnpc/upnperrors.h>
#endif
#include <boost/filesystem.hpp>
// Dump addresses to peers.dat every 15 minutes (900s)
#define DUMP_ADDRESSES_INTERVAL 900
@@ -1986,9 +1988,9 @@ bool CAddrDB::Read(CAddrMan& addr)
return error("CAddrman::Read() : open failed");
// use file size to size memory buffer
int fileSize = GetFilesize(filein);
int fileSize = boost::filesystem::file_size(pathAddr);
int dataSize = fileSize - sizeof(uint256);
//Don't try to resize to a negative number if file is small
// Don't try to resize to a negative number if file is small
if ( dataSize < 0 ) dataSize = 0;
vector<unsigned char> vchData;
vchData.resize(dataSize);