code consistency and hints for static analysis

This commit is contained in:
Robin Gareus 2015-08-19 04:07:39 +02:00
parent a2fbce0e7f
commit cf1ab3391f
2 changed files with 4 additions and 5 deletions

View File

@ -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);

View File

@ -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