Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Benjamin Allred
crown-core
Commits
d259425e
Commit
d259425e
authored
10 years ago
by
Philip Kaufmann
Browse files
Options
Download
Email Patches
Plain Diff
use standard __func__ instead of __PRETTY_FUNCTION__
parent
cba309e0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/main.cpp
+4
-4
src/main.cpp
src/main.h
+1
-1
src/main.h
src/txdb.cpp
+2
-2
src/txdb.cpp
with
7 additions
and
7 deletions
+7
-7
src/main.cpp
View file @
d259425e
...
...
@@ -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);
...
...
This diff is collapsed.
Click to expand it.
src/main.h
View file @
d259425e
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
src/txdb.cpp
View file @
d259425e
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment