summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2021-03-21 11:37:03 (GMT)
committerGitHub <noreply@github.com>2021-03-21 11:37:03 (GMT)
commit11b69dcb3fdd6463904b71d6da61390a0146505c (patch)
treeca5a2f97b15f15848e7d2ee23e316003df957624
parent571a224d22a9603f7c155eb16816cc25ebb21b24 (diff)
parente6b9db67f4a851c62c95ecffd5fc027b33cb195a (diff)
downloadDoxygen-11b69dcb3fdd6463904b71d6da61390a0146505c.zip
Doxygen-11b69dcb3fdd6463904b71d6da61390a0146505c.tar.gz
Doxygen-11b69dcb3fdd6463904b71d6da61390a0146505c.tar.bz2
Merge pull request #8447 from albert-github/feature/bug_configimpl_dead
Regression: dead code in configimpl.l
-rw-r--r--src/configimpl.l8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/configimpl.l b/src/configimpl.l
index 99f15a4..4443f9c 100644
--- a/src/configimpl.l
+++ b/src/configimpl.l
@@ -1313,7 +1313,6 @@ static QCString configFileToString(const char *name)
return ret;
};
- bool fileOpened=FALSE;
if (name[0]=='-' && name[1]==0) // read from stdin
{
// read contents from stdin into contents string
@@ -1324,16 +1323,11 @@ static QCString configFileToString(const char *name)
std::ifstream f(name,std::istream::in);
if (!f.is_open())
{
- config_err("file '%s' not found\n",name);
+ config_term("file '%s' not found or could not be opened\n",name);
return "";
}
return stream2string(f);
}
- if (!fileOpened)
- {
- config_term("cannot open file '%s' for reading\n",name);
- }
- return "";
}
bool ConfigImpl::parseString(const char *fn,const char *str,bool update)