X-Git-Url: https://vaikene.ee/gitweb/pswgen09.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2FCLI%2Fmain.cpp;h=908619f45e75ed1c68f767544abe82763ea4e367;hb=refs%2Fheads%2Fmaster;hp=691db7a3f63cf6da24cc68b323c0fe13085d95e2;hpb=a81a943bee20df3c7eb34bafb3e3fe878facfe4e;p=evaf
diff --git a/src/main/CLI/main.cpp b/src/main/CLI/main.cpp
index 691db7a..908619f 100644
--- a/src/main/CLI/main.cpp
+++ b/src/main/CLI/main.cpp
@@ -2,7 +2,7 @@
* @file main/CLI/main.cpp
* @brief The main eVaf CLI application class
*
- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene
*
* This file is part of the eVaf C++ cross-platform application development framework.
*
@@ -92,13 +92,12 @@ static void messageOutput(QtMsgType type, QMessageLogContext const &, QString co
* If the critical error message is shown, then the user has an option to ignore the error. In this
* case the application is not terminated.
*/
-static void fatalMsgHandler(QString const & msg, QString const & source, QString const & where)
+[[noreturn]] static void fatalMsgHandler(QString const & msg, QString const & source, QString const & where)
{
-#ifdef Q_OS_LINUX
- abort();
-#else
+ Q_UNUSED(msg)
+ Q_UNUSED(source)
+ Q_UNUSED(where)
exit(1);
-#endif
}
} // namespace eVaf::CLI::Internal
@@ -266,7 +265,7 @@ int main(int argc, char ** argv)
// The main run loop
bool quit = false;
- int rval;
+ int rval = 0;
while (!quit) {
EVAF_INFO("%s is starting up", VER_MODULE_NAME_STR);