Address rabbit comments.

Author: gibber9809

components/core/src/clp_s/FileWriter.hpp

@@ -5,6 +5,7 @@
 
 #include <cstdio>
 #include <string>
+#include <utility>
 
 #include "ErrorCode.hpp"
 #include "TraceableException.hpp"
@@ -34,18 +35,16 @@ class FileWriter {
     auto operator=(FileWriter const&) -> FileWriter& = delete;
 
     // Define custom move constructor/assignment operator
-    FileWriter(FileWriter&& writer) {
-        m_file = writer.m_file;
-        m_fd = writer.m_fd;
-        writer.m_file = nullptr;
-        writer.m_fd = -1;
-    }
+    FileWriter(FileWriter&& writer)
+            : m_file{std::exchange(writer.m_file, nullptr)},
+              m_fd{std::exchange(writer.m_fd, -1)} {}
 
     auto operator=(FileWriter&& writer) -> FileWriter& {
-        m_file = writer.m_file;
-        m_fd = writer.m_fd;
-        writer.m_file = nullptr;
-        writer.m_fd = -1;
+        if (this == &writer) {
+            return *this;
+        }
+        m_file = std::exchange(writer.m_file, nullptr);
+        m_fd = std::exchange(writer.m_fd, -1);
         return *this;
     }
 

components/core/src/clp_s/log_converter/CMakeLists.txt

@@ -1,7 +1,7 @@
 set(
     CLP_S_CONVERTER_SOURCES
     CommandLineArguments.cpp
-    CommandLineArguments.cpp
+    CommandLineArguments.hpp
     LogConverter.cpp
     LogConverter.hpp
     LogSerializer.cpp
@@ -19,7 +19,9 @@ if(CLP_BUILD_EXECUTABLES)
         log-converter
         PRIVATE
         Boost::program_options
+        clp_s::clp_dependencies
         clp_s::io
+        fmt::fmt
         log_surgeon::log_surgeon
         msgpack-cxx
         nlohmann_json::nlohmann_json

components/core/src/clp_s/log_converter/LogConverter.cpp

@@ -32,7 +32,7 @@ constexpr std::string_view cTimestampSchema{
         R"((Dec(ember){0,1}))[ /\-]\d{2,4})[ T:][ 0-9]{2}:[ 0-9]{2}:[ 0-9]{2})"
         R"(([,\.:]\d{1,9}){0,1}([ ]{0,1}(UTC){0,1}[\+\-]\d{2}(:{0,1}\d{2}){0,1}Z{0,1}){0,1})"
 };
-constexpr std::string_view cDelimeters{R"(delimiters: \t\r\n\[\(:)"};
+constexpr std::string_view cDelimiters{R"(delimiters: \t\r\n\[\(:)"};
 }  // namespace
 
 auto LogConverter::refill_buffer(std::shared_ptr<clp::ReaderInterface>& reader)
@@ -84,7 +84,7 @@ auto LogConverter::convert_file(
         std::string_view output_dir
 ) -> bool {
     log_surgeon::Schema schema;
-    schema.add_delimiters(cDelimeters);
+    schema.add_delimiters(cDelimiters);
     schema.add_variable(cTimestampSchema, -1);
     log_surgeon::BufferParser parser{std::move(schema.release_schema_ast_ptr())};
     parser.reset();

components/core/src/clp_s/log_converter/log_converter.cpp

@@ -21,7 +21,7 @@ using clp_s::log_converter::LogConverter;
 
 namespace {
 /**
- * Checks for and logs CURl errors on a reader.
+ * Checks for and logs CURL errors on a reader.
  * @param path The path that the reader has opened.
  * @param reader The open reader which may have experienced a CURL error.
  * @return Whether a CURL error has occurred on the reader.