libbitcoinconsensus: don't require any global constructors
These static objects are only used in once place, so declare them there instead.
This commit is contained in:
parent
a574189e2a
commit
322317951f
2 changed files with 13 additions and 12 deletions
|
@ -17,13 +17,6 @@
|
|||
using namespace std;
|
||||
|
||||
typedef vector<unsigned char> valtype;
|
||||
static const valtype vchFalse(0);
|
||||
static const valtype vchZero(0);
|
||||
static const valtype vchTrue(1, 1);
|
||||
static const CScriptNum bnZero(0);
|
||||
static const CScriptNum bnOne(1);
|
||||
static const CScriptNum bnFalse(0);
|
||||
static const CScriptNum bnTrue(1);
|
||||
|
||||
namespace {
|
||||
|
||||
|
@ -239,6 +232,14 @@ bool static CheckMinimalPush(const valtype& data, opcodetype opcode) {
|
|||
|
||||
bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, unsigned int flags, const BaseSignatureChecker& checker, ScriptError* serror)
|
||||
{
|
||||
static const CScriptNum bnZero(0);
|
||||
static const CScriptNum bnOne(1);
|
||||
static const CScriptNum bnFalse(0);
|
||||
static const CScriptNum bnTrue(1);
|
||||
static const valtype vchFalse(0);
|
||||
static const valtype vchZero(0);
|
||||
static const valtype vchTrue(1, 1);
|
||||
|
||||
CScript::const_iterator pc = script.begin();
|
||||
CScript::const_iterator pend = script.end();
|
||||
CScript::const_iterator pbegincodehash = script.begin();
|
||||
|
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
using namespace std;
|
||||
|
||||
/**
|
||||
* safeChars chosen to allow simple messages/URLs/email addresses, but avoid anything
|
||||
* even possibly remotely dangerous like & or >
|
||||
*/
|
||||
static string safeChars("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890 .,;_/:?@()");
|
||||
string SanitizeString(const string& str)
|
||||
{
|
||||
/**
|
||||
* safeChars chosen to allow simple messages/URLs/email addresses, but avoid anything
|
||||
* even possibly remotely dangerous like & or >
|
||||
*/
|
||||
static string safeChars("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890 .,;_/:?@()");
|
||||
string strResult;
|
||||
for (std::string::size_type i = 0; i < str.size(); i++)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue