Fix some more warnings

Karbovanets · May 5, 2024 · e90567e · e90567e
1 parent c3c78f8
commit e90567e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/src/CryptoNoteCore/BlockchainCache.cpp b/src/CryptoNoteCore/BlockchainCache.cpp
@@ -1,7 +1,8 @@
 // Copyright (c) 2012-2017, The CryptoNote developers, The Bytecoin developers
 // Copyright (c) 2014-2018, The Monero Project
 // Copyright (c) 2018-2019, The TurtleCoin Developers
-// Copyright (c) 2018-2020, The Karbo Developers
+// Copyright (c) 2019-2023, The Talleo developers
+// Copyright (c) 2017-2024, The Karbo Developers
 //
 // This file is part of Karbo.
 //
@@ -293,8 +294,9 @@ std::unique_ptr<IBlockchainCache> BlockchainCache::split(uint32_t splitBlockInde
   splitMultiSignatureOutputsGlobalIndexes(*newCache, splitBlockIndex);
 
   fixChildrenParent(newCache.get());
-  newCache->children = children;
-  children = { newCache.get() };
+  newCache->children = std::move(children);
+  children.clear();
+  children.push_back(newCache.get());
 
   logger(Logging::DEBUGGING) << "Split successfully completed";
   return newCache;

diff --git a/src/CryptoNoteCore/Core.cpp b/src/CryptoNoteCore/Core.cpp
@@ -2,7 +2,8 @@
 // Copyright (c) 2017, The Monero Project
 // Copyright (c) 2018, The Galaxia Project Developers
 // Copyright (c) 2018-2019, The TurtleCoin Developers
-// Copyright (c) 2017-2020, The The Karbo Developers
+// Copyright (c) 2019-2023, The Talleo developers
+// Copyright (c) 2017-2024, The Karbo Developers
 //
 // This file is part of Karbo.
 //
@@ -1988,10 +1989,13 @@ IBlockchainCache* Core::findSegmentContainingBlock(uint32_t blockHeight) const {
 }
 
 IBlockchainCache* Core::findAlternativeSegmentContainingBlock(const Crypto::Hash& blockHash) const {
-  IBlockchainCache* cache = nullptr;
-  std::find_if(++chainsLeaves.begin(), chainsLeaves.end(),
-               [&](IBlockchainCache* chain) { return cache = findIndexInChain(chain, blockHash); });
-  return cache;
+  for (size_t chain = 1; chain < chainsLeaves.size(); ++chain) {
+    IBlockchainCache* cache = findIndexInChain(chainsLeaves[chain], blockHash);
+    if (cache != nullptr) {
+      return cache;
+    }
+  }
+  return nullptr;
 }
 
 IBlockchainCache* Core::findMainChainSegmentContainingBlock(const Crypto::Hash& blockHash) const {
@@ -2002,11 +2006,13 @@ IBlockchainCache* Core::findMainChainSegmentContainingBlock(uint32_t blockIndex)
   return findIndexInChain(chainsLeaves[0], blockIndex);
 }
 
-// WTF?! this function returns first chain it is able to find..
 IBlockchainCache* Core::findAlternativeSegmentContainingBlock(uint32_t blockIndex) const {
-  IBlockchainCache* cache = nullptr;
-  std::find_if(++chainsLeaves.begin(), chainsLeaves.end(),
-               [&](IBlockchainCache* chain) { return cache = findIndexInChain(chain, blockIndex); });
+  for (size_t chain = 1; chain < chainsLeaves.size(); ++chain) {
+    IBlockchainCache* cache = findIndexInChain(chainsLeaves[chain], blockIndex);
+    if (cache != nullptr) {
+      return cache;
+    }
+  }
   return nullptr;
 }