summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2002-02-11 18:42:34 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2002-02-11 18:42:34 (GMT)
commit37dc8d4605e2fa9a924a08597580d471445acc08 (patch)
tree5217a0727749e0d0ce57200c536df1f0a875fdcc
parent24f9a159dd76047cf03b92e7d71010947efaf164 (diff)
downloadDoxygen-37dc8d4605e2fa9a924a08597580d471445acc08.zip
Doxygen-37dc8d4605e2fa9a924a08597580d471445acc08.tar.gz
Doxygen-37dc8d4605e2fa9a924a08597580d471445acc08.tar.bz2
Fixed pointer bug and config update bug
-rw-r--r--src/doxygen.cpp17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index c2833f8..dd39762 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -1,6 +1,6 @@
/******************************************************************************
*
- *
+ * $Id$
*
*
* Copyright (C) 1997-2002 by Dimitri van Heesch.
@@ -4100,11 +4100,14 @@ static void findMember(Entry *root,
bool isDefine=FALSE;
{
MemberName *mn = Doxygen::functionNameSDict[funcName];
- MemberDef *md = mn->first();
- while (md && !isDefine)
+ if (mn)
{
- isDefine = isDefine || md->isDefine();
- md = mn->next();
+ MemberDef *md = mn->first();
+ while (md && !isDefine)
+ {
+ isDefine = isDefine || md->isDefine();
+ md = mn->next();
+ }
}
}
if ((mn=Doxygen::memberNameSDict[funcName])==0)
@@ -5837,7 +5840,6 @@ static void generateConfigFile(const char *configFile,bool shortList,
bool writeToStdout=(configFile[0]=='-' && configFile[1]=='\0');
if (fileOpened)
{
- Config::instance()->init();
Config::instance()->writeTemplate(&f,shortList,updateOnly);
if (!writeToStdout)
{
@@ -6563,6 +6565,8 @@ void readConfiguration(int argc, char **argv)
* Parse or generate the config file *
**************************************************************************/
+ Config::instance()->init();
+
if (genConfig)
{
generateConfigFile(configName,shortList);
@@ -6600,6 +6604,7 @@ void readConfiguration(int argc, char **argv)
}
}
+
if (!Config::instance()->parse(configName))
{
err("Error: could not open or read configuration file %s!\n",configName);