Merge pull request #2024 from joto/various-code-cleanups

Fix various small issues found by clang-tidy

Author: lonvia

src/expire-output.cpp

@@ -34,7 +34,7 @@ std::size_t expire_output_t::output_tiles_to_file(
 {
     FILE *outfile = std::fopen(m_filename.data(), "a");
     if (outfile == nullptr) {
-        std::system_error error{errno, std::generic_category()};
+        std::system_error const error{errno, std::generic_category()};
         log_warn("Failed to open expired tiles file ({}). Tile expiry "
                  "list will not be written!",
                  error.code().message());

src/middle-pgsql.cpp

@@ -15,6 +15,7 @@
  * emit the final geometry-enabled output formats
 */
 
+#include <array>
 #include <cassert>
 #include <cstdint>
 #include <cstdlib>
@@ -120,6 +121,7 @@ static std::vector<std::string>
 build_sql(options_t const &options, std::vector<std::string> const &templs)
 {
     std::vector<std::string> out;
+    out.reserve(templs.size());
 
     for (auto const &templ : templs) {
         out.push_back(build_sql(options, templ));
@@ -1071,10 +1073,10 @@ void middle_pgsql_t::way_delete(osmid_t osm_id)
 void middle_pgsql_t::relation_set_format1(osmium::Relation const &rel)
 {
     // Sort relation members by their type.
-    idlist_t parts[3];
+    std::array<idlist_t, 3> parts;
 
     for (auto const &m : rel.members()) {
-        parts[osmium::item_type_to_nwr_index(m.type())].push_back(m.ref());
+        parts.at(osmium::item_type_to_nwr_index(m.type())).push_back(m.ref());
     }
 
     m_db_copy.new_line(m_tables.relations().copy_target());

src/options.hpp

@@ -136,7 +136,7 @@ struct options_t
 
     int cache = 800; ///< Memory usable for cache in MB
 
-    unsigned int num_procs;
+    unsigned int num_procs = 1;
 
     /**
      * How many bits should the node id be shifted for the way node index?

src/osm2pgsql.cpp

@@ -72,8 +72,8 @@ static file_info run(options_t const &options)
 
     // Processing: In this phase the input file(s) are read and parsed,
     // populating some of the tables.
-    auto const finfo = process_files(files, &osmdata, options.append,
-                                     get_logger().show_progress());
+    auto finfo = process_files(files, &osmdata, options.append,
+                               get_logger().show_progress());
 
     show_memory_usage();
 

src/properties.cpp

@@ -17,11 +17,10 @@
 
 static constexpr char const *const properties_table = "osm2pgsql_properties";
 
-properties_t::properties_t(std::string const &conninfo,
-                           std::string const &schema)
-: m_conninfo(conninfo), m_schema(schema),
+properties_t::properties_t(std::string conninfo, std::string schema)
+: m_conninfo(std::move(conninfo)), m_schema(std::move(schema)),
   m_has_properties_table(
-      has_table(schema.empty() ? "public" : schema, properties_table))
+      has_table(m_schema.empty() ? "public" : m_schema, properties_table))
 {
     log_debug("Found properties table '{}': {}.", properties_table,
               m_has_properties_table);

src/properties.hpp

@@ -35,7 +35,7 @@ class properties_t
      *
      * \pre You must have called init_database_capabilities() before this.
      */
-    properties_t(std::string const &conninfo, std::string const &schema);
+    properties_t(std::string conninfo, std::string schema);
 
     std::string get_string(std::string const &property,
                            std::string const &default_value) const;

tests/test-properties.cpp

@@ -26,7 +26,7 @@ TEST_CASE("Store and retrieve properties (memory only)")
 
     REQUIRE(properties.get_string("foo", "baz") == "bar");
     REQUIRE(properties.get_string("something", "baz") == "baz");
-    REQUIRE(properties.get_string("empty", "baz") == "");
+    REQUIRE(properties.get_string("empty", "baz").empty());
     REQUIRE_THROWS(properties.get_int("foo", 1));
     REQUIRE_THROWS(properties.get_bool("foo", true));
 
@@ -45,7 +45,7 @@ TEST_CASE("Store and retrieve properties (memory only)")
 TEST_CASE("Store and retrieve properties (with database)")
 {
     for (std::string const schema : {"", "middleschema"}) {
-        testing::pg::tempdb_t db;
+        testing::pg::tempdb_t const db;
         auto conn = db.connect();
         if (!schema.empty()) {
             conn.exec("CREATE SCHEMA IF NOT EXISTS {};", schema);
@@ -82,7 +82,7 @@ TEST_CASE("Store and retrieve properties (with database)")
 
             REQUIRE(properties.get_string("foo", "baz") == "bar");
             REQUIRE(properties.get_string("something", "baz") == "baz");
-            REQUIRE(properties.get_string("empty", "baz") == "");
+            REQUIRE(properties.get_string("empty", "baz").empty());
             REQUIRE_THROWS(properties.get_int("foo", 1));
             REQUIRE_THROWS(properties.get_bool("foo", true));
 
@@ -102,7 +102,7 @@ TEST_CASE("Store and retrieve properties (with database)")
 
 TEST_CASE("Update existing properties in database")
 {
-    testing::pg::tempdb_t db;
+    testing::pg::tempdb_t const db;
     auto conn = db.connect();
 
     {
@@ -146,7 +146,7 @@ TEST_CASE("Update existing properties in database")
 
 TEST_CASE("Load returns false if there are no properties in database")
 {
-    testing::pg::tempdb_t db;
+    testing::pg::tempdb_t const db;
     auto conn = db.connect();
     init_database_capabilities(conn);
 

tests/test-util.cpp

@@ -65,7 +65,7 @@ TEST_CASE("find_by_name()", "[NoDB]")
     t.emplace_back("baz");
 
     REQUIRE(util::find_by_name(t, "") == nullptr);
-    REQUIRE(util::find_by_name(t, "foo") == &t[0]);
+    REQUIRE(util::find_by_name(t, "foo") == t.data());
     REQUIRE(util::find_by_name(t, "bar") == &t[1]);
     REQUIRE(util::find_by_name(t, "baz") == &t[2]);
     REQUIRE(util::find_by_name(t, "nothing") == nullptr);