zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add IsNull() to class CAutoFile and remove operator !

This commit is contained in:
Ruben Dario Ponticeli 2014-10-13 20:48:34 -03:00 committed by Wladimir J. van der Laan
parent 64ffc995d6
commit fef24cab1a
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.cpp
View File

@ -1106,7 +1106,7 @@ bool WriteBlockToDisk(CBlock& block, CDiskBlockPos& pos)
{ {
// Open history file to append // Open history file to append
CAutoFile fileout(OpenBlockFile(pos), SER_DISK, CLIENT_VERSION); CAutoFile fileout(OpenBlockFile(pos), SER_DISK, CLIENT_VERSION);
if (!fileout) if (fileout.IsNull())
return error("WriteBlockToDisk : OpenBlockFile failed"); return error("WriteBlockToDisk : OpenBlockFile failed");
// Write index header // Write index header
@ -1134,7 +1134,7 @@ bool ReadBlockFromDisk(CBlock& block, const CDiskBlockPos& pos)
// Open history file to read // Open history file to read
CAutoFile filein(OpenBlockFile(pos, true), SER_DISK, CLIENT_VERSION); CAutoFile filein(OpenBlockFile(pos, true), SER_DISK, CLIENT_VERSION);
if (!filein) if (filein.IsNull())
return error("ReadBlockFromDisk : OpenBlockFile failed"); return error("ReadBlockFromDisk : OpenBlockFile failed");
// Read block // Read block
@ -4548,7 +4548,7 @@ bool CBlockUndo::WriteToDisk(CDiskBlockPos &pos, const uint256 &hashBlock)
{ {
// Open history file to append // Open history file to append
CAutoFile fileout(OpenUndoFile(pos), SER_DISK, CLIENT_VERSION); CAutoFile fileout(OpenUndoFile(pos), SER_DISK, CLIENT_VERSION);
if (!fileout) if (fileout.IsNull())
return error("CBlockUndo::WriteToDisk : OpenUndoFile failed"); return error("CBlockUndo::WriteToDisk : OpenUndoFile failed");
// Write index header // Write index header
@ -4580,7 +4580,7 @@ bool CBlockUndo::ReadFromDisk(const CDiskBlockPos &pos, const uint256 &hashBlock
{ {
// Open history file to read // Open history file to read
CAutoFile filein(OpenUndoFile(pos, true), SER_DISK, CLIENT_VERSION); CAutoFile filein(OpenUndoFile(pos, true), SER_DISK, CLIENT_VERSION);
if (!filein) if (filein.IsNull())
return error("CBlockUndo::ReadFromDisk : OpenBlockFile failed"); return error("CBlockUndo::ReadFromDisk : OpenBlockFile failed");
// Read block // Read block

4
src/net.cpp
View File

@ -1929,7 +1929,7 @@ bool CAddrDB::Write(const CAddrMan& addr)
boost::filesystem::path pathTmp = GetDataDir() / tmpfn; boost::filesystem::path pathTmp = GetDataDir() / tmpfn;
FILE *file = fopen(pathTmp.string().c_str(), "wb"); FILE *file = fopen(pathTmp.string().c_str(), "wb");
CAutoFile fileout(file, SER_DISK, CLIENT_VERSION); CAutoFile fileout(file, SER_DISK, CLIENT_VERSION);
if (!fileout) if (fileout.IsNull())
return error("%s : Failed to open file %s", __func__, pathTmp.string()); return error("%s : Failed to open file %s", __func__, pathTmp.string());
// Write and commit header, data // Write and commit header, data
@ -1954,7 +1954,7 @@ bool CAddrDB::Read(CAddrMan& addr)
// open input file, and associate with CAutoFile // open input file, and associate with CAutoFile
FILE *file = fopen(pathAddr.string().c_str(), "rb"); FILE *file = fopen(pathAddr.string().c_str(), "rb");
CAutoFile filein(file, SER_DISK, CLIENT_VERSION); CAutoFile filein(file, SER_DISK, CLIENT_VERSION);
if (!filein) if (filein.IsNull())
return error("%s : Failed to open file %s", __func__, pathAddr.string()); return error("%s : Failed to open file %s", __func__, pathAddr.string());
// use file size to size memory buffer // use file size to size memory buffer

2
src/serialize.h
View File

@ -1122,7 +1122,7 @@ public:
FILE& operator*() { return *file; } FILE& operator*() { return *file; }
FILE** operator&() { return &file; } FILE** operator&() { return &file; }
FILE* operator=(FILE* pnew) { return file = pnew; } FILE* operator=(FILE* pnew) { return file = pnew; }
bool operator!() { return (file == NULL); } bool IsNull() const { return (file == NULL); }
// //