Merge pull request #2395 from joto/fix-short-varnames

Make various variable names longer and more descriptive

Author: lonvia

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{

src/geom-functions.cpp

@@ -157,37 +157,37 @@ class transform_visitor_t
 
     void operator()(multipoint_t const &input) const
     {
-        auto &m = m_output->get<multipoint_t>();
-        m.reserve(input.num_geometries());
+        auto &mgeom = m_output->get<multipoint_t>();
+        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<multilinestring_t>();
-        m.reserve(input.num_geometries());
+        auto &mgeom = m_output->set<multilinestring_t>();
+        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<multipolygon_t>();
-        m.reserve(input.num_geometries());
+        auto &mgeom = m_output->set<multipolygon_t>();
+        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<collection_t>();
-        m.reserve(input.num_geometries());
+        auto &mgeom = m_output->get<collection_t>();
+        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});

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;

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<unsigned char>(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;
 }
 

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

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<std::uint32_t> 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;

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<double>(pixel_extent) / extent();
-    return {(p.x() - xmin()) * f, (p.y() - ymin()) * f};
+    double const factor = static_cast<double>(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<double>(pixel_extent);
-    return {p.x() * f + xmin(), p.y() * f + ymin()};
+    double const factor = extent() / static_cast<double>(pixel_extent);
+    return {p.x() * factor + xmin(), p.y() * factor + ymin()};
 }
 
 geom::point_t tile_t::center() const noexcept