diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-06-06 23:34:34 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-06-07 19:23:40 +0300 |
commit | 36ba43d6ea38062b17f7e63ef659962bfc51c64d (patch) | |
tree | 190156cb88b13a38a6d13c69ee0742cc078065a1 /src/configmanager.cpp | |
parent | f1518dd8476c968a43fa57cfb06198e290a4f77a (diff) | |
download | manaplus-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.gz manaplus-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.bz2 manaplus-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.xz manaplus-36ba43d6ea38062b17f7e63ef659962bfc51c64d.zip |
Fix clang-tidy check readability-implicit-bool-cast.
Diffstat (limited to 'src/configmanager.cpp')
-rw-r--r-- | src/configmanager.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/configmanager.cpp b/src/configmanager.cpp index 875431316..f9c7c447e 100644 --- a/src/configmanager.cpp +++ b/src/configmanager.cpp @@ -55,7 +55,7 @@ void ConfigManager::initServerConfig(const std::string &serverName) { settings.serverConfigDir = pathJoin(settings.configDir, serverName); - if (mkdir_r(settings.serverConfigDir.c_str())) + if (mkdir_r(settings.serverConfigDir.c_str()) != 0) { // TRANSLATORS: directory creation error logger->error(strprintf(_("%s doesn't exist and can't be created! " @@ -63,18 +63,18 @@ void ConfigManager::initServerConfig(const std::string &serverName) } const std::string configPath = settings.serverConfigDir + "/config.xml"; FILE *configFile = fopen(configPath.c_str(), "r"); - if (!configFile) + if (configFile == nullptr) { configFile = fopen(configPath.c_str(), "wb"); logger->log("Creating new server config: " + configPath); - if (configFile) + if (configFile != nullptr) { fputs("<?xml version=\"1.0\"?>\n", configFile); fputs("<configuration>\n", configFile); fputs("</configuration>\n", configFile); } } - if (configFile) + if (configFile != nullptr) { fclose(configFile); serverConfig.init(configPath); @@ -143,18 +143,18 @@ void ConfigManager::initConfiguration() #endif // UNITTESTS FILE *configFile = fopen(configPath.c_str(), "r"); - if (!configFile) + if (configFile == nullptr) { configFile = fopen(configPath.c_str(), "wb"); logger->log1("Creating new config"); - if (configFile) + if (configFile != nullptr) { fputs("<?xml version=\"1.0\"?>\n", configFile); fputs("<configuration>\n", configFile); fputs("</configuration>\n", configFile); } } - if (!configFile) + if (configFile == nullptr) { reportAlways("Can't create %s. Using defaults.", configPath.c_str()); |