Correct exits in main

Author: Lord-Grey

src/hyperiond/main.cpp

@@ -165,9 +165,9 @@ int main(int argc, char** argv)
 	if (parser.isSet(versionOption))
 	{
 		std::cout
-				<< "Hyperion Ambilight Deamon" << std::endl
-				<< "\tVersion   : " << HYPERION_VERSION << " (" << HYPERION_BUILD_ID << ")" << std::endl
-				<< "\tBuild Time: " << __DATE__ << " " << __TIME__ << std::endl;
+				<< "Hyperion Ambilight Deamon" << "\n"
+				<< "\tVersion   : " << HYPERION_VERSION << " (" << HYPERION_BUILD_ID << ")" << "\n"
+				<< "\tBuild Time: " << __DATE__ << " " << __TIME__ << "\n";
 
 		return 0;
 	}
@@ -178,21 +178,24 @@ int main(int argc, char** argv)
 		{
 			Error(log, "The Hyperion Daemon is already running, abort start");
 
-			// use the first non-localhost IPv4 address, IPv6 are not supported by Yeelight currently
-			for (const auto& address : QNetworkInterface::allAddresses())
+			// use the first non-localhost IPv4 address
+			QList<QHostAddress> const allNetworkAddresses {QNetworkInterface::allAddresses()};
+			auto it = std::find_if(allNetworkAddresses.begin(), allNetworkAddresses.end(),
+				[](const QHostAddress& address)
+				{
+					return !address.isLoopback() && (address.protocol() == QAbstractSocket::IPv4Protocol);
+				});
+
+			if (it != allNetworkAddresses.end())
 			{
-				if (!address.isLoopback() && (address.protocol() == QAbstractSocket::IPv4Protocol))
+				std::cout << "Access the Hyperion User-Interface for configuration and control via:" << "\n";
+				std::cout << "http://" << it->toString().toStdString() << ":8090" << "\n";
+
+				QHostInfo const hostInfo = QHostInfo::fromName(it->toString());
+				if (hostInfo.error() == QHostInfo::NoError)
 				{
-					std::cout << "Access the Hyperion User-Interface for configuration and control via:" << std::endl;
-					std::cout << "http://" << address.toString().toStdString() << ":8090" << std::endl;
-
-					QHostInfo hostInfo = QHostInfo::fromName(address.toString());
-					if (hostInfo.error() == QHostInfo::NoError)
-					{
-						QString hostname = hostInfo.hostName();
-						std::cout << "http://" << hostname.toStdString() << ":8090" << std::endl;
-					}
-					break;
+					QString const hostname = hostInfo.hostName();
+					std::cout << "http://" << hostname.toStdString() << ":8090" << "\n";
 				}
 			}
 			return 0;
@@ -292,11 +295,11 @@ int main(int argc, char** argv)
 	Info(log,"Hyperion %s, %s, built: %s:%s", HYPERION_VERSION, HYPERION_BUILD_ID, __DATE__, __TIME__);
 	Debug(log,"QtVersion [%s]", QT_VERSION_STR);
 
-	int rc = 1;
+	int exitCode = 1;
 	bool readonlyMode = false;
 
-	QString userDataPath(userDataOption.value(parser));
-	QDir userDataDirectory(userDataPath);
+	QString const userDataPath(userDataOption.value(parser));
+	QDir const userDataDirectory(userDataPath);
 
 
 	if (parser.isSet(readOnlyModeOption))
@@ -308,7 +311,7 @@ int main(int argc, char** argv)
 
 	Info(log, "Hyperion configuration and user data location: '%s'", QSTRING_CSTR(userDataDirectory.absolutePath()));
 
-	QFileInfo dbFile(DBManager::getFileInfo());
+	QFileInfo const dbFile(DBManager::getFileInfo());
 
 	try
 	{
@@ -338,7 +341,7 @@ int main(int argc, char** argv)
 					throw std::runtime_error("Configuration export failed'");
 				}
 
-				exit(0);
+				return 0;
 			}
 		}
 		else
@@ -366,16 +369,14 @@ int main(int argc, char** argv)
 				throw std::runtime_error("Password reset failed");
 			}
 
-			AuthTable* table = new AuthTable();
-			if(table->resetHyperionUser()){
-				Info(log,"Password reset successful");
-				delete table;
-				exit(0);
-			} else {
-				Error(log,"Failed to reset password!");
-				delete table;
-				exit(1);
+			QScopedPointer<AuthTable> const table(new AuthTable());
+			if(!table->resetHyperionUser())
+			{
+				throw std::runtime_error("Failed to reset password!");
 			}
+
+			Info(log,"Password reset successful");
+			return 0;
 		}
 
 		// delete database before start
@@ -391,21 +392,18 @@ int main(int argc, char** argv)
 			{
 				if (!QFile::remove(dbFile.absoluteFilePath()))
 				{
-					Error(log,"Failed to delete Database!");
-					exit(1);
-				}
-				else
-				{
-					Info(log,"Configuration database deleted successfully.");
+					throw std::runtime_error("Failed to delete Database!");
 				}
+
+				Info(log,"Configuration database deleted successfully.");
 			}
 			else
 			{
 				Warning(log,"Configuration database '%s' does not exist!", QSTRING_CSTR(dbFile.absoluteFilePath()));
 			}
 		}
 
-		QString configFile(importConfig.value(parser));
+		QString const configFile(importConfig.value(parser));
 		if (!configFile.isEmpty())
 		{
 			if ( readonlyMode )
@@ -441,7 +439,7 @@ int main(int argc, char** argv)
 		if (!configFile.isEmpty())
 		{
 			Info(log,"Configuration imported sucessfully. You can start Hyperion now.");
-			exit(0);
+			return 0;
 		}
 
 		Info(log,"Starting Hyperion in %sGUI mode, DB is %s", isGuiApp ? "": "non-", readonlyMode ? "read-only" : "read/write");
@@ -469,11 +467,11 @@ int main(int argc, char** argv)
 			QApplication::setQuitOnLastWindowClosed(false);
 			SysTray tray(hyperiond.get());
 			tray.hide();
-			rc = (qobject_cast<QApplication *>(app.data()))->exec();
+			exitCode = (qobject_cast<QApplication *>(app.data()))->exec();
 		}
 		else
 		{
-			rc = app->exec();
+			exitCode = app->exec();
 		}
 	}
 	catch (std::exception& e)
@@ -488,7 +486,7 @@ int main(int argc, char** argv)
 	}
 #endif
 
-	Info(log, "Application ended with code %d", rc);
+	Info(log, "Application ended with code %d", exitCode);
 
-	return rc;
+	return exitCode;
 }