Fixing various issues reported by static code analysis and compiler w…

…arnings
jgaa · Aug 17, 2024 · 5830d8d · 5830d8d
1 parent 920c8e2
commit 5830d8d
Show file tree

Hide file tree

Showing 31 changed files with 612 additions and 637 deletions.
diff --git a/examples/logip/logip.cpp b/examples/logip/logip.cpp
@@ -39,12 +39,13 @@ BOOST_FUSION_ADAPT_STRUCT(
 
 string now() {
     char date[32] = {};
-    auto now = time(NULL);
+    auto now = time(nullptr);
     strftime(date, sizeof(date), "%Y-%m-%d %H:%M", localtime(&now));
     return date;
 }
 
-int main(int argc, char *argv[]) {
+int main(int /*argc*/, char * /*argv*/[])
+{
 #ifdef RESTC_CPP_LOG_WITH_BOOST_LOG
     namespace logging = boost::log;
     logging::core::get()->set_filter
@@ -71,22 +72,14 @@ int main(int argc, char *argv[]) {
                     .Execute());
                 valid = true;
             } catch (const boost::exception& ex) {
-                clog << now()
-                    << "Caught boost exception: "
-                    << boost::diagnostic_information(ex)
-                    << endl;
+                clog << now() << "Caught boost exception: " << boost::diagnostic_information(ex)
+                     << '\n';
             } catch (const exception& ex) {
-                clog << now()
-                    << "Caught exception: "
-                    << ex.what()
-                    << endl;
+                clog << now() << "Caught exception: " << ex.what() << '\n';
             }
 
             if (valid && (current_ip != data.ip)) {
-                clog << now()
-                    << ' '
-                    << data.ip
-                    << endl;
+                clog << now() << ' ' << data.ip << '\n';
                 current_ip = data.ip;
             }
 

diff --git a/include/restc-cpp/restc-cpp.h b/include/restc-cpp/restc-cpp.h
@@ -140,7 +140,7 @@ class Request {
         Type type = Type::NONE;
         std::string address;
 
-        const std::string& GetName();
+        const std::string &GetName() const;
     };
 
     using args_t = std::deque<Arg>;

diff --git a/src/ChunkedReaderImpl.cpp b/src/ChunkedReaderImpl.cpp
@@ -21,9 +21,7 @@ class ChunkedReaderImpl : public DataReader {
     {
     }
 
-    bool IsEof() const override {
-        return stream_->IsEof();
-    }
+    [[nodiscard]] bool IsEof() const override { return stream_->IsEof(); }
 
     void Finish() override {
         ReadSome();
@@ -36,15 +34,16 @@ class ChunkedReaderImpl : public DataReader {
         }
     }
 
-    string ToPrintable(boost::string_ref buf) const {
+    [[nodiscard]] static string ToPrintable(boost::string_ref buf)
+    {
         ostringstream out;
-        locale loc;
+        locale const loc;
         auto pos = 0;
-        out << endl;
+        out << '\n';
 
         for(const auto ch : buf) {
-            if (!(++pos % line_length)) {
-                out << endl;
+            if ((++pos % line_length) == 0u) {
+                out << '\n';
             }
             if (std::isprint(ch, loc)) {
                 out << ch;
@@ -56,7 +55,8 @@ class ChunkedReaderImpl : public DataReader {
         return out.str();
     }
 
-    void Log(const boost::asio::const_buffers_1 buffers, const char *tag) {
+    static void Log(const boost::asio::const_buffers_1 buffers, const char * /*tag*/)
+    {
         const auto buf_len = boost::asio::buffer_size(*buffers.begin());
 
         // At the time of the implementation, there are never multiple buffers.
@@ -132,11 +132,11 @@ class ChunkedReaderImpl : public DataReader {
         size_t chunk_len = 0;
         char ch = stream_->Getc();
 
-        if (!isxdigit(ch)) {
+        if (isxdigit(ch) == 0) {
             throw ParseException("Missing chunk-length in new chunk.");
         }
 
-        for(; isxdigit(ch); ch = stream_->Getc()) {
+        for (; isxdigit(ch) != 0; ch = stream_->Getc()) {
             chunk_len *= magic_16;
             if (ch >= 'a') {
                 chunk_len += magic_10 + (ch - 'a');
@@ -147,8 +147,9 @@ class ChunkedReaderImpl : public DataReader {
             }
         }
 
-        for(; ch != '\r'; ch = stream_->Getc())
+        for (; ch != '\r'; ch = stream_->Getc()) {
             ;
+        }
 
         if (ch != '\r') {
             throw ParseException("Missing CR in first chunk line");

diff --git a/src/ChunkedWriterImpl.cpp b/src/ChunkedWriterImpl.cpp
@@ -16,7 +16,7 @@ namespace restc_cpp {
 class ChunkedWriterImpl : public DataWriter {
 public:
     ChunkedWriterImpl(add_header_fn_t fn, ptr_t&& source)
-    : next_{move(source)},  add_header_fn_{move(fn)}
+        : next_{std::move(source)},  add_header_fn_{std::move(fn)}
     {
     }
 
@@ -34,8 +34,7 @@ class ChunkedWriterImpl : public DataWriter {
     void Write(const write_buffers_t& buffers) override {
         const auto len = boost::asio::buffer_size(buffers);
         buffers_.resize(1);
-
-        std::copy(buffers.begin(), buffers.end(), std::back_insert_iterator{buffers_});
+        std::copy(buffers.begin(), buffers.end(), std::back_inserter(buffers_));
         DoWrite(len);
     }
 
@@ -100,7 +99,7 @@ class ChunkedWriterImpl : public DataWriter {
 
 DataWriter::ptr_t
 DataWriter::CreateChunkedWriter(add_header_fn_t fn, ptr_t&& source) {
-    return make_unique<ChunkedWriterImpl>(move(fn), move(source));
+    return make_unique<ChunkedWriterImpl>(std::move(fn), std::move(source));
 }
 
 } // namespace

diff --git a/src/ConnectionPoolImpl.cpp b/src/ConnectionPoolImpl.cpp
@@ -126,11 +126,13 @@ class ConnectionPoolImpl
             return entry_->GetConnection()->GetSocket();
         }
 
-        const Socket& GetSocket() const override {
-             return entry_->GetConnection()->GetSocket();
+        [[nodiscard]] const Socket &GetSocket() const override
+        {
+            return entry_->GetConnection()->GetSocket();
         }
 
-        boost::uuids::uuid GetId() const override {
+        [[nodiscard]] boost::uuids::uuid GetId() const override
+        {
             return entry_->GetConnection()->GetId();
         }
 
@@ -207,11 +209,13 @@ class ConnectionPoolImpl
         LOCK_ALWAYS_;
         cache_cleanup_timer_.expires_from_now(
             boost::posix_time::seconds(properties_->cacheCleanupIntervalSeconds));
-        cache_cleanup_timer_.async_wait(std::bind(&ConnectionPoolImpl::OnCacheCleanup,
-                                                  shared_from_this(), std::placeholders::_1));
+        cache_cleanup_timer_.async_wait([capture0 = shared_from_this()](auto &&PH1) {
+            capture0->OnCacheCleanup(std::forward<decltype(PH1)>(PH1));
+        });
     }
 
-    void OnCacheCleanup(const boost::system::error_code& error) {
+    void OnCacheCleanup(const boost::system::error_code &error)
+    {
         RESTC_CPP_LOG_TRACE_("OnCacheCleanup: enter");
         if (closed_) {
             RESTC_CPP_LOG_TRACE_("OnCacheCleanup: closed");
@@ -252,7 +256,8 @@ class ConnectionPoolImpl
         RESTC_CPP_LOG_TRACE_("OnCacheCleanup: leave");
     }
 
-    void OnRelease(const Entry::ptr_t entry) {
+    void OnRelease(const Entry::ptr_t &entry)
+    {
         {
             LOCK_ALWAYS_;
             in_use_.erase(entry->GetKey());

diff --git a/src/DataReaderStream.cpp b/src/DataReaderStream.cpp
@@ -150,7 +150,7 @@ void DataReaderStream::ReadHeaderLines(const add_header_fn_t& addHeader) {
     constexpr size_t max_headers = 256;
 
     while(true) {
-        char ch;
+        char ch = 0;
         string name;
         string value;
         for(ch = Getc(); ch != '\r'; ch = Getc()) {
@@ -199,11 +199,12 @@ void DataReaderStream::ReadHeaderLines(const add_header_fn_t& addHeader) {
 std::string DataReaderStream::GetHeaderValue() {
     constexpr size_t max_header_value_len = 1024 * 4;
     std::string value;
-    char ch;
+    char ch = 0;
 
     while(true) {
-        for (ch = Getc(); ch == ' ' || ch == '\t'; ch = Getc())
+        for (ch = Getc(); ch == ' ' || ch == '\t'; ch = Getc()) {
             ; // skip space
+        }
 
         for (; ch != '\r'; ch = Getc()) {
             value += ch;

diff --git a/src/IoReaderImpl.cpp b/src/IoReaderImpl.cpp
@@ -33,7 +33,7 @@ class IoReaderImpl : public DataReader {
             for(size_t retries = 0;; ++retries) {
                 size_t bytes = 0;
                 try {
-                    if (retries) {
+                    if (retries != 0u) {
                         RESTC_CPP_LOG_DEBUG_("IoReaderImpl::ReadSome: taking a nap");
                         ctx_.Sleep(retries * 20ms);
                         RESTC_CPP_LOG_DEBUG_("IoReaderImpl::ReadSome: Waking up. Will try to read from the socket now.");
@@ -68,7 +68,8 @@ class IoReaderImpl : public DataReader {
         throw ObjectExpiredException("Connection expired");
     }
 
-    bool IsEof() const override {
+    [[nodiscard]] bool IsEof() const override
+    {
         if (auto conn = connection_.lock()) {
             return !conn->GetSocket().IsOpen();
         }

diff --git a/src/IoWriterImpl.cpp b/src/IoWriterImpl.cpp
@@ -59,9 +59,7 @@ class IoWriterImpl : public DataWriter {
         ;
     }
 
-    void SetHeaders(Request::headers_t& ) override {
-        ;
-    }
+    void SetHeaders(Request::headers_t & /*headers*/) override { ; }
 
 private:
     Context& ctx_;

diff --git a/src/NoBodyReaderImpl.cpp b/src/NoBodyReaderImpl.cpp
@@ -10,9 +10,7 @@ class NoBodyReaderImpl : public DataReader {
 public:
     NoBodyReaderImpl() = default;
 
-    bool IsEof() const override {
-        return true;
-    }
+    [[nodiscard]] bool IsEof() const override { return true; }
 
     void Finish() override {
     }

diff --git a/src/PlainReaderImpl.cpp b/src/PlainReaderImpl.cpp
@@ -15,13 +15,12 @@ class PlainReaderImpl : public DataReader {
     : remaining_{contentLength},
       source_{move(source)} {}
 
-    bool IsEof() const override {
-        return remaining_ == 0;
-    }
+    [[nodiscard]] bool IsEof() const override { return remaining_ == 0; }
 
     void Finish() override {
-        if (source_)
+        if (source_) {
             source_->Finish();
+        }
     }
 
     boost::asio::const_buffers_1 ReadSome() override {

diff --git a/src/ReplyImpl.cpp b/src/ReplyImpl.cpp
@@ -154,7 +154,7 @@ void ReplyImpl::HandleDecompression() {
         return;
     }
 
-    boost::tokenizer<> tok(*te_hdr);
+    boost::tokenizer<> const tok(*te_hdr);
     for(auto it = tok.begin(); it != tok.end(); ++it) {
 #ifdef RESTC_CPP_WITH_ZLIB
         if (ciEqLibC()(gzip, *it)) {

diff --git a/src/RequestBodyFileImpl.cpp b/src/RequestBodyFileImpl.cpp
@@ -25,13 +25,9 @@ class RequestBodyFileImpl : public RequestBody
         file_ = make_unique<ifstream>(path_.string(), ios::binary);
     }
 
-    Type GetType() const noexcept override {
-        return Type::FIXED_SIZE;
-    }
+    [[nodiscard]] Type GetType() const noexcept override { return Type::FIXED_SIZE; }
 
-    uint64_t GetFixedSize() const override {
-        return size_;
-    }
+    [[nodiscard]] uint64_t GetFixedSize() const override { return size_; }
 
     bool GetData(write_buffers_t & buffers) override {
         const auto bytes_left = size_ - bytes_read_;
@@ -54,7 +50,7 @@ class RequestBodyFileImpl : public RequestBody
         }
 
         bytes_read_ += read_this_time;
-        buffers.push_back({buffer_.data(), read_this_time});
+        buffers.emplace_back(buffer_.data(), read_this_time);
         return true;
     }
 

diff --git a/src/RequestBodyStringImpl.cpp b/src/RequestBodyStringImpl.cpp
@@ -20,20 +20,16 @@ class RequestBodyStringImpl : public RequestBody
     {
     }
 
-    Type GetType() const noexcept override {
-        return Type::FIXED_SIZE;
-    }
+    [[nodiscard]] Type GetType() const noexcept override { return Type::FIXED_SIZE; }
 
-    std::uint64_t GetFixedSize() const override {
-        return body_.size();
-    }
+    [[nodiscard]] std::uint64_t GetFixedSize() const override { return body_.size(); }
 
     bool GetData(write_buffers_t & buffers) override {
         if (eof_) {
             return false;
         }
 
-        buffers.push_back({body_.c_str(), body_.size()});
+        buffers.emplace_back(body_.c_str(), body_.size());
         eof_ = true;
         return true;
     }
@@ -42,10 +38,7 @@ class RequestBodyStringImpl : public RequestBody
         eof_ = false;
     }
 
-    std::string  GetCopyOfData() const override {
-        return body_;
-    }
-
+    [[nodiscard]] std::string GetCopyOfData() const override { return body_; }
 
 private:
     string body_;