From 8772650717c05587ddd18c0f75847ba0cba29843 Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Thu, 21 Aug 2025 18:05:31 +0200 Subject: [PATCH] Make various variable names longer and more descriptive --- src/gen/osm2pgsql-gen.cpp | 4 ++-- src/geom-functions.cpp | 24 ++++++++++++------------ src/geom-pole-of-inaccessibility.cpp | 4 ++-- src/hex.cpp | 16 ++++++++-------- src/pgsql-capabilities.cpp | 4 ++-- src/pgsql.cpp | 9 +++++---- src/tile.cpp | 8 ++++---- 7 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp index 852fb66da..6faf1912a 100644 --- a/src/gen/osm2pgsql-gen.cpp +++ b/src/gen/osm2pgsql-gen.cpp @@ -520,8 +520,8 @@ class genproc_t m_connection_params, generalizer, params, zoom, &tile_list, &mut, n); } - for (auto &t : threads) { - t.join(); + for (auto &thread : threads) { + thread.join(); } if (error_flag.test_and_set()) { throw std::runtime_error{ diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp index ca88c2902..f59cbf740 100644 --- a/src/geom-functions.cpp +++ b/src/geom-functions.cpp @@ -157,37 +157,37 @@ class transform_visitor_t void operator()(multipoint_t const &input) const { - auto &m = m_output->get(); - m.reserve(input.num_geometries()); + auto &mgeom = m_output->get(); + mgeom.reserve(input.num_geometries()); for (auto const point : input) { - m.add_geometry(project(point)); + mgeom.add_geometry(project(point)); } } void operator()(multilinestring_t const &input) const { - auto &m = m_output->set(); - m.reserve(input.num_geometries()); + auto &mgeom = m_output->set(); + mgeom.reserve(input.num_geometries()); for (auto const &line : input) { - transform_points(&m.add_geometry(), line); + transform_points(&mgeom.add_geometry(), line); } } void operator()(multipolygon_t const &input) const { - auto &m = m_output->set(); - m.reserve(input.num_geometries()); + auto &mgeom = m_output->set(); + mgeom.reserve(input.num_geometries()); for (auto const &polygon : input) { - transform_polygon(&m.add_geometry(), polygon); + transform_polygon(&mgeom.add_geometry(), polygon); } } void operator()(collection_t const &input) const { - auto &m = m_output->get(); - m.reserve(input.num_geometries()); + auto &mgeom = m_output->get(); + mgeom.reserve(input.num_geometries()); for (auto const &geom : input) { - auto &new_geom = m.add_geometry(); + auto &new_geom = mgeom.add_geometry(); set_to_same_type(&new_geom, geom); new_geom.set_srid(0); geom.visit(transform_visitor_t{&new_geom, m_reprojection}); diff --git a/src/geom-pole-of-inaccessibility.cpp b/src/geom-pole-of-inaccessibility.cpp index 7173c7a39..dfb5274e7 100644 --- a/src/geom-pole-of-inaccessibility.cpp +++ b/src/geom-pole-of-inaccessibility.cpp @@ -88,9 +88,9 @@ bool point_to_ring_distance_squared(point_t point, ring_t const &ring, inside = !inside; } - double const d = + double const dist_squared = point_to_segment_distance_squared(point, a, b, stretch); - *min_dist_squared = std::min(d, *min_dist_squared); + *min_dist_squared = std::min(dist_squared, *min_dist_squared); } return inside; diff --git a/src/hex.cpp b/src/hex.cpp index 51cf01cad..40e8f3945 100644 --- a/src/hex.cpp +++ b/src/hex.cpp @@ -15,24 +15,24 @@ namespace util { -void encode_hex(std::string const &in, std::string *out) +void encode_hex(std::string const &input, std::string *output) { - assert(out); + assert(output); constexpr char const *const LOOKUP_HEX = "0123456789ABCDEF"; - for (auto const c : in) { + for (auto const c : input) { unsigned int const num = static_cast(c); - (*out) += LOOKUP_HEX[(num >> 4U) & 0xfU]; - (*out) += LOOKUP_HEX[num & 0xfU]; + (*output) += LOOKUP_HEX[(num >> 4U) & 0xfU]; + (*output) += LOOKUP_HEX[num & 0xfU]; } } -std::string encode_hex(std::string const &in) +std::string encode_hex(std::string const &input) { std::string result; - result.reserve(in.size() * 2); - encode_hex(in, &result); + result.reserve(input.size() * 2); + encode_hex(input, &result); return result; } diff --git a/src/pgsql-capabilities.cpp b/src/pgsql-capabilities.cpp index 4b45f7c02..18c94fc75 100644 --- a/src/pgsql-capabilities.cpp +++ b/src/pgsql-capabilities.cpp @@ -20,8 +20,8 @@ namespace { database_capabilities_t &capabilities() noexcept { - static database_capabilities_t c; - return c; + static database_capabilities_t capabilities; + return capabilities; } } // anonymous namespace diff --git a/src/pgsql.cpp b/src/pgsql.cpp index 8e9b906e3..e3c8dc06e 100644 --- a/src/pgsql.cpp +++ b/src/pgsql.cpp @@ -22,8 +22,8 @@ std::size_t pg_result_t::affected_rows() const noexcept { - char const *const s = PQcmdTuples(m_result.get()); - return std::strtoull(s, nullptr, 10); + char const *const rows_as_string = PQcmdTuples(m_result.get()); + return std::strtoull(rows_as_string, nullptr, 10); } std::atomic pg_conn_t::connection_id{0}; @@ -153,9 +153,10 @@ void pg_conn_t::copy_send(std::string_view data, std::string_view context) const log_sql_data("(C{}) Copy data to '{}':\n{}", m_connection_id, context, data); - int const r = PQputCopyData(m_conn.get(), data.data(), (int)data.size()); + int const result = + PQputCopyData(m_conn.get(), data.data(), (int)data.size()); - switch (r) { + switch (result) { case 0: // need to wait for write ready log_error("{} - COPY unexpectedly busy", context); break; diff --git a/src/tile.cpp b/src/tile.cpp index e47f91e7e..76ece1952 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -12,15 +12,15 @@ geom::point_t tile_t::to_tile_coords(geom::point_t p, unsigned int pixel_extent) const noexcept { - double const f = static_cast(pixel_extent) / extent(); - return {(p.x() - xmin()) * f, (p.y() - ymin()) * f}; + double const factor = static_cast(pixel_extent) / extent(); + return {(p.x() - xmin()) * factor, (p.y() - ymin()) * factor}; } geom::point_t tile_t::to_world_coords(geom::point_t p, unsigned int pixel_extent) const noexcept { - double const f = extent() / static_cast(pixel_extent); - return {p.x() * f + xmin(), p.y() * f + ymin()}; + double const factor = extent() / static_cast(pixel_extent); + return {p.x() * factor + xmin(), p.y() * factor + ymin()}; } geom::point_t tile_t::center() const noexcept