LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #4111

Browse source 
1cc7f54 use standard __func__ instead of __PRETTY_FUNCTION__ (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan 2014-04-30 16:17:41 +02:00
commit b2ee43f126
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
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

@ -1032,11 +1032,11 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock
fseek(file, postx.nTxOffset, SEEK_CUR); fseek(file, postx.nTxOffset, SEEK_CUR);
file >> txOut; file >> txOut;
} catch (std::exception &e) { } catch (std::exception &e) {
return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what()); return error("%s : Deserialize or I/O error - %s", __func__, e.what());
} }
hashBlock = header.GetHash(); hashBlock = header.GetHash();
if (txOut.GetHash() != hash) if (txOut.GetHash() != hash)
return error("%s : txid mismatch", __PRETTY_FUNCTION__); return error("%s : txid mismatch", __func__);
return true; return true;
} }
} }
@ -1120,7 +1120,7 @@ bool ReadBlockFromDisk(CBlock& block, const CDiskBlockPos& pos)
filein >> block; filein >> block;
} }
catch (std::exception &e) { catch (std::exception &e) {
return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what()); return error("%s : Deserialize or I/O error - %s", __func__, e.what());
} }
// Check the header // Check the header
@ -3126,7 +3126,7 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp)
break; break;
} }
} catch (std::exception &e) { } catch (std::exception &e) {
LogPrintf("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what()); LogPrintf("%s : Deserialize or I/O error - %s", __func__, e.what());
} }
} }
fclose(fileIn); fclose(fileIn);

2
src/main.h
View file

@ -381,7 +381,7 @@ public:
filein >> hashChecksum; filein >> hashChecksum;
} }
catch (std::exception &e) { catch (std::exception &e) {
return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what()); return error("%s : Deserialize or I/O error - %s", __func__, e.what());
} }
// Verify checksum // Verify checksum

4
src/txdb.cpp
View file

@ -148,7 +148,7 @@ bool CCoinsViewDB::GetStats(CCoinsStats &stats) {
} }
pcursor->Next(); pcursor->Next();
} catch (std::exception &e) { } catch (std::exception &e) {
return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what()); return error("%s : Deserialize or I/O error - %s", __func__, e.what());
} }
} }
delete pcursor; delete pcursor;
@ -226,7 +226,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts()
break; // if shutdown requested or finished loading block index break; // if shutdown requested or finished loading block index
} }
} catch (std::exception &e) { } catch (std::exception &e) {
return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what()); return error("%s : Deserialize or I/O error - %s", __func__, e.what());
} }
} }
delete pcursor; delete pcursor;