Add try/catch around most of main so we don't end with exception.

Author: joto

src/osmcoastline_filter.cpp

@@ -96,11 +96,6 @@ int main(int argc, char* argv[]) {
         }
     }
 
-    // The vout object is an output stream we can write to instead of
-    // std::cerr. Nothing is written if we are not in verbose mode.
-    // The running time will be prepended to output lines.
-    osmium::util::VerboseOutput vout{verbose};
-
     if (output_filename.empty()) {
         std::cerr << "Missing -o/--output=OSMFILE option\n";
         std::exit(return_code_cmdline);
@@ -111,15 +106,20 @@ int main(int argc, char* argv[]) {
         std::exit(return_code_cmdline);
     }
 
-    osmium::io::Header header;
-    header.set("generator", std::string{"osmcoastline_filter/"} + get_osmcoastline_version());
-    header.add_box(osmium::Box{-180.0, -90.0, 180.0, 90.0});
+    try {
+        // The vout object is an output stream we can write to instead of
+        // std::cerr. Nothing is written if we are not in verbose mode.
+        // The running time will be prepended to output lines.
+        osmium::util::VerboseOutput vout{verbose};
+
+        osmium::io::Header header;
+        header.set("generator", std::string{"osmcoastline_filter/"} + get_osmcoastline_version());
+        header.add_box(osmium::Box{-180.0, -90.0, 180.0, 90.0});
 
-    osmium::io::File infile{argv[optind]};
+        osmium::io::File infile{argv[optind]};
 
-    vout << "Started osmcoastline_filter " << get_osmcoastline_long_version() << " / " << get_libosmium_version() << '\n';
+        vout << "Started osmcoastline_filter " << get_osmcoastline_long_version() << " / " << get_libosmium_version() << '\n';
 
-    try {
         osmium::io::Writer writer{output_filename, header};
         auto output_it = osmium::io::make_output_iterator(writer);
 
@@ -169,16 +169,16 @@ int main(int argc, char* argv[]) {
         }
 
         writer.close();
-    } catch (const osmium::io_error& e) {
-        std::cerr << "io error: " << e.what() << "'\n";
-        std::exit(return_code_fatal);
-    }
 
-    vout << "All done.\n";
-    osmium::MemoryUsage mem;
-    if (mem.current() > 0) {
-        vout << "Memory used: current: " << mem.current() << " MBytes\n"
-             << "             peak:    " << mem.peak() << " MBytes\n";
+        vout << "All done.\n";
+        osmium::MemoryUsage mem;
+        if (mem.current() > 0) {
+            vout << "Memory used: current: " << mem.current() << " MBytes\n"
+                << "             peak:    " << mem.peak() << " MBytes\n";
+        }
+    } catch (const std::exception& e) {
+        std::cerr << e.what() << '\n';
+        std::exit(return_code_fatal);
     }
 }
 

src/osmcoastline_segments.cpp

@@ -162,10 +162,10 @@ int main(int argc, char *argv[]) {
         std::exit(return_code_cmdline);
     }
 
-    segvec removed_segments;
-    segvec added_segments;
-
     try {
+        segvec removed_segments;
+        segvec added_segments;
+
         InputFile file1{argv[optind]};
         InputFile file2{argv[optind + 1]};
 
@@ -174,25 +174,25 @@ int main(int argc, char *argv[]) {
 
         std::set_difference(m1.cbegin(), m1.cend(), m2.cbegin(), m2.cend(), std::back_inserter(removed_segments));
         std::set_difference(m2.cbegin(), m2.cend(), m1.cbegin(), m1.cend(), std::back_inserter(added_segments));
-    } catch (const std::runtime_error& e) {
-        std::cerr << e.what() << "\n";
-        std::exit(return_code_fatal);
-    }
 
-    if (dump) {
-        std::cout << "Removed:\n";
-        for (const auto& segment : removed_segments) {
-            std::cout << "  " << segment << "\n";
-        }
+        if (dump) {
+            std::cout << "Removed:\n";
+            for (const auto& segment : removed_segments) {
+                std::cout << "  " << segment << "\n";
+            }
 
-        std::cout << "Added:\n";
-        for (const auto& segment : added_segments) {
-            std::cout << "  " << segment << "\n";
+            std::cout << "Added:\n";
+            for (const auto& segment : added_segments) {
+                std::cout << "  " << segment << "\n";
+            }
+        } else if (!geom.empty()) {
+            output_ogr(geom, format, removed_segments, added_segments);
         }
-    } else if (!geom.empty()) {
-        output_ogr(geom, format, removed_segments, added_segments);
-    }
 
-    return (removed_segments.empty() && added_segments.empty()) ? 0 : 1;
+        return (removed_segments.empty() && added_segments.empty()) ? 0 : 1;
+    } catch (const std::exception& e) {
+        std::cerr << e.what() << '\n';
+        std::exit(return_code_fatal);
+    }
 }
 

src/osmcoastline_ways.cpp

@@ -129,27 +129,32 @@ int main(int argc, char* argv[]) {
 
     CPLSetConfigOption("OGR_SQLITE_SYNCHRONOUS", "OFF");
 
-    const std::string input_osm_filename{argv[1]};
+    try {
+        const std::string input_osm_filename{argv[1]};
 
-    std::string output_db_filename{"coastline-ways.db"};
-    if (argc >= 3) {
-        output_db_filename = argv[2];
-    }
+        std::string output_db_filename{"coastline-ways.db"};
+        if (argc >= 3) {
+            output_db_filename = argv[2];
+        }
 
-    index_type index_pos;
-    index_type index_neg;
-    location_handler_type location_handler{index_pos, index_neg};
+        index_type index_pos;
+        index_type index_neg;
+        location_handler_type location_handler{index_pos, index_neg};
 
-    osmium::io::File infile{input_osm_filename};
-    osmium::io::Reader reader1{infile, osmium::osm_entity_bits::node};
-    osmium::apply(reader1, location_handler);
-    reader1.close();
+        osmium::io::File infile{input_osm_filename};
+        osmium::io::Reader reader1{infile, osmium::osm_entity_bits::node};
+        osmium::apply(reader1, location_handler);
+        reader1.close();
 
-    CoastlineWaysHandler coastline_ways_handler{output_db_filename};
-    osmium::io::Reader reader2{infile, osmium::osm_entity_bits::way};
-    osmium::apply(reader2, location_handler, coastline_ways_handler);
-    reader2.close();
+        CoastlineWaysHandler coastline_ways_handler{output_db_filename};
+        osmium::io::Reader reader2{infile, osmium::osm_entity_bits::way};
+        osmium::apply(reader2, location_handler, coastline_ways_handler);
+        reader2.close();
 
-    std::cerr << "Sum of way lengths: " << std::fixed << (coastline_ways_handler.sum_length() / 1000) << "km\n";
+        std::cerr << "Sum of way lengths: " << std::fixed << (coastline_ways_handler.sum_length() / 1000) << "km\n";
+    } catch (const std::exception& e) {
+        std::cerr << e.what() << '\n';
+        std::exit(return_code_fatal);
+    }
 }