Merge branch '2012_09_fixwformat' of github.com:laanwj/bitcoin

This commit is contained in:
Gavin Andresen
2012-10-01 16:52:42 -04:00
15 changed files with 49 additions and 39 deletions

View File

@@ -725,7 +725,7 @@ Value addmultisigaddress(const Array& params, bool fHelp)
if ((int)keys.size() < nRequired)
throw runtime_error(
strprintf("not enough keys supplied "
"(got %d keys, but need at least %d to redeem)", keys.size(), nRequired));
"(got %"PRIszu" keys, but need at least %d to redeem)", keys.size(), nRequired));
std::vector<CKey> pubkeys;
pubkeys.resize(keys.size());
for (unsigned int i = 0; i < keys.size(); i++)