From 7e55c1ab650163011a690daf74cb1cc89bdd563b Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Thu, 29 Sep 2011 09:46:52 -0400 Subject: [PATCH] Collapse no-op ExtractAddress/ExtractAddressInner --- src/script.cpp | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/src/script.cpp b/src/script.cpp index 12d3f9e..4b2dc9a 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -1117,7 +1117,7 @@ bool IsMine(const CKeyStore &keystore, const CScript& scriptPubKey) return true; } -bool static ExtractAddressInner(const CScript& scriptPubKey, const CKeyStore* keystore, CBitcoinAddress& addressRet) +bool ExtractAddress(const CScript& scriptPubKey, const CKeyStore* keystore, CBitcoinAddress& addressRet) { vector > vSolution; if (!Solver(scriptPubKey, vSolution)) @@ -1137,15 +1137,6 @@ bool static ExtractAddressInner(const CScript& scriptPubKey, const CKeyStore* ke } -bool ExtractAddress(const CScript& scriptPubKey, const CKeyStore* keystore, CBitcoinAddress& addressRet) -{ - if (keystore) - return ExtractAddressInner(scriptPubKey, keystore, addressRet); - else - return ExtractAddressInner(scriptPubKey, NULL, addressRet); - return false; -} - bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn, int nHashType) { -- 1.7.1