Small formatting fixes and cleanups

joto · joto · commit 14d4b3373a3b · 2020-04-09T14:10:36.000+02:00
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
         auto const outputs =
             output_t::create_outputs(middle->get_query_instance(), options);
         //let osmdata orchestrate between the middle and the outs
-        osmdata_t osmdata(middle, outputs);
+        osmdata_t osmdata{middle, outputs};
 
         fmt::print(stderr, "Using projection SRS {} ({})\n",
                    options.projection->target_srs(),
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
@@ -21,11 +21,15 @@ osmdata_t::osmdata_t(std::shared_ptr<middle_t> mid,
                      std::vector<std::shared_ptr<output_t>> const &outs)
 : m_mid(mid), m_outs(outs)
 {
+    assert(m_mid);
+
     if (m_outs.empty()) {
-        throw std::runtime_error{"Must have at least one output, but none have "
-                                 "been configured."};
+        throw std::runtime_error{"Must have at least one output, "
+                                 "but none have been configured."};
     }
 
+    // Get the "extra_attributes" option from the first output. We expect
+    // all others to be the same.
     m_with_extra_attrs = m_outs[0]->get_options()->extra_attributes;
 }
 
@@ -450,8 +454,8 @@ void osmdata_t::stop() const
     // Clustering, index creation, and cleanup.
     // All the intensive parts of this are long-running PostgreSQL commands
     {
-        osmium::thread::Pool pool(opts->parallel_indexing ? opts->num_procs : 1,
-                                  512);
+        osmium::thread::Pool pool{opts->parallel_indexing ? opts->num_procs : 1,
+                                  512};
 
         if (opts->droptemp) {
             // When dropping middle tables, make sure they are gone before
diff --git a/tests/common-import.hpp b/tests/common-import.hpp
@@ -26,7 +26,7 @@ inline void parse_file(options_t const &options,
                        char const *filename = nullptr)
 {
     //let osmdata orchestrate between the middle and the outs
-    osmdata_t osmdata(mid, outs);
+    osmdata_t osmdata{mid, outs};
 
     osmdata.start();
     parse_osmium_t parser(options.bbox, options.append, &osmdata);
@@ -84,7 +84,7 @@ class import_t
             output_t::create_outputs(middle->get_query_instance(), options);
 
         //let osmdata orchestrate between the middle and the outs
-        osmdata_t osmdata(middle, outputs);
+        osmdata_t osmdata{middle, outputs};
 
         osmdata.start();
 
