adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-07 17:33:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move some common code in main() in front of all those if()s

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1167 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2008-08-24 10:41:01 +00:00
parent 87d062a5c5
commit 09a122ef92
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.cpp
+5 -9
View File
@@ -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;