Avoid having multiple declarations in a single statement for readability

kimci86 · Feb 25, 2024 · 4beae79 · 4beae79
1 parent e06e573
commit 4beae79
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/include/Keys.hpp b/include/Keys.hpp
@@ -73,7 +73,9 @@ class Keys
     }
 
 private:
-    std::uint32_t x = 0x12345678, y = 0x23456789, z = 0x34567890;
+    std::uint32_t x = 0x12345678;
+    std::uint32_t y = 0x23456789;
+    std::uint32_t z = 0x34567890;
 };
 
 #endif // BKCRACK_KEYS_HPP
diff --git a/src/Data.cpp b/src/Data.cpp
@@ -21,7 +21,8 @@ struct Range
         return size() < other.size();
     }
 
-    std::vector<std::pair<std::size_t, std::uint8_t>>::iterator begin, end;
+    std::vector<std::pair<std::size_t, std::uint8_t>>::iterator begin;
+    std::vector<std::pair<std::size_t, std::uint8_t>>::iterator end;
 };
 
 } // namespace

diff --git a/src/Zip.cpp b/src/Zip.cpp
@@ -314,7 +314,8 @@ std::istream& Zip::seek(const Entry& entry) const
         throw Error("could not find local file header");
 
     // skip local file header
-    std::uint16_t nameSize, extraSize;
+    std::uint16_t nameSize;
+    std::uint16_t extraSize;
     m_is.seekg(22, std::ios::cur);
     read(m_is, nameSize);
     read(m_is, extraSize);
@@ -361,7 +362,8 @@ void Zip::changeKeys(std::ostream& os, const Keys& oldKeys, const Keys& newKeys,
         std::copy_n(std::istreambuf_iterator<char>(m_is), 22, std::ostreambuf_iterator<char>(os));
         m_is.get();
 
-        std::uint16_t filenameLength, extraSize;
+        std::uint16_t filenameLength;
+        std::uint16_t extraSize;
         read(m_is, filenameLength);
         read(m_is, extraSize);
         write(os, filenameLength);

diff --git a/src/Zreduction.cpp b/src/Zreduction.cpp
@@ -24,7 +24,8 @@ void Zreduction::reduce(Progress& progress)
     constexpr std::size_t      trackSizeThreshold = 1 << 16;
     bool                       tracking           = false;
     std::vector<std::uint32_t> bestCopy;
-    std::size_t                bestIndex = index, bestSize = trackSizeThreshold;
+    std::size_t                bestIndex = index;
+    std::size_t                bestSize  = trackSizeThreshold;
 
     // variables to wait for a limited number of steps when a small enough vector is found
     constexpr std::size_t waitSizeThreshold = 1 << 8;