1 files changed, 31 insertions, 42 deletions

diff --git a/src/configimpl.l b/src/configimpl.l
index a05293f..9aae6f6 100644
--- a/src/configimpl.l
+++ b/src/configimpl.l
@@ -56,6 +56,16 @@ void config_err(const char *fmt, ...)
   vfprintf(stderr, (QCString(error_str) + fmt).data(), args);
   va_end(args); 
 }
+void config_term(const int exitVal, const char *fmt, ...)
+{
+  va_list args;
+  va_start(args, fmt);
+  vfprintf(stderr, (QCString(error_str) + fmt).data(), args);
+  va_end(args);
+  fprintf(stderr, "%s\n", "Exiting...");
+  exit(exitVal);
+}
+
 void config_warn(const char *fmt, ...)
 {
   va_list args;
@@ -213,13 +223,11 @@ QCString &ConfigImpl::getString(const char *fileName,int num,const char *name) c
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
   {
-    config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
   }
   else if (opt->kind()!=ConfigOption::O_String)
   {
-    config_err("%s<%d>: Internal error: Requested option %s not of string type!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested option %s not of string type!\n",fileName,num,name);
   }
   return *((ConfigString *)opt)->valueRef();
 }
@@ -229,13 +237,11 @@ QStrList &ConfigImpl::getList(const char *fileName,int num,const char *name) con
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
   {
-    config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
   }
   else if (opt->kind()!=ConfigOption::O_List)
   {
-    config_err("%s<%d>: Internal error: Requested option %s not of list type!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested option %s not of list type!\n",fileName,num,name);
   }
   return *((ConfigList *)opt)->valueRef();
 }
@@ -245,13 +251,11 @@ QCString &ConfigImpl::getEnum(const char *fileName,int num,const char *name) con
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
   {
-    config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
   }
   else if (opt->kind()!=ConfigOption::O_Enum)
   {
-    config_err("%s<%d>: Internal error: Requested option %s not of enum type!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested option %s not of enum type!\n",fileName,num,name);
   }
   return *((ConfigEnum *)opt)->valueRef();
 }
@@ -261,13 +265,11 @@ int &ConfigImpl::getInt(const char *fileName,int num,const char *name) const
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
   {
-    config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
   }
   else if (opt->kind()!=ConfigOption::O_Int)
   {
-    config_err("%s<%d>: Internal error: Requested option %s not of integer type!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested option %s not of integer type!\n",fileName,num,name);
   }
   return *((ConfigInt *)opt)->valueRef();
 }
@@ -277,13 +279,11 @@ bool &ConfigImpl::getBool(const char *fileName,int num,const char *name) const
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
   {
-    config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
   }
   else if (opt->kind()!=ConfigOption::O_Bool)
   {
-    config_err("%s<%d>: Internal error: Requested option %s not of boolean type!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested option %s not of boolean type!\n",fileName,num,name);
   }
   return *((ConfigBool *)opt)->valueRef();
 }
@@ -566,9 +566,8 @@ static QCString configStringRecode(
   void *cd = portable_iconv_open(outputEncoding,inputEncoding);
   if (cd==(void *)(-1)) 
   {
-    fprintf(stderr,"Error: unsupported character conversion: '%s'->'%s'\n",
+    config_term(1,"Error: unsupported character conversion: '%s'->'%s'\n",
         inputEncoding.data(),outputEncoding.data());
-    exit(1);
   }
   size_t iLeft=(size_t)inputSize;
   size_t oLeft=(size_t)outputSize;
@@ -583,9 +582,8 @@ static QCString configStringRecode(
   }
   else
   {
-    fprintf(stderr,"Error: failed to translate characters from %s to %s: %s\n",
+    config_term(1,"Error: failed to translate characters from %s to %s: %s\n",
         inputEncoding.data(),outputEncoding.data(),strerror(errno));
-    exit(1);
   }
   portable_iconv_close(cd);
   return output;
@@ -638,9 +636,8 @@ static FILE *findFile(const char *fileName)
 static void readIncludeFile(const char *incName)
 {
   if (includeDepth==MAX_INCLUDE_DEPTH) {
-    config_err("maximum include depth (%d) reached, %s is not included. Aborting...\n",
+    config_term(1,"maximum include depth (%d) reached, %s is not included. Aborting...\n",
 	MAX_INCLUDE_DEPTH,incName);
-    exit(1);
   } 
 
   QCString inc = incName;
@@ -678,8 +675,7 @@ static void readIncludeFile(const char *incName)
   } 
   else
   {
-    config_err("@INCLUDE = %s: not found!\n",inc.data());
-    exit(1);
+    config_term(1,"@INCLUDE = %s: not found!\n",inc.data());
   }
 }
 
@@ -1161,9 +1157,8 @@ void ConfigImpl::init()
       ConfigOption * opt = ConfigImpl::instance()->get(depName);
       if (opt==0)
       {
-        config_warn("Config option '%s' has invalid depends relation on unknown option '%s'\n",
+        config_term(1,"Config option '%s' has invalid depends relation on unknown option '%s'\n",
             option->name().data(),depName.data());
-        exit(1);
       }
     }
   }
@@ -1229,8 +1224,7 @@ static QCString configFileToString(const char *name)
   }
   if (!fileOpened)  
   {
-    config_err("cannot open file '%s' for reading\n",name);
-    exit(1);
+    config_term(1,"cannot open file '%s' for reading\n",name);
   }
   return "";
 }
@@ -1440,9 +1434,8 @@ void Config::checkAndCorrect()
     QFileInfo fi(headerFile);
     if (!fi.exists())
     {
-      err("tag HTML_HEADER: header file '%s' "
+      term(1,"tag HTML_HEADER: header file '%s' "
 	  "does not exist\n",headerFile.data());
-      exit(1);
     }
   }
   // Test to see if HTML footer is valid
@@ -1452,9 +1445,8 @@ void Config::checkAndCorrect()
     QFileInfo fi(footerFile);
     if (!fi.exists())
     {
-      err("tag HTML_FOOTER: footer file '%s' "
+      term(1,"tag HTML_FOOTER: footer file '%s' "
 	  "does not exist\n",footerFile.data());
-      exit(1);
     }
   }
 
@@ -1467,9 +1459,8 @@ void Config::checkAndCorrect()
       QFileInfo fi(MathJaxCodefile);
       if (!fi.exists())
       {
-        err("tag MATHJAX_CODEFILE file '%s' "
+        term(1,"tag MATHJAX_CODEFILE file '%s' "
 	    "does not exist\n",MathJaxCodefile.data());
-        exit(1);
       }
     }
     QCString &path = Config_getString(MATHJAX_RELPATH);
@@ -1487,9 +1478,8 @@ void Config::checkAndCorrect()
     QFileInfo fi(latexHeaderFile);
     if (!fi.exists())
     {
-      err("tag LATEX_HEADER: header file '%s' "
+      term(1,"tag LATEX_HEADER: header file '%s' "
 	  "does not exist\n",latexHeaderFile.data());
-      exit(1);
     }
   }
   // Test to see if LaTeX footer is valid
@@ -1499,9 +1489,8 @@ void Config::checkAndCorrect()
     QFileInfo fi(latexFooterFile);
     if (!fi.exists())
     {
-      err("tag LATEX_FOOTER: footer file '%s' "
+      term(1,"tag LATEX_FOOTER: footer file '%s' "
 	  "does not exist\n",latexFooterFile.data());
-      exit(1);
     }
   }