diff options
author | Jeff Garzik <jgarzik@exmulti.com> | 2013-01-11 09:17:14 -0800 |
---|---|---|
committer | Jeff Garzik <jgarzik@exmulti.com> | 2013-01-11 09:17:14 -0800 |
commit | e0c8fbac351bfa5e036c1c00ce0525c3649ab29c (patch) | |
tree | 27de6b3af249746ca455bd2ef33f0d1866ca58ee /src | |
parent | 1f4b80a43798eff00167c529abd770635ea98a26 (diff) | |
parent | ec95a809afa8014e92832372323021d5b6f0d490 (diff) |
Merge pull request #2169 from Diapolo/small_main_h_cleanup
small main.h cleanup (no code changes)
Diffstat (limited to 'src')
-rw-r--r-- | src/main.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/main.h b/src/main.h index 50e0004585..3290b16318 100644 --- a/src/main.h +++ b/src/main.h @@ -119,7 +119,7 @@ void SyncWithWallets(const uint256 &hash, const CTransaction& tx, const CBlock* /** Process an incoming block */ bool ProcessBlock(CNode* pfrom, CBlock* pblock, CDiskBlockPos *dbp = NULL); /** Check whether enough disk space is available for an incoming block */ -bool CheckDiskSpace(uint64 nAdditionalBytes=0); +bool CheckDiskSpace(uint64 nAdditionalBytes = 0); /** Open a block file (blk?????.dat) */ FILE* OpenBlockFile(const CDiskBlockPos &pos, bool fReadOnly = false); /** Open an undo file (rev?????.dat) */ @@ -441,7 +441,7 @@ enum CheckSig_mode }; /** The basic transaction that is broadcasted on the network and contained in - * blocks. A transaction can contain multiple inputs and outputs. + * blocks. A transaction can contain multiple inputs and outputs. */ class CTransaction { @@ -548,13 +548,11 @@ public: /** Check for standard transaction types @param[in] mapInputs Map of previous transactions that have outputs we're spending @return True if all inputs (scriptSigs) use only standard transaction forms - @see CTransaction::FetchInputs */ bool AreInputsStandard(CCoinsViewCache& mapInputs) const; /** Count ECDSA signature operations the old-fashioned (pre-0.6) way @return number of sigops this transaction's outputs will produce when spent - @see CTransaction::FetchInputs */ unsigned int GetLegacySigOpCount() const; @@ -562,7 +560,6 @@ public: @param[in] mapInputs Map of previous transactions that have outputs we're spending @return maximum number of sigops required to validate this transaction's inputs - @see CTransaction::FetchInputs */ unsigned int GetP2SHSigOpCount(CCoinsViewCache& mapInputs) const; @@ -587,7 +584,6 @@ public: @param[in] mapInputs Map of previous transactions that have outputs we're spending @return Sum of value of all inputs (scriptSigs) - @see CTransaction::FetchInputs */ int64 GetValueIn(CCoinsViewCache& mapInputs) const; @@ -818,7 +814,6 @@ public: return true; } - }; /** pruned version of CTransaction: only retains metadata and unspent transaction outputs @@ -1279,7 +1274,6 @@ public: return hash; } - bool WriteToDisk(CDiskBlockPos &pos) { // Open history file to append |