Merge pull request #1798 from joto/cleanups-ct

Some mixed code cleanups found by clang-tidy

Author: lonvia

.clang-tidy

@@ -1,5 +1,5 @@
 ---
-Checks: '*,-android-cloexec-*,-cert-err58-cpp,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-readability-casting,-google-readability-todo,-hicpp-named-parameter,-hicpp-no-array-decay,-hicpp-vararg,-llvm-include-order,-llvm-header-guard,-llvmlibc-*,-misc-no-recursion,-modernize-use-nodiscard,-modernize-use-trailing-return-type,-readability-implicit-bool-conversion,-readability-named-parameter,-readability-magic-numbers'
+Checks: '*,-altera-*,-android-cloexec-*,-cert-err58-cpp,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-readability-casting,-google-readability-todo,-hicpp-named-parameter,-hicpp-no-array-decay,-hicpp-vararg,-llvm-include-order,-llvm-header-guard,-llvmlibc-*,-misc-no-recursion,-modernize-use-nodiscard,-modernize-use-trailing-return-type,-readability-identifier-length,-readability-implicit-bool-conversion,-readability-named-parameter,-readability-magic-numbers'
 #
 #  cppcoreguidelines-pro-type-cstyle-cast
 #  google-build-using-namespace
@@ -10,6 +10,9 @@ Checks: '*,-android-cloexec-*,-cert-err58-cpp,-cppcoreguidelines-avoid-magic-num
 #  readability-named-parameter
 #    Differ from our style guidelines
 #
+#  altera-*
+#    Not applicable.
+#
 #  android-cloexec-*
 #    O_CLOEXEC isn't available on Windows
 #
@@ -56,6 +59,10 @@ Checks: '*,-android-cloexec-*,-cert-err58-cpp,-cppcoreguidelines-avoid-magic-num
 #  modernize-use-trailing-return-type
 #    We are not that modern...
 #
+#  readability-identifier-length
+#    Generally not a bad idea, but there are many cases where short names
+#    for (local) vars are okay.
+#
 #  readability-implicit-bool-conversion
 #    Readability is a matter of opinion here
 #

src/geom-boost-adaptor.hpp

@@ -29,9 +29,7 @@ BOOST_GEOMETRY_REGISTER_MULTI_POINT(geom::multipoint_t)
 BOOST_GEOMETRY_REGISTER_MULTI_LINESTRING(geom::multilinestring_t)
 BOOST_GEOMETRY_REGISTER_MULTI_POLYGON(geom::multipolygon_t)
 
-namespace boost {
-namespace geometry {
-namespace traits {
+namespace boost::geometry::traits {
 template <>
 struct point_order<::geom::ring_t>
 {
@@ -79,8 +77,6 @@ struct interior_rings<::geom::polygon_t>
     static auto get(::geom::polygon_t &p) { return p.inners(); }
     static auto get(::geom::polygon_t const &p) { return p.inners(); }
 };
-} // namespace traits
-} // namespace geometry
-} // namespace boost
+} // namespace boost::geometry::traits
 
 #endif // OSM2PGSQL_GEOM_BOOST_ADAPTOR_HPP

src/geom.hpp

@@ -194,13 +194,13 @@ class multigeometry_t
     [[nodiscard]] GEOM &add_geometry() { return m_geometry.emplace_back(); }
 
     [[nodiscard]] friend bool operator==(multigeometry_t const &a,
-                                         multigeometry_t const &b) noexcept
+                                         multigeometry_t const &b)
     {
         return a.m_geometry == b.m_geometry;
     }
 
     [[nodiscard]] friend bool operator!=(multigeometry_t const &a,
-                                         multigeometry_t const &b) noexcept
+                                         multigeometry_t const &b)
     {
         return a.m_geometry != b.m_geometry;
     }
@@ -355,13 +355,13 @@ class geometry_t
     }
 
     [[nodiscard]] friend bool operator==(geometry_t const &a,
-                                         geometry_t const &b) noexcept
+                                         geometry_t const &b)
     {
         return (a.srid() == b.srid()) && (a.m_geom == b.m_geom);
     }
 
     [[nodiscard]] friend bool operator!=(geometry_t const &a,
-                                         geometry_t const &b) noexcept
+                                         geometry_t const &b)
     {
         return !(a == b);
     }

src/options.cpp

@@ -454,7 +454,7 @@ options_t::options_t(int argc, char *argv[]) : options_t()
                 ++next_char;
                 // Second number must not be negative because zoom levels must be positive.
                 if (next_char && *next_char != '-' && isdigit(*next_char)) {
-                    char *after_maxzoom;
+                    char *after_maxzoom = nullptr;
                     expire_tiles_zoom = static_cast<uint32_t>(
                         std::strtoul(next_char, &after_maxzoom, 10));
                     if (expire_tiles_zoom == 0 || *after_maxzoom != '\0') {

src/output-flex.cpp

@@ -217,7 +217,7 @@ static void push_osm_object_to_lua_stack(lua_State *lua_state,
                 lua_createtable(lua_state, 0, 3);
                 std::array<char, 2> tmp{"x"};
                 tmp[0] = osmium::item_type_to_char(member.type());
-                luaX_add_table_str(lua_state, "type", &tmp[0]);
+                luaX_add_table_str(lua_state, "type", tmp.data());
                 luaX_add_table_int(lua_state, "ref", member.ref());
                 luaX_add_table_str(lua_state, "role", member.role());
             });
@@ -1199,6 +1199,7 @@ int output_flex_t::app_define_table()
     setup_id_columns(&new_table);
     setup_flex_table_columns(&new_table);
 
+    // NOLINTNEXTLINE(performance-no-int-to-ptr)
     lua_pushlightuserdata(lua_state(), (void *)(m_tables->size()));
     luaL_getmetatable(lua_state(), osm2pgsql_table_name);
     lua_setmetatable(lua_state(), -2);

src/output.cpp

@@ -16,9 +16,9 @@
 
 #ifdef HAVE_LUA
 # include "output-flex.hpp"
-# define flex_backend "flex, "
+static constexpr char const *const flex_backend = "flex, ";
 #else
-# define flex_backend ""
+static constexpr char const *const flex_backend = "";
 #endif
 
 #include <stdexcept>
@@ -57,8 +57,8 @@ output_t::create_output(std::shared_ptr<middle_query_t> const &mid,
 
     throw std::runtime_error{
         "Output backend '{}' not recognised. Should be one "
-        "of [pgsql, " flex_backend
-        "gazetteer, null]."_format(options.output_backend)};
+        "of [pgsql, {}gazetteer, null]."_format(options.output_backend,
+                                                flex_backend)};
 }
 
 output_t::output_t(std::shared_ptr<middle_query_t> mid,

src/pgsql.hpp

@@ -37,7 +37,7 @@
 class pg_result_t
 {
 public:
-    pg_result_t() {}
+    pg_result_t() = default;
 
     explicit pg_result_t(PGresult *result) noexcept : m_result(result) {}
 
@@ -100,7 +100,7 @@ class pg_result_t
     }
 
     /// Return true if this holds an actual result.
-    operator bool() { return m_result.get(); }
+    explicit operator bool() { return m_result.get(); }
 
 private:
     struct pg_result_deleter_t

src/tagtransform-c.cpp

@@ -18,7 +18,7 @@
 
 namespace {
 
-static const struct
+const struct
 {
     char const *highway;
     int offset;
@@ -40,7 +40,9 @@ static const struct
               {"primary", 37, true},        {"trunk", 38, true},
               {"motorway", 39, true}};
 
-void add_z_order(taglist_t *tags, bool *roads)
+} // anonymous namespace
+
+static void add_z_order(taglist_t *tags, bool *roads)
 {
     std::string const *const layer = tags->get("layer");
     std::string const *const highway = tags->get("highway");
@@ -86,8 +88,6 @@ void add_z_order(taglist_t *tags, bool *roads)
     tags->add_tag("z_order", z.c_str());
 }
 
-} // anonymous namespace
-
 c_tagtransform_t::c_tagtransform_t(options_t const *options, export_list exlist)
 : m_options(options), m_export_list(std::move(exlist))
 {}

src/wkb.cpp

@@ -428,7 +428,7 @@ class ewkb_parser_t
         check_bytes(sizeof(double) * 2);
 
         std::array<double, 2> data{};
-        std::memcpy(&data[0], m_it, sizeof(double) * 2);
+        std::memcpy(data.data(), m_it, sizeof(double) * 2);
         m_it += sizeof(double) * 2;
 
         point->set_x(data[0]);

tests/test-options-parse.cpp

@@ -21,21 +21,21 @@ static void bad_opt(std::vector<char const *> opts, char const *msg)
 {
     opts.insert(opts.begin(), "osm2pgsql");
     opts.push_back(TEST_PBF);
-    REQUIRE_THROWS_WITH(options_t((int)opts.size(), (char **)&opts[0]),
+    REQUIRE_THROWS_WITH(options_t((int)opts.size(), (char **)opts.data()),
                         Catch::Matchers::Contains(msg));
 }
 
 static options_t opt(std::vector<char const *> opts)
 {
     opts.insert(opts.begin(), "osm2pgsql");
     opts.push_back(TEST_PBF);
-    return options_t((int)opts.size(), (char **)&opts[0]);
+    return {(int)opts.size(), (char **)opts.data()};
 }
 
 TEST_CASE("Insufficient arguments", "[NoDB]")
 {
     std::vector<char const *> opts = {"osm2pgsql", "-a", "-c", "--slim"};
-    REQUIRE_THROWS_WITH(options_t((int)opts.size(), (char **)&opts[0]),
+    REQUIRE_THROWS_WITH(options_t((int)opts.size(), (char **)opts.data()),
                         Catch::Matchers::Contains("Missing input"));
 }