summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-28 08:15:31 -0700
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-04-06 21:21:54 +0200
commit76bdc9681799a7ed17be1cddbe7b91adef242373 (patch)
tree53a7cd1d14a5233938704015404d9ea1f5e4490d
parent59919635523d41f3a15120c83db4b7d080c155de (diff)
downloadmana-removed-config-file-checks.tar.gz
mana-removed-config-file-checks.tar.bz2
mana-removed-config-file-checks.tar.xz
mana-removed-config-file-checks.zip
Removed seemingly pointless config file checksremoved-config-file-checks
* When config file can't be read, it will be reported by Configuration::init. * When config file can't be written, xmlNewTextWriterFilename will probably return nullptr.
-rw-r--r--src/client.cpp25
-rw-r--r--src/configuration.cpp13
2 files changed, 1 insertions, 37 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 2a854bc0..afd53fa3 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1175,30 +1175,7 @@ void Client::initConfiguration()
config.setValue("ChatLogLength", 128);
config.setValue("disableTransparency", false);
- // Checking if the configuration file exists... otherwise create it with
- // default options.
- FILE *configFile = nullptr;
- std::string configPath;
-
- configPath = mConfigDir + "/config.xml";
-
- configFile = fopen(configPath.c_str(), "r");
-
- // If we can't read it, it doesn't exist !
- if (!configFile)
- {
- // We reopen the file in write mode and we create it
- configFile = fopen(configPath.c_str(), "wt");
- }
- if (!configFile)
- {
- logger->log("Can't create %s. Using defaults.", configPath.c_str());
- }
- else
- {
- fclose(configFile);
- config.init(configPath);
- }
+ config.init(mConfigDir + "config.xml");
}
/**
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 7d2b496f..3c9fab3c 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -301,20 +301,7 @@ void ConfigurationObject::writeToXML(xmlTextWriterPtr writer)
void Configuration::write()
{
- // Do not attempt to write to file that cannot be opened for writing
- FILE *testFile = fopen(mConfigPath.c_str(), "w");
- if (!testFile)
- {
- logger->log("Configuration::write() couldn't open %s for writing",
- mConfigPath.c_str());
- return;
- }
-
- fclose(testFile);
-
-
xmlTextWriterPtr writer = xmlNewTextWriterFilename(mConfigPath.c_str(), 0);
-
if (!writer)
{
logger->log("Configuration::write() error while creating writer");