diff options
| -rw-r--r-- | libs/ardour/filesystem_paths.cc | 6 | ||||
| -rw-r--r-- | libs/ardour/system_exec.cc | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc index 7e9b4e1857..2c378c0d7f 100644 --- a/libs/ardour/filesystem_paths.cc +++ b/libs/ardour/filesystem_paths.cc @@ -124,7 +124,7 @@ user_config_directory (int version) } else if (!Glib::file_test (p, Glib::FILE_TEST_IS_DIR)) { error << string_compose (_("Configuration directory %1 already exists and is not a directory/folder - cannot run"), p) << endmsg; - exit (1); + abort(); /*NOTREACHED*/ } } @@ -190,7 +190,7 @@ user_cache_directory () } else if (!Glib::file_test (p, Glib::FILE_TEST_IS_DIR)) { fatal << string_compose (_("Cache directory %1 already exists and is not a directory/folder - cannot run"), p) << endmsg; - exit (1); + abort(); /*NOTREACHED*/ } return p; @@ -231,7 +231,7 @@ windows_package_directory_path () if (package_dir == NULL) { fatal << string_compose (_("Cannot determine %1 package directory"), PROGRAM_NAME) << endmsg; - // not reached + abort(); /*NOTREACHED*/ } std::string package_dir_path(package_dir); diff --git a/libs/ardour/system_exec.cc b/libs/ardour/system_exec.cc index d83165252a..b85b2347ae 100644 --- a/libs/ardour/system_exec.cc +++ b/libs/ardour/system_exec.cc @@ -41,8 +41,7 @@ static char *vfork_exec_wrapper_path() { ), "ardour-exec-wrapper", vfork_exec_wrapper)) { PBD::fatal << "vfork exec wrapper 'ardour-exec-wrapper' was not found in $PATH." << endmsg; - /* not reached */ - return NULL; + abort(); /*NOTREACHED*/ } return strdup(vfork_exec_wrapper.c_str()); #endif |