|
|
@ -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); |
|
|
|