Use anonymous namespace instead of static functions

sipa · sipa · commit 7d0f80bbf4de · 2018-04-19T21:06:47.000-07:00
diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp
@@ -13,6 +13,8 @@
 
 typedef std::vector<unsigned char> valtype;
 
+namespace {
+
 /**
  * This is an enum that tracks the execution context of a script, similar to
  * SigVersion in script/interpreter. It is separate however because we want to
@@ -26,12 +28,12 @@ enum class IsMineSigVersion
     WITNESS_V0 = 2  //! P2WSH witness script execution
 };
 
-static bool PermitsUncompressed(IsMineSigVersion sigversion)
+bool PermitsUncompressed(IsMineSigVersion sigversion)
 {
     return sigversion == IsMineSigVersion::TOP || sigversion == IsMineSigVersion::P2SH;
 }
 
-static bool HaveKeys(const std::vector<valtype>& pubkeys, const CKeyStore& keystore)
+bool HaveKeys(const std::vector<valtype>& pubkeys, const CKeyStore& keystore)
 {
     for (const valtype& pubkey : pubkeys) {
         CKeyID keyID = CPubKey(pubkey).GetID();
@@ -40,7 +42,7 @@ static bool HaveKeys(const std::vector<valtype>& pubkeys, const CKeyStore& keyst
     return true;
 }
 
-static isminetype IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey, bool& isInvalid, IsMineSigVersion sigversion)
+isminetype IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey, bool& isInvalid, IsMineSigVersion sigversion)
 {
     isInvalid = false;
 
@@ -154,6 +156,8 @@ static isminetype IsMineInner(const CKeyStore& keystore, const CScript& scriptPu
     return ISMINE_NO;
 }
 
+} // namespace
+
 isminetype IsMine(const CKeyStore& keystore, const CScript& scriptPubKey, bool& isInvalid)
 {
     return IsMineInner(keystore, scriptPubKey, isInvalid, IsMineSigVersion::TOP);

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`
`14`	`14`	`typedef std::vector<unsigned char> valtype;`
`15`	`15`
	`16`	`+namespace {`
	`17`	`+`
`16`	`18`	`/**`
`17`	`19`	`* This is an enum that tracks the execution context of a script, similar to`
`18`	`20`	`* SigVersion in script/interpreter. It is separate however because we want to`
`@@ -26,12 +28,12 @@ enum class IsMineSigVersion`
`26`	`28`	`WITNESS_V0 = 2 //! P2WSH witness script execution`
`27`	`29`	`};`
`28`	`30`
`29`		`-static bool PermitsUncompressed(IsMineSigVersion sigversion)`
	`31`	`+bool PermitsUncompressed(IsMineSigVersion sigversion)`
`30`	`32`	`{`
`31`	`33`	`return sigversion == IsMineSigVersion::TOP \|\| sigversion == IsMineSigVersion::P2SH;`
`32`	`34`	`}`
`33`	`35`
`34`		`-static bool HaveKeys(const std::vector<valtype>& pubkeys, const CKeyStore& keystore)`
	`36`	`+bool HaveKeys(const std::vector<valtype>& pubkeys, const CKeyStore& keystore)`
`35`	`37`	`{`
`36`	`38`	`for (const valtype& pubkey : pubkeys) {`
`37`	`39`	`CKeyID keyID = CPubKey(pubkey).GetID();`
`@@ -40,7 +42,7 @@ static bool HaveKeys(const std::vector<valtype>& pubkeys, const CKeyStore& keyst`
`40`	`42`	`return true;`
`41`	`43`	`}`
`42`	`44`
`43`		`-static isminetype IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey, bool& isInvalid, IsMineSigVersion sigversion)`
	`45`	`+isminetype IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey, bool& isInvalid, IsMineSigVersion sigversion)`
`44`	`46`	`{`
`45`	`47`	`isInvalid = false;`
`46`	`48`
`@@ -154,6 +156,8 @@ static isminetype IsMineInner(const CKeyStore& keystore, const CScript& scriptPu`
`154`	`156`	`return ISMINE_NO;`
`155`	`157`	`}`
`156`	`158`
	`159`	`+} // namespace`
	`160`	`+`
`157`	`161`	`isminetype IsMine(const CKeyStore& keystore, const CScript& scriptPubKey, bool& isInvalid)`
`158`	`162`	`{`
`159`	`163`	`return IsMineInner(keystore, scriptPubKey, isInvalid, IsMineSigVersion::TOP);`