From 2d359f53d5ce6a39af52b5ff435d314fc62b4207 Mon Sep 17 00:00:00 2001
From: prozacx <prozacx@726aef4b-f618-498e-8847-2d620e286838>
Date: Sun, 1 May 2005 02:15:48 +0000
Subject: [PATCH] Renamed some stuff

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@217 726aef4b-f618-498e-8847-2d620e286838
---
 main.cpp |  2 +-
 znc.cpp  | 21 +++++++++++----------
 znc.h    |  4 ++--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/main.cpp b/main.cpp
index 1c981da0..e92c46f0 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,7 +18,7 @@ static struct option g_LongOpts[] =
 
 void GenerateHelp( const char *appname )
 {
-	CUtils::PrintMessage("USAGE: " + string(appname) + " [options] [znc.conf]");
+	CUtils::PrintMessage("USAGE: " + string(appname) + " [options] [config]");
 	CUtils::PrintMessage("Options are:");
 	CUtils::PrintMessage("\t--help");
 	CUtils::PrintMessage("\t--makepass      Generates a password for use in config");
diff --git a/znc.cpp b/znc.cpp
index 1e8cb8e6..340bdc1c 100644
--- a/znc.cpp
+++ b/znc.cpp
@@ -235,7 +235,7 @@ string CZNC::GetConfigPath(const string& sConfigFile) {
 	return sRetPath;
 }
 
-bool CZNC::WriteNewConfig(const string& sConfigFile) {
+bool CZNC::WriteNewConfig(const string& sConfig) {
 	string sAnswer;
 	vector<string> vsLines;
 	bool bAnswer = false;
@@ -339,6 +339,7 @@ bool CZNC::WriteNewConfig(const string& sConfigFile) {
 	} while (CUtils::GetBoolInput("Would you like to setup another user?", false));
 	// !User
 
+	string sConfigFile = GetConfigPath(sConfig);
 	CUtils::PrintAction("Writing config [" + sConfigFile + "]");
 	CFile File(sConfigFile);
 
@@ -356,33 +357,33 @@ bool CZNC::WriteNewConfig(const string& sConfigFile) {
 	return true;
 }
 
-bool CZNC::ParseConfig(const string& sConfigFile) {
+bool CZNC::ParseConfig(const string& sConfig) {
 	string sStatusPrefix;
-	string sFilePath = GetConfigPath(sConfigFile);
+	string sConfigFile = GetConfigPath(sConfig);
 
-	CUtils::PrintAction("Opening Config [" + sFilePath + "]");
+	CUtils::PrintAction("Opening Config [" + sConfigFile + "]");
 
-	if (!CFile::Exists(sFilePath)) {
+	if (!CFile::Exists(sConfigFile)) {
 		CUtils::PrintStatus(false, "No such file");
 		if (!CUtils::GetBoolInput("Would you like to create this config now?", true)) {
 			return false;
 		}
 
-		WriteNewConfig(sFilePath);
-		CUtils::PrintAction("Opening Config [" + sFilePath + "]");
+		WriteNewConfig(sConfigFile);
+		CUtils::PrintAction("Opening Config [" + sConfigFile + "]");
 	}
 
-	if (!CFile::IsReg(sFilePath)) {
+	if (!CFile::IsReg(sConfigFile)) {
 		CUtils::PrintStatus(false, "Not a file");
 		return false;
 	}
 
-	if (!m_LockFile.TryExLock(sFilePath, 50)) {
+	if (!m_LockFile.TryExLock(sConfigFile, 50)) {
 		CUtils::PrintStatus(false, "ZNC is already running on this config.");
 		return false;
 	}
 
-	CFile File(sFilePath);
+	CFile File(sConfigFile);
 
 	if (!File.Open(O_RDONLY)) {
 		CUtils::PrintStatus(false);
diff --git a/znc.h b/znc.h
index 1954d804..76c45d28 100644
--- a/znc.h
+++ b/znc.h
@@ -20,12 +20,12 @@ public:
 	CUser* GetUser(const string& sUser);
 	Csock* FindSockByName(const string& sSockName);
 	bool Listen();
-	bool ParseConfig(const string& sConfigFile);
+	bool ParseConfig(const string& sConfig);
 	bool IsHostAllowed(const string& sHostMask);
 	void InitDirs(const string& sArgvPath);
 	bool OnBoot();
 	string GetConfigPath(const string& sConfigFile);
-	bool WriteNewConfig(const string& sConfigFile);
+	bool WriteNewConfig(const string& sConfig);
 
 	// Getters
 	TSocketManager<Csock>& GetManager() { return m_Manager; }