Remove osmdata_t::start() function, do its job in constructor

Author: joto

src/osm2pgsql.cpp

@@ -61,8 +61,6 @@ static file_info run(options_t const &options)
 
     osmdata_t osmdata{middle, output, options};
 
-    osmdata.start();
-
     // Processing: In this phase the input file(s) are read and parsed,
     // populating some of the tables.
     auto finfo = process_files(files, &osmdata, options.append,

src/osmdata.cpp

@@ -35,6 +35,7 @@ osmdata_t::osmdata_t(std::shared_ptr<middle_t> mid,
 {
     assert(m_mid);
     assert(m_output);
+    m_output->start();
 }
 
 void osmdata_t::node(osmium::Node const &node)
@@ -188,11 +189,6 @@ void osmdata_t::after_relations()
     m_output->sync();
 }
 
-void osmdata_t::start() const
-{
-    m_output->start();
-}
-
 namespace {
 
 /**

src/osmdata.hpp

@@ -44,8 +44,6 @@ class osmdata_t : public osmium::handler::Handler
     osmdata_t(std::shared_ptr<middle_t> mid, std::shared_ptr<output_t> output,
               options_t const &options);
 
-    void start() const;
-
     void node(osmium::Node const &node);
     void way(osmium::Way &way);
     void relation(osmium::Relation const &rel);

tests/common-import.hpp

@@ -40,8 +40,6 @@ inline void parse_file(options_t const &options,
 {
     osmdata_t osmdata{mid, output, options};
 
-    osmdata.start();
-
     std::string filepath{TESTDATA_DIR};
     if (filename) {
         filepath += filename;
@@ -145,8 +143,6 @@ class import_t
 
         osmdata_t osmdata{middle, output, options};
 
-        osmdata.start();
-
         std::vector<osmium::io::File> files;
         for (auto const &data : input_data) {
             files.emplace_back(data.data(), data.size(), format);

tests/test-middle.cpp

@@ -1048,8 +1048,6 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
                                                       thread_pool, options);
         osmdata_t osmdata{mid, output, options};
 
-        osmdata.start();
-
         osmdata.node(node10);
         osmdata.node(node11);
         osmdata.node(node12);
@@ -1084,7 +1082,6 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
                                                       thread_pool, options);
         osmdata_t osmdata{mid, output, options};
 
-        osmdata.start();
         osmdata.node(node10d);
         osmdata.node(node10a);
         osmdata.after_nodes();
@@ -1119,7 +1116,6 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
             auto output = std::make_shared<output_null_t>(
                 mid->get_query_instance(), thread_pool, options);
             osmdata_t osmdata{mid, output, options};
-            osmdata.start();
 
             osmdata.node(node10d);
             osmdata.node(node10a);
@@ -1147,7 +1143,6 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
             auto output = std::make_shared<output_null_t>(
                 mid->get_query_instance(), thread_pool, options);
             osmdata_t osmdata{mid, output, options};
-            osmdata.start();
 
             osmdata.after_nodes();
             osmdata.way(way20d);
@@ -1166,7 +1161,6 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
             auto output = std::make_shared<output_null_t>(
                 mid->get_query_instance(), thread_pool, options);
             osmdata_t osmdata{mid, output, options};
-            osmdata.start();
 
             osmdata.node(node10d);
             osmdata.node(node10a);
@@ -1236,7 +1230,6 @@ TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
         auto output = std::make_shared<output_null_t>(mid->get_query_instance(),
                                                       thread_pool, options);
         osmdata_t osmdata{mid, output, options};
-        osmdata.start();
 
         osmdata.node(node10d);
         osmdata.node(node10a);
@@ -1259,7 +1252,6 @@ TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
         auto output = std::make_shared<output_null_t>(mid->get_query_instance(),
                                                       thread_pool, options);
         osmdata_t osmdata{mid, output, options};
-        osmdata.start();
 
         osmdata.node(node11d);
         osmdata.node(node11a);