Drop unused pindexRet arg to CMerkleTx::GetDepthInMainChain

Empact · Empact · commit d6f39b6c6429 · 2018-07-11T00:22:10.000-04:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4416,7 +4416,7 @@ void CMerkleTx::SetMerkleBranch(const CBlockIndex* pindex, int posInBlock)
     nIndex = posInBlock;
 }
 
-int CMerkleTx::GetDepthInMainChain(const CBlockIndex* &pindexRet) const
+int CMerkleTx::GetDepthInMainChain() const
 {
     if (hashUnset())
         return 0;
@@ -4428,7 +4428,6 @@ int CMerkleTx::GetDepthInMainChain(const CBlockIndex* &pindexRet) const
     if (!pindex || !chainActive.Contains(pindex))
         return 0;
 
-    pindexRet = pindex;
     return ((nIndex == -1) ? (-1) : 1) * (chainActive.Height() - pindex->nHeight + 1);
 }
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -267,9 +267,8 @@ class CMerkleTx
      *  0  : in memory pool, waiting to be included in a block
      * >=1 : this many blocks deep in the main chain
      */
-    int GetDepthInMainChain(const CBlockIndex* &pindexRet) const;
-    int GetDepthInMainChain() const { const CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); }
-    bool IsInMainChain() const { const CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet) > 0; }
+    int GetDepthInMainChain() const;
+    bool IsInMainChain() const { return GetDepthInMainChain() > 0; }
     int GetBlocksToMaturity() const;
     bool hashUnset() const { return (hashBlock.IsNull() || hashBlock == ABANDON_HASH); }
     bool isAbandoned() const { return (hashBlock == ABANDON_HASH); }

Original file line number	Diff line number	Diff line change
`@@ -4416,7 +4416,7 @@ void CMerkleTx::SetMerkleBranch(const CBlockIndex* pindex, int posInBlock)`
`4416`	`4416`	`nIndex = posInBlock;`
`4417`	`4417`	`}`
`4418`	`4418`
`4419`		`-int CMerkleTx::GetDepthInMainChain(const CBlockIndex* &pindexRet) const`
	`4419`	`+int CMerkleTx::GetDepthInMainChain() const`
`4420`	`4420`	`{`
`4421`	`4421`	`if (hashUnset())`
`4422`	`4422`	`return 0;`
`@@ -4428,7 +4428,6 @@ int CMerkleTx::GetDepthInMainChain(const CBlockIndex* &pindexRet) const`
`4428`	`4428`	`if (!pindex \|\| !chainActive.Contains(pindex))`
`4429`	`4429`	`return 0;`
`4430`	`4430`
`4431`		`- pindexRet = pindex;`
`4432`	`4431`	`return ((nIndex == -1) ? (-1) : 1) * (chainActive.Height() - pindex->nHeight + 1);`
`4433`	`4432`	`}`
`4434`	`4433`