aboutsummaryrefslogtreecommitdiff
path: root/src/script.cpp
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@exmulti.com>2012-08-01 10:56:47 -0700
committerJeff Garzik <jgarzik@exmulti.com>2012-08-01 10:56:47 -0700
commitf81e6f779b66e235afd6c5241306d5e70ec41276 (patch)
tree208e1d5fb7b77c41e67edb372e2590250c32faac /src/script.cpp
parentffe47d6d5d6ddfc0ad145f5a891e2165c3d69009 (diff)
parentb49f1398a1a02eab06def81a9d25b972c81b8fe1 (diff)
downloadbitcoin-f81e6f779b66e235afd6c5241306d5e70ec41276.tar.xz
Merge pull request #1632 from luke-jr/spelling
Fix spelling and grammar errors
Diffstat (limited to 'src/script.cpp')
-rw-r--r--src/script.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/script.cpp b/src/script.cpp
index c29648c2bc..8c35f0eed5 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -1070,7 +1070,7 @@ uint256 SignatureHash(CScript scriptCode, const CTransaction& txTo, unsigned int
}
else if ((nHashType & 0x1f) == SIGHASH_SINGLE)
{
- // Only lockin the txout payee at same index as txin
+ // Only lock-in the txout payee at same index as txin
unsigned int nOut = nIn;
if (nOut >= txTmp.vout.size())
{
@@ -1272,7 +1272,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
if (!script2.GetOp(pc2, opcode2, vch2))
break;
// Normal situation is to fall through
- // to other if/else statments
+ // to other if/else statements
}
if (opcode2 == OP_PUBKEY)
@@ -1345,7 +1345,7 @@ bool SignN(const vector<valtype>& multisigdata, const CKeyStore& keystore, uint2
// Sign scriptPubKey with private keys stored in keystore, given transaction hash and hash type.
// Signatures are returned in scriptSigRet (or returns false if scriptPubKey can't be signed),
// unless whichTypeRet is TX_SCRIPTHASH, in which case scriptSigRet is the redemption script.
-// Returns false if scriptPubKey could not be completely satisified.
+// Returns false if scriptPubKey could not be completely satisfied.
//
bool Solver(const CKeyStore& keystore, const CScript& scriptPubKey, uint256 hash, int nHashType,
CScript& scriptSigRet, txnouttype& whichTypeRet)
@@ -1733,7 +1733,7 @@ static CScript CombineSignatures(CScript scriptPubKey, const CTransaction& txTo,
return PushAll(sigs1);
else
{
- // Recurse to combine:
+ // Recur to combine:
valtype spk = sigs1.back();
CScript pubKey2(spk.begin(), spk.end());
@@ -1811,7 +1811,7 @@ unsigned int CScript::GetSigOpCount(const CScript& scriptSig) const
return 0;
}
- /// ... and return it's opcount:
+ /// ... and return its opcount:
CScript subscript(data.begin(), data.end());
return subscript.GetSigOpCount(true);
}