Don't use else after throw and formatting fixes

joto · joto · commit cc39407cf29e · 2023-06-23T16:34:32.000+02:00
diff --git a/src/osm2pgsql.cpp b/src/osm2pgsql.cpp
@@ -165,7 +165,7 @@ static void check_attributes(properties_t const &properties, options_t *options)
 }
 
 static void check_and_update_flat_node_file(properties_t *properties,
-                                        options_t *options)
+                                            options_t *options)
 {
     auto const flat_node_file_from_import =
         properties->get_string("flat_node_file", "");
@@ -187,7 +187,9 @@ static void check_and_update_flat_node_file(properties_t *properties,
             throw fmt_error("Database was imported without flat node file. Can"
                             " not use flat node file '{}' now.",
                             options->flat_node_file);
-        } else if (absolute_path == flat_node_file_from_import) {
+        }
+
+        if (absolute_path == flat_node_file_from_import) {
             log_info("Using flat node file '{}' (same as on import).",
                      flat_node_file_from_import);
         } else {
@@ -198,7 +200,6 @@ static void check_and_update_flat_node_file(properties_t *properties,
             properties->set_string("flat_node_file", absolute_path, true);
         }
     }
-
 }
 
 static void check_prefix(properties_t const &properties, options_t *options)

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ static void check_attributes(properties_t const &properties, options_t *options)`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`static void check_and_update_flat_node_file(properties_t *properties,`
`168`		`- options_t *options)`
	`168`	`+ options_t *options)`
`169`	`169`	`{`
`170`	`170`	`auto const flat_node_file_from_import =`
`171`	`171`	`properties->get_string("flat_node_file", "");`
`@@ -187,7 +187,9 @@ static void check_and_update_flat_node_file(properties_t *properties,`
`187`	`187`	`throw fmt_error("Database was imported without flat node file. Can"`
`188`	`188`	`" not use flat node file '{}' now.",`
`189`	`189`	`options->flat_node_file);`
`190`		`- } else if (absolute_path == flat_node_file_from_import) {`
	`190`	`+ }`
	`191`	`+`
	`192`	`+ if (absolute_path == flat_node_file_from_import) {`
`191`	`193`	`log_info("Using flat node file '{}' (same as on import).",`
`192`	`194`	`flat_node_file_from_import);`
`193`	`195`	`} else {`
`@@ -198,7 +200,6 @@ static void check_and_update_flat_node_file(properties_t *properties,`
`198`	`200`	`properties->set_string("flat_node_file", absolute_path, true);`
`199`	`201`	`}`
`200`	`202`	`}`
`201`		`-`
`202`	`203`	`}`
`203`	`204`
`204`	`205`	`static void check_prefix(properties_t const &properties, options_t *options)`