excluded common/StringTools.cpp from format.js cause otherwise it bre…

…akts it
turtlecoin · Aug 15, 2020 · 7bb64f1 · 7bb64f1
1 parent baf9518
commit 7bb64f1
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 30 deletions.
diff --git a/scripts/format.js b/scripts/format.js
@@ -86,9 +86,13 @@ async function getFiles(directory) {
 
 async function formatFile(filePath) {
     try {
-        console.log(`Formatting ${filePath}`);
 
-        await exec(`${binaryName} -i ${filePath}`);
+        if (filePath === "src/common/StringTools.cpp") {
+            console.log(`Didn't format ${filePath}`)
+        } else {
+            console.log(`Formatting ${filePath}`);
+            await exec(`${binaryName} -i ${filePath}`);
+        }    
     } catch (err) {
         console.log(`Error formatting ${filePath}: ${err}`);
     }

diff --git a/src/common/StringTools.cpp b/src/common/StringTools.cpp
@@ -81,9 +81,9 @@ namespace Common
             throw std::runtime_error("fromHex: invalid buffer size");
         }
 
-        // clang-format off
-        for (uint64_t i = 0; i < text.size() > > 1; ++i)
-        // clang-format on    
+        /* clang-format off */
+        for (uint64_t i = 0; i < text.size() >> 1; ++i)
+        /* clang-format on */
         {
             static_cast<uint8_t *>(data)[i] = fromHex(text[i << 1]) << 4 | fromHex(text[(i << 1) + 1]);
         }
@@ -103,9 +103,9 @@ namespace Common
             return false;
         }
 
-        // clang-format off
-        for (uint64_t i = 0; i < text.size() > > 1; ++i)
-        // clang-format on    
+        /* clang-format off */
+        for (uint64_t i = 0; i < text.size() >> 1; ++i)
+        /* clang-format on */
         {
             uint8_t value1;
             if (!fromHex(text[i << 1], value1))
@@ -149,9 +149,9 @@ namespace Common
             return false;
         }
 
-        // clang-format off
-        for (uint64_t i = 0; i < text.size() > > 1; ++i)
-        // clang-format on
+        /* clang-format off */
+        for (uint64_t i = 0; i < text.size() >> 1; ++i)
+        /* clang-format on */
         {
             uint8_t value1;
             if (!fromHex(text[i << 1], value1))

diff --git a/src/walletapi/ParseArguments.cpp b/src/walletapi/ParseArguments.cpp
@@ -30,6 +30,7 @@ ApiConfig parseArguments(int argc, char **argv)
 
     std::string logFilePath;
 
+    // clang-format off
     options.add_options("Core")(
         "h,help", "Display this help message", cxxopts::value<bool>(help)->implicit_value("true"))
 
@@ -38,28 +39,28 @@ ApiConfig parseArguments(int argc, char **argv)
          cxxopts::value<int>(logLevel)->default_value(std::to_string(config.logLevel)),
          "#")
 
-            ("log-file",
-             "Specify filepath to log to. Logging to file is disabled by default",
-             cxxopts::value<std::string>(logFilePath),
-             "<file>")
+        ("log-file",
+         "Specify filepath to log to. Logging to file is disabled by default",
+         cxxopts::value<std::string>(logFilePath),
+         "<file>")
 
-                ("no-console",
-                 "If set, will not provide an interactive console",
-                 cxxopts::value<bool>(noConsole)->default_value("false")->implicit_value("true"))
+        ("no-console",
+         "If set, will not provide an interactive console",
+         cxxopts::value<bool>(noConsole)->default_value("false")->implicit_value("true"))
 
-                    ("scan-coinbase-transactions",
-                     "Scan miner/coinbase transactions",
-                     cxxopts::value<bool>(scanCoinbaseTransactions)->default_value("false")->implicit_value("true"))
+        ("scan-coinbase-transactions",
+         "Scan miner/coinbase transactions",
+         cxxopts::value<bool>(scanCoinbaseTransactions)->default_value("false")->implicit_value("true"))
 
-                        ("threads",
-                         "Specify number of wallet sync threads",
-                         cxxopts::value<unsigned int>(threads)->default_value(
-                             std::to_string(std::max(1u, std::thread::hardware_concurrency()))),
-                         "#")
+        ("threads",
+         "Specify number of wallet sync threads",
+         cxxopts::value<unsigned int>(threads)->default_value(
+             std::to_string(std::max(1u, std::thread::hardware_concurrency()))),
+         "#")
 
-                            ("v,version",
-                             "Output software version information",
-                             cxxopts::value<bool>(version)->default_value("false")->implicit_value("true"));
+        ("v,version",
+         "Output software version information",
+         cxxopts::value<bool>(version)->default_value("false")->implicit_value("true"));
 
     options.add_options("Network")(
         "p,port",
@@ -82,7 +83,8 @@ ApiConfig parseArguments(int argc, char **argv)
          "Specify the <password> to access the RPC server.",
          cxxopts::value<std::string>(config.rpcPassword),
          "<password>");
-
+    // clang-format off
+
     try
     {
         const auto result = options.parse(argc, argv);