More small cleanups found by clang-tidy

Author: joto

src/expire-tiles.cpp

@@ -141,10 +141,10 @@ void expire_tiles::coords_to_tile(double lon, double lat, double *tilex,
 void expire_tiles::from_line(double lon_a, double lat_a, double lon_b,
                              double lat_b)
 {
-    double tile_x_a;
-    double tile_y_a;
-    double tile_x_b;
-    double tile_y_b;
+    double tile_x_a = NAN;
+    double tile_y_a = NAN;
+    double tile_x_b = NAN;
+    double tile_y_b = NAN;
 
     coords_to_tile(lon_a, lat_a, &tile_x_a, &tile_y_a);
     coords_to_tile(lon_b, lat_b, &tile_x_b, &tile_y_b);
@@ -237,8 +237,8 @@ int expire_tiles::from_bbox(double min_lon, double min_lat, double max_lon,
     }
 
     /* Convert the box's Mercator coordinates into tile coordinates */
-    double tmp_x;
-    double tmp_y;
+    double tmp_x = NAN;
+    double tmp_y = NAN;
     coords_to_tile(min_lon, max_lat, &tmp_x, &tmp_y);
     int min_tile_x = tmp_x - TILE_EXPIRY_LEEWAY;
     int min_tile_y = tmp_y - TILE_EXPIRY_LEEWAY;

src/gazetteer-style.cpp

@@ -21,15 +21,6 @@
 #include "pgsql.hpp"
 #include "wkb.hpp"
 
-namespace {
-
-enum : int
-{
-    MAX_ADMINLEVEL = 15
-};
-
-} // anonymous namespace
-
 namespace pt = boost::property_tree;
 
 void db_deleter_place_t::delete_rows(std::string const &table,

src/gazetteer-style.hpp

@@ -94,6 +94,11 @@ class gazetteer_copy_mgr_t : public db_copy_mgr_t<db_deleter_place_t>
     std::shared_ptr<db_target_descr_t> m_table;
 };
 
+enum : int
+{
+    MAX_ADMINLEVEL = 15
+};
+
 class gazetteer_style_t
 {
     using flag_t = uint16_t;
@@ -179,7 +184,7 @@ class gazetteer_style_t
     /// value of operator tag
     char const *m_operator = nullptr;
     /// admin level
-    int m_admin_level;
+    int m_admin_level = MAX_ADMINLEVEL;
 
     /// which metadata fields of the OSM objects should be written to the output
     osmium::metadata_options m_metadata_fields{"none"};

src/options.cpp

@@ -294,10 +294,10 @@ options_t::options_t()
 
 static osmium::Box parse_bbox(char const *bbox)
 {
-    double minx;
-    double maxx;
-    double miny;
-    double maxy;
+    double minx = NAN;
+    double maxx = NAN;
+    double miny = NAN;
+    double maxy = NAN;
 
     int const n = sscanf(bbox, "%lf,%lf,%lf,%lf", &minx, &miny, &maxx, &maxy);
     if (n != 4) {
@@ -349,7 +349,7 @@ options_t::options_t(int argc, char *argv[]) : options_t()
 
     bool help_verbose = false; // Will be set when -v/--verbose is set
 
-    int c;
+    int c = 0;
 
     //keep going while there are args left to handle
     // note: optind would seem to need to be set to 1, but that gives valgrind

src/table.cpp

@@ -386,7 +386,8 @@ void table_t::escape_type(std::string const &value, ColumnType flags)
     switch (flags) {
     case ColumnType::INT: {
         // For integers we take the first number, or the average if it's a-b
-        long long from, to;
+        long long from = 0;
+        long long to = 0;
         // limit number of digits parsed to avoid undefined behaviour in sscanf
         int const items =
             std::sscanf(value.c_str(), "%18lld-%18lld", &from, &to);
@@ -420,7 +421,8 @@ void table_t::escape_type(std::string const &value, ColumnType flags)
             std::string escaped{value};
             std::replace(escaped.begin(), escaped.end(), ',', '.');
 
-            double from, to;
+            double from = NAN;
+            double to = NAN;
             int const items =
                 std::sscanf(escaped.c_str(), "%lf-%lf", &from, &to);
             if (items == 1) {

src/tagtransform-lua.hpp

@@ -43,8 +43,11 @@ class lua_tagtransform_t : public tagtransform_t
     void open_style();
     void check_lua_function_exists(std::string const &func_name);
 
-    lua_State *L;
-    std::string m_node_func, m_way_func, m_rel_func, m_rel_mem_func;
+    lua_State *L = nullptr;
+    std::string m_node_func;
+    std::string m_way_func;
+    std::string m_rel_func;
+    std::string m_rel_mem_func;
     std::string m_lua_file;
     bool m_extra_attributes;
 };

src/util.cpp

@@ -63,7 +63,7 @@ std::string get_password()
     GetConsoleMode(handle_stdin, &mode);
     SetConsoleMode(handle_stdin, mode & (~ENABLE_ECHO_INPUT));
 #elif defined(HAVE_TERMIOS_H)
-    termios orig_flags;
+    termios orig_flags{};
     tcgetattr(STDIN_FILENO, &orig_flags);
     termios flags = orig_flags;
     flags.c_lflag &= ~static_cast<unsigned int>(ECHO);

src/util.hpp

@@ -40,7 +40,7 @@ class integer_to_buffer
     char const *c_str() const noexcept { return m_buffer.data(); }
 
 private:
-    std::array<char, buffer_size> m_buffer;
+    std::array<char, buffer_size> m_buffer{};
 };
 
 class double_to_buffer
@@ -59,7 +59,7 @@ class double_to_buffer
     char const *c_str() const noexcept { return m_buffer.data(); }
 
 private:
-    std::array<char, buffer_size> m_buffer;
+    std::array<char, buffer_size> m_buffer{};
 };
 
 /**

tests/test-expire-tiles.cpp

@@ -83,7 +83,8 @@ struct tile_output_set
     void expire_centroids(expire_tiles &et)
     {
         for (auto const &t : tiles) {
-            double x0, y0;
+            double x0 = NAN;
+            double y0 = NAN;
             t.to_centroid(x0, y0);
             et.from_bbox(x0, y0, x0, y0);
         }

tests/test-output-gazetteer.cpp

@@ -43,7 +43,7 @@ class node_opl_t
         return ret;
     }
 
-    char type() const noexcept { return 'N'; }
+    static char type() noexcept { return 'N'; }
 
 private:
     fmt::memory_buffer m_opl;
@@ -76,7 +76,7 @@ class way_opl_t
         return final_opl;
     }
 
-    char type() const noexcept { return 'W'; }
+    static char type() noexcept { return 'W'; }
 
 private:
     osmid_t make_nodes()
@@ -145,7 +145,7 @@ class relation_opl_t
         return final_opl;
     }
 
-    char type() const noexcept { return 'R'; }
+    static char type() noexcept { return 'R'; }
 
 private:
     osmid_t make_nodes()