diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-07-05 13:25:52 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-07-05 13:26:27 -0400 |
| commit | dab9fa7f919807885bd693c4fa14ed740792c294 (patch) | |
| tree | c629ba7da872cb8b3a24fccfaeb984220c79c7de /src/script.cpp | |
| parent | b47d2bc164bd21d4bec988fa8abfecc74d5ce5da (diff) | |
| download | bitcoin-dab9fa7f919807885bd693c4fa14ed740792c294.tar.xz | |
Use unsigned ints to fix signed/unsigned warnings
Diffstat (limited to 'src/script.cpp')
| -rw-r--r-- | src/script.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/script.cpp b/src/script.cpp index 103fc0e422..c29648c2bc 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -1331,7 +1331,7 @@ bool SignN(const vector<valtype>& multisigdata, const CKeyStore& keystore, uint2 { int nSigned = 0; int nRequired = multisigdata.front()[0]; - for (int i = 1; i < multisigdata.size()-1 && nSigned < nRequired; i++) + for (unsigned int i = 1; i < multisigdata.size()-1 && nSigned < nRequired; i++) { const valtype& pubkey = multisigdata[i]; CKeyID keyID = CPubKey(pubkey).GetID(); @@ -1672,12 +1672,13 @@ static CScript CombineMultisig(CScript scriptPubKey, const CTransaction& txTo, u } // Build a map of pubkey -> signature by matching sigs to pubkeys: - int nSigsRequired = vSolutions.front()[0]; - int nPubKeys = vSolutions.size()-2; + assert(vSolutions.size() > 1); + unsigned int nSigsRequired = vSolutions.front()[0]; + unsigned int nPubKeys = vSolutions.size()-2; map<valtype, valtype> sigs; BOOST_FOREACH(const valtype& sig, allsigs) { - for (int i = 0; i < nPubKeys; i++) + for (unsigned int i = 0; i < nPubKeys; i++) { const valtype& pubkey = vSolutions[i+1]; if (sigs.count(pubkey)) @@ -1693,7 +1694,7 @@ static CScript CombineMultisig(CScript scriptPubKey, const CTransaction& txTo, u // Now build a merged CScript: unsigned int nSigsHave = 0; CScript result; result << OP_0; // pop-one-too-many workaround - for (int i = 0; i < nPubKeys && nSigsHave < nSigsRequired; i++) + for (unsigned int i = 0; i < nPubKeys && nSigsHave < nSigsRequired; i++) { if (sigs.count(vSolutions[i+1])) { @@ -1702,7 +1703,7 @@ static CScript CombineMultisig(CScript scriptPubKey, const CTransaction& txTo, u } } // Fill any missing with OP_0: - for (int i = nSigsHave; i < nSigsRequired; i++) + for (unsigned int i = nSigsHave; i < nSigsRequired; i++) result << OP_0; return result; |