diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-04-30 16:17:41 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-04-30 16:17:58 +0200 |
| commit | b2ee43f1266392ec1e780921abd24d2f8a0a21bf (patch) | |
| tree | 560f0a2efcd762f2f182a83fa106ffbba34e23f4 | |
| parent | 48be9ceaa0746ba7ba7f1b9fedeb1d10dc0a5f99 (diff) | |
| parent | 1cc7f54a8d02c8e781a77a5c7fab4f6174bf312d (diff) | |
Merge pull request #4111
1cc7f54 use standard __func__ instead of __PRETTY_FUNCTION__ (Philip Kaufmann)
| -rw-r--r-- | src/main.cpp | 8 | ||||
| -rw-r--r-- | src/main.h | 2 | ||||
| -rw-r--r-- | src/txdb.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/main.cpp b/src/main.cpp index 7a6d4b39de..863661d94c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1032,11 +1032,11 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock fseek(file, postx.nTxOffset, SEEK_CUR); file >> txOut; } 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(); if (txOut.GetHash() != hash) - return error("%s : txid mismatch", __PRETTY_FUNCTION__); + return error("%s : txid mismatch", __func__); return true; } } @@ -1120,7 +1120,7 @@ bool ReadBlockFromDisk(CBlock& block, const CDiskBlockPos& pos) filein >> block; } 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 @@ -3126,7 +3126,7 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp) break; } } 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); diff --git a/src/main.h b/src/main.h index aff20d0379..825e577d1e 100644 --- a/src/main.h +++ b/src/main.h @@ -381,7 +381,7 @@ public: filein >> hashChecksum; } 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 diff --git a/src/txdb.cpp b/src/txdb.cpp index d06639a112..cb92922a35 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -148,7 +148,7 @@ bool CCoinsViewDB::GetStats(CCoinsStats &stats) { } pcursor->Next(); } 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; @@ -226,7 +226,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts() break; // if shutdown requested or finished loading block index } } 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; |