Fix clang warnings

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<output_formatter>
-create_formatter(request &req, mime::type best_type,
-                 output_buffer&);
+create_formatter(mime::type best_type, output_buffer&);
 
 #endif /* CHOOSE_FORMATTER_HPP */

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<output_buffer> get_buffer_internal();
-  void finish_internal();
+  void write_header_info(int status, const request::headers_t &headers) override;
+  std::shared_ptr<output_buffer> get_buffer_internal() override;
+  void finish_internal() override;
 
 private:
   struct pimpl;

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);

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);

src/choose_formatter.cpp

@@ -258,26 +258,27 @@ mime::type choose_best_mime_type(request &req, responder& hptr) {
   return best_type;
 }
 
-std::unique_ptr<output_formatter> create_formatter(request &req,
-                                              mime::type best_type,
-                                              output_buffer& out) {
+std::unique_ptr<output_formatter> create_formatter(mime::type best_type, output_buffer& out) {
 
 
-  if (best_type == mime::application_xml) {
-    return std::unique_ptr<output_formatter>(new xml_formatter(std::unique_ptr<xml_writer>(new xml_writer(out, true))));
+  switch (best_type) {
+    case mime::application_xml:
+      return std::unique_ptr<output_formatter>(new xml_formatter(std::unique_ptr<xml_writer>(new xml_writer(out, true))));
 
 #ifdef HAVE_YAJL
-  } else if (best_type == mime::application_json) {
+    case mime::application_json:
       return std::unique_ptr<output_formatter>(new json_formatter(std::unique_ptr<json_writer>(new json_writer(out, false))));
 #endif
-  } else if (best_type == mime::text_plain) {
+    case mime::text_plain:
       return std::unique_ptr<output_formatter>(new text_formatter(std::unique_ptr<text_writer>(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());
 }
 
 

src/data_selection.cpp

@@ -2,49 +2,6 @@
 
 data_selection::~data_selection() = default;
 
-/*
-int data_selection::select_historical_nodes(const std::vector<osm_edition_t> &) {
-  return 0;
-}
-
-int data_selection::select_nodes_with_history(const std::vector<osm_nwr_id_t> &) {
-  return 0;
-}
-
-int data_selection::select_historical_ways(const std::vector<osm_edition_t> &) {
-  return 0;
-}
-
-int data_selection::select_ways_with_history(const std::vector<osm_nwr_id_t> &) {
-  return 0;
-}
-
-int data_selection::select_historical_relations(const std::vector<osm_edition_t> &) {
-  return 0;
-}
-int data_selection::select_relations_with_history(const std::vector<osm_nwr_id_t> &) {
-  return 0;
-}
-
-void data_selection::set_redactions_visible(bool) {}
-
-int data_selection::select_historical_by_changesets(const std::vector<osm_changeset_id_t> &) {
-  return 0;
-}
-
-
-void data_selection::write_changesets(output_formatter &, const std::chrono::system_clock::time_point &) {
-}
-
-int data_selection::select_changesets(const std::vector<osm_changeset_id_t> &) {
-  return 0;
-}
-
-void data_selection::select_changeset_discussions() {
-}
-
-*/
-
 data_selection::factory::~factory() = default;
 
 

src/process_request.cpp

@@ -201,7 +201,7 @@ process_get_request(request &req, handler_ptr_t handler,
   std::shared_ptr<output_buffer> 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<output_buffer> 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

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 {

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 {}
 

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<output_buffer> get_buffer_internal();
-  void finish_internal();
+  std::shared_ptr<output_buffer> get_buffer_internal() override;
+  void finish_internal() override;
 
 private:
   std::string method, scheme, authority, port, path, get_params;

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;