From 09a122ef929bfad7abc67f92bf54615d4aefa133 Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Sun, 24 Aug 2008 10:41:01 +0000
Subject: [PATCH] Move some common code in main() in front of all those if()s

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1167 726aef4b-f618-498e-8847-2d620e286838
---
 main.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/main.cpp b/main.cpp
index e0c0d493..3836832d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -132,10 +132,11 @@ int main(int argc, char** argv) {
 		sConfig = "znc.conf";
 	}
 
+	CZNC* pZNC = &CZNC::Get();
+	pZNC->InitDirs(((argc) ? argv[0] : ""), sDataDir);
+
 	if (bMakeConf) {
-		CZNC& ZNC = CZNC::Get();
-		ZNC.InitDirs("", sDataDir);
-		if (ZNC.WriteNewConfig(sConfig)) {
+		if (pZNC->WriteNewConfig(sConfig)) {
 			char const* args[5];
 
 			if (argc > 2) {
@@ -163,7 +164,7 @@ int main(int argc, char** argv) {
 				return 1;
 			}
 
-			if ((chdir(ZNC.GetCurPath().c_str()) == -1)
+			if ((chdir(pZNC->GetCurPath().c_str()) == -1)
 					|| (execv(*argv, (char *const*)args) == -1)) {
 				CUtils::PrintError("Unable to launch znc [" + CString(strerror(errno)) + "]");
 				return 1;
@@ -175,8 +176,6 @@ int main(int argc, char** argv) {
 
 #ifdef HAVE_LIBSSL
 	if (bMakePem) {
-		CZNC* pZNC = &CZNC::Get();
-		pZNC->InitDirs("", sDataDir);
 		pZNC->WritePemFile(bEncPem);
 
 		delete pZNC;
@@ -197,9 +196,6 @@ int main(int argc, char** argv) {
 		return 0;
 	}
 
-	CZNC* pZNC = &CZNC::Get();
-	pZNC->InitDirs(((argc) ? argv[0] : ""), sDataDir);
-
 	if (!pZNC->ParseConfig(sConfig)) {
 		CUtils::PrintError("Unrecoverable config error.");
 		delete pZNC;