Clean up the way we do early returns after printing help text

Author: joto

src/options.cpp

@@ -341,7 +341,7 @@ options_t::options_t(int argc, char *argv[]) : options_t()
 {
     // If there are no command line arguments at all, show help.
     if (argc == 1) {
-        long_usage_bool = true;
+        m_print_help = true;
         long_usage(argv[0], false);
         return;
     }
@@ -517,7 +517,7 @@ options_t::options_t(int argc, char *argv[]) : options_t()
             }
             break;
         case 'h':
-            long_usage_bool = true;
+            m_print_help = true;
             break;
         case 'I':
             parallel_indexing = false;
@@ -641,7 +641,7 @@ options_t::options_t(int argc, char *argv[]) : options_t()
     } //end while
 
     //they were looking for usage info
-    if (long_usage_bool) {
+    if (m_print_help) {
         long_usage(argv[0], help_verbose);
         return;
     }

src/options.hpp

@@ -61,6 +61,14 @@ class options_t
      */
     options_t(int argc, char *argv[]);
 
+    /**
+     * Return true if the main program should end directly after the option
+     * parsing. This is true when a help text was printed.
+     */
+    bool early_return() const noexcept {
+        return m_print_help;
+    }
+
     std::string prefix{"planet_osm"};         ///< prefix for table names
     std::shared_ptr<reprojection> projection; ///< SRS of projection
     bool append = false;                      ///< Append to existing data
@@ -141,7 +149,6 @@ class options_t
     boost::optional<std::string> tag_transform_rel_mem_func{boost::none};
 
     bool create = false;
-    bool long_usage_bool = false;
     bool pass_prompt = false;
 
     database_options_t database_options;
@@ -161,6 +168,9 @@ class options_t
     uint8_t way_node_index_id_shift = 0;
 
 private:
+
+    bool m_print_help = false;
+
     /**
      * Check input options for sanity
      */

src/osm2pgsql.cpp

@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
         log_info("osm2pgsql version {}", get_osm2pgsql_version());
 
         options_t const options{argc, argv};
-        if (options.long_usage_bool) {
+        if (options.early_return()) {
             return 0;
         }