Merge pull request #4111

laanwj · laanwj · commit b2ee43f12663 · 2014-04-30T16:17:58.000+02:00
1cc7f54 use standard __func__ instead of __PRETTY_FUNCTION__ (Philip Kaufmann)
diff --git 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
@@ -381,7 +381,7 @@ class CBlockUndo
             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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -1032,11 +1032,11 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock`
`1032`	`1032`	`fseek(file, postx.nTxOffset, SEEK_CUR);`
`1033`	`1033`	`file >> txOut;`
`1034`	`1034`	`} catch (std::exception &e) {`
`1035`		`- return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what());`
	`1035`	`+ return error("%s : Deserialize or I/O error - %s", __func__, e.what());`
`1036`	`1036`	`}`
`1037`	`1037`	`hashBlock = header.GetHash();`
`1038`	`1038`	`if (txOut.GetHash() != hash)`
`1039`		`- return error("%s : txid mismatch", __PRETTY_FUNCTION__);`
	`1039`	`+ return error("%s : txid mismatch", __func__);`
`1040`	`1040`	`return true;`
`1041`	`1041`	`}`
`1042`	`1042`	`}`
`@@ -1120,7 +1120,7 @@ bool ReadBlockFromDisk(CBlock& block, const CDiskBlockPos& pos)`
`1120`	`1120`	`filein >> block;`
`1121`	`1121`	`}`
`1122`	`1122`	`catch (std::exception &e) {`
`1123`		`- return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what());`
	`1123`	`+ return error("%s : Deserialize or I/O error - %s", __func__, e.what());`
`1124`	`1124`	`}`
`1125`	`1125`
`1126`	`1126`	`// Check the header`
`@@ -3126,7 +3126,7 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp)`
`3126`	`3126`	`break;`
`3127`	`3127`	`}`
`3128`	`3128`	`} catch (std::exception &e) {`
`3129`		`- LogPrintf("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what());`
	`3129`	`+ LogPrintf("%s : Deserialize or I/O error - %s", __func__, e.what());`
`3130`	`3130`	`}`
`3131`	`3131`	`}`
`3132`	`3132`	`fclose(fileIn);`
Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ class CBlockUndo`
`381`	`381`	`filein >> hashChecksum;`
`382`	`382`	`}`
`383`	`383`	`catch (std::exception &e) {`
`384`		`- return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what());`
	`384`	`+ return error("%s : Deserialize or I/O error - %s", __func__, e.what());`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`// Verify checksum`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ bool CCoinsViewDB::GetStats(CCoinsStats &stats) {`
`148`	`148`	`}`
`149`	`149`	`pcursor->Next();`
`150`	`150`	`} catch (std::exception &e) {`
`151`		`- return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what());`
	`151`	`+ return error("%s : Deserialize or I/O error - %s", __func__, e.what());`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`	`delete pcursor;`
`@@ -226,7 +226,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts()`
`226`	`226`	`break; // if shutdown requested or finished loading block index`
`227`	`227`	`}`
`228`	`228`	`} catch (std::exception &e) {`
`229`		`- return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what());`
	`229`	`+ return error("%s : Deserialize or I/O error - %s", __func__, e.what());`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`	`delete pcursor;`