From d493ca22ca7518246a82c08f977b0c07e42c47bd Mon Sep 17 00:00:00 2001 From: mmd-osm Date: Sat, 2 Jul 2022 17:14:35 +0200 Subject: [PATCH] Fix clang warnings --- include/cgimap/choose_formatter.hpp | 3 +- include/cgimap/fcgi_request.hpp | 6 ++-- include/cgimap/json_writer.hpp | 1 - include/cgimap/text_writer.hpp | 1 - src/choose_formatter.cpp | 23 +++++++-------- src/data_selection.cpp | 43 ----------------------------- src/process_request.cpp | 4 +-- src/rate_limiter.cpp | 4 +-- test/test_apidb_backend_oauth2.cpp | 6 ++-- test/test_oauth.cpp | 10 +++---- test/test_request.hpp | 2 +- 11 files changed, 29 insertions(+), 74 deletions(-) diff --git a/include/cgimap/choose_formatter.hpp b/include/cgimap/choose_formatter.hpp index b849afd66..abb1673fa 100644 --- a/include/cgimap/choose_formatter.hpp +++ b/include/cgimap/choose_formatter.hpp @@ -19,7 +19,6 @@ mime::type choose_best_mime_type(request &req, responder& hptr); * passed in as an argument. */ std::unique_ptr -create_formatter(request &req, mime::type best_type, - output_buffer&); +create_formatter(mime::type best_type, output_buffer&); #endif /* CHOOSE_FORMATTER_HPP */ diff --git a/include/cgimap/fcgi_request.hpp b/include/cgimap/fcgi_request.hpp index 86a34767d..f75817eda 100644 --- a/include/cgimap/fcgi_request.hpp +++ b/include/cgimap/fcgi_request.hpp @@ -23,9 +23,9 @@ struct fcgi_request : public request { void dispose() override; protected: - void write_header_info(int status, const request::headers_t &headers); - std::shared_ptr get_buffer_internal(); - void finish_internal(); + void write_header_info(int status, const request::headers_t &headers) override; + std::shared_ptr get_buffer_internal() override; + void finish_internal() override; private: struct pimpl; diff --git a/include/cgimap/json_writer.hpp b/include/cgimap/json_writer.hpp index 55261d652..90ec3d05d 100644 --- a/include/cgimap/json_writer.hpp +++ b/include/cgimap/json_writer.hpp @@ -15,7 +15,6 @@ class json_writer : public output_writer { json_writer(const json_writer &) = delete; json_writer& operator=(const json_writer &) = delete; json_writer(json_writer &&) = default; - json_writer& operator=(json_writer &&) = default; // create a json writer using a callback object for output json_writer(output_buffer &out, bool indent = false); diff --git a/include/cgimap/text_writer.hpp b/include/cgimap/text_writer.hpp index c09907632..5e55befcd 100644 --- a/include/cgimap/text_writer.hpp +++ b/include/cgimap/text_writer.hpp @@ -16,7 +16,6 @@ class text_writer : public output_writer { text_writer(const text_writer &) = delete; text_writer& operator=(const text_writer &) = delete; text_writer(text_writer &&) = default; - text_writer& operator=(text_writer &&) = default; // create a new text writer using writer callback functions text_writer(output_buffer &out, bool indent = false); diff --git a/src/choose_formatter.cpp b/src/choose_formatter.cpp index 240bcb2e8..2ee65b06b 100644 --- a/src/choose_formatter.cpp +++ b/src/choose_formatter.cpp @@ -258,26 +258,27 @@ mime::type choose_best_mime_type(request &req, responder& hptr) { return best_type; } -std::unique_ptr create_formatter(request &req, - mime::type best_type, - output_buffer& out) { +std::unique_ptr create_formatter(mime::type best_type, output_buffer& out) { - if (best_type == mime::application_xml) { - return std::unique_ptr(new xml_formatter(std::unique_ptr(new xml_writer(out, true)))); + switch (best_type) { + case mime::application_xml: + return std::unique_ptr(new xml_formatter(std::unique_ptr(new xml_writer(out, true)))); #ifdef HAVE_YAJL - } else if (best_type == mime::application_json) { + case mime::application_json: return std::unique_ptr(new json_formatter(std::unique_ptr(new json_writer(out, false)))); #endif - } else if (best_type == mime::text_plain) { + case mime::text_plain: return std::unique_ptr(new text_formatter(std::unique_ptr(new text_writer(out, true)))); + + default: + ostringstream ostr; + ostr << "Could not create formatter for MIME type `" + << mime::to_string(best_type) << "'."; + throw runtime_error(ostr.str()); } - ostringstream ostr; - ostr << "Could not create formatter for MIME type `" - << mime::to_string(best_type) << "'."; - throw runtime_error(ostr.str()); } diff --git a/src/data_selection.cpp b/src/data_selection.cpp index a9f45a7ca..3586baf44 100644 --- a/src/data_selection.cpp +++ b/src/data_selection.cpp @@ -2,49 +2,6 @@ data_selection::~data_selection() = default; -/* -int data_selection::select_historical_nodes(const std::vector &) { - return 0; -} - -int data_selection::select_nodes_with_history(const std::vector &) { - return 0; -} - -int data_selection::select_historical_ways(const std::vector &) { - return 0; -} - -int data_selection::select_ways_with_history(const std::vector &) { - return 0; -} - -int data_selection::select_historical_relations(const std::vector &) { - return 0; -} -int data_selection::select_relations_with_history(const std::vector &) { - return 0; -} - -void data_selection::set_redactions_visible(bool) {} - -int data_selection::select_historical_by_changesets(const std::vector &) { - return 0; -} - - -void data_selection::write_changesets(output_formatter &, const std::chrono::system_clock::time_point &) { -} - -int data_selection::select_changesets(const std::vector &) { - return 0; -} - -void data_selection::select_changeset_discussions() { -} - -*/ - data_selection::factory::~factory() = default; diff --git a/src/process_request.cpp b/src/process_request.cpp index 023f2f23a..d0b62b347 100644 --- a/src/process_request.cpp +++ b/src/process_request.cpp @@ -201,7 +201,7 @@ process_get_request(request &req, handler_ptr_t handler, std::shared_ptr out = encoding->buffer(req.get_buffer()); // create the correct mime type output formatter. - auto o_formatter = create_formatter(req, best_mime_type, *out); + auto o_formatter = create_formatter(best_mime_type, *out); try { // call to write the response @@ -301,7 +301,7 @@ process_post_put_request(request &req, handler_ptr_t handler, std::shared_ptr out = encoding->buffer(req.get_buffer()); // create the correct mime type output formatter. - auto o_formatter = create_formatter(req, best_mime_type, *out); + auto o_formatter = create_formatter(best_mime_type, *out); try { // // call to write the response diff --git a/src/rate_limiter.cpp b/src/rate_limiter.cpp index 1195cedf0..e7496f3cd 100644 --- a/src/rate_limiter.cpp +++ b/src/rate_limiter.cpp @@ -7,11 +7,11 @@ rate_limiter::~rate_limiter() = default; null_rate_limiter::~null_rate_limiter() = default; -bool null_rate_limiter::check(const std::string &key) { +bool null_rate_limiter::check(const std::string &) { return true; } -void null_rate_limiter::update(const std::string &key, int bytes) { +void null_rate_limiter::update(const std::string &, int) { } struct memcached_rate_limiter::state { diff --git a/test/test_apidb_backend_oauth2.cpp b/test/test_apidb_backend_oauth2.cpp index cd2e2a26c..10b17c300 100644 --- a/test/test_apidb_backend_oauth2.cpp +++ b/test/test_apidb_backend_oauth2.cpp @@ -168,9 +168,9 @@ class empty_data_selection virtual ~empty_data_selection() = default; - void write_nodes(output_formatter &formatter) {} - void write_ways(output_formatter &formatter) {} - void write_relations(output_formatter &formatter) {} + void write_nodes(output_formatter &formatter) override {} + void write_ways(output_formatter &formatter) override {} + void write_relations(output_formatter &formatter) override {} void write_changesets(output_formatter &formatter, const std::chrono::system_clock::time_point &now) override {} diff --git a/test/test_oauth.cpp b/test/test_oauth.cpp index fc8e59960..be34e7507 100644 --- a/test/test_oauth.cpp +++ b/test/test_oauth.cpp @@ -54,15 +54,15 @@ struct test_request : public request { const char *get_param(const char *key) const override; const std::string get_payload() override; - void dispose(); + void dispose() override; - std::chrono::system_clock::time_point get_current_time() const; + std::chrono::system_clock::time_point get_current_time() const override; protected: - void write_header_info(int status, const headers_t &headers); + void write_header_info(int status, const headers_t &headers) override; - std::shared_ptr get_buffer_internal(); - void finish_internal(); + std::shared_ptr get_buffer_internal() override; + void finish_internal() override; private: std::string method, scheme, authority, port, path, get_params; diff --git a/test/test_request.hpp b/test/test_request.hpp index 24afd8c2d..409f6f10d 100644 --- a/test/test_request.hpp +++ b/test/test_request.hpp @@ -48,7 +48,7 @@ struct test_request : public request { std::stringstream &body(); std::stringstream &header(); - std::chrono::system_clock::time_point get_current_time() const; + std::chrono::system_clock::time_point get_current_time() const override; void set_current_time(const std::chrono::system_clock::time_point &now); int response_status() const;