Skip to content

D
doxverilog
Commit b698431e authored by dimitri's avatar dimitri
Browse files
Options

Fixed pointer bug and config update bug

parent d1e917df
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 6 deletions
src/doxygen.cpp
View file @ b698431e
/****************************************************************************** /******************************************************************************
* *
* * $Id$
* *
* *
* Copyright (C) 1997-2002 by Dimitri van Heesch. * Copyright (C) 1997-2002 by Dimitri van Heesch.
...@@ -4100,6 +4100,8 @@ static void findMember(Entry *root, ...@@ -4100,6 +4100,8 @@ static void findMember(Entry *root,
bool isDefine=FALSE; bool isDefine=FALSE;
{ {
MemberName *mn = Doxygen::functionNameSDict[funcName]; MemberName *mn = Doxygen::functionNameSDict[funcName];
if (mn)
{
MemberDef *md = mn->first(); MemberDef *md = mn->first();
while (md && !isDefine) while (md && !isDefine)
{ {
...@@ -4107,6 +4109,7 @@ static void findMember(Entry *root, ...@@ -4107,6 +4109,7 @@ static void findMember(Entry *root,
md = mn->next(); md = mn->next();
} }
} }
}
if ((mn=Doxygen::memberNameSDict[funcName])==0) if ((mn=Doxygen::memberNameSDict[funcName])==0)
{ {
mn=new MemberName(funcName); mn=new MemberName(funcName);
...@@ -5837,7 +5840,6 @@ static void generateConfigFile(const char *configFile,bool shortList, ...@@ -5837,7 +5840,6 @@ static void generateConfigFile(const char *configFile,bool shortList,
bool writeToStdout=(configFile[0]=='-' && configFile[1]=='\0'); bool writeToStdout=(configFile[0]=='-' && configFile[1]=='\0');
if (fileOpened) if (fileOpened)
{ {
Config::instance()->init();
Config::instance()->writeTemplate(&f,shortList,updateOnly); Config::instance()->writeTemplate(&f,shortList,updateOnly);
if (!writeToStdout) if (!writeToStdout)
{ {
...@@ -6563,6 +6565,8 @@ void readConfiguration(int argc, char **argv) ...@@ -6563,6 +6565,8 @@ void readConfiguration(int argc, char **argv)
* Parse or generate the config file * * Parse or generate the config file *
**************************************************************************/ **************************************************************************/
Config::instance()->init();
if (genConfig) if (genConfig)
{ {
generateConfigFile(configName,shortList); generateConfigFile(configName,shortList);
...@@ -6600,6 +6604,7 @@ void readConfiguration(int argc, char **argv) ...@@ -6600,6 +6604,7 @@ void readConfiguration(int argc, char **argv)
} }
} }
if (!Config::instance()->parse(configName)) if (!Config::instance()->parse(configName))
{ {
err("Error: could not open or read configuration file %s!\n",configName); err("Error: could not open or read configuration file %s!\n",configName);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment