summaryrefslogtreecommitdiffstats
path: root/src/util.cpp
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2019-11-22 13:56:50 (GMT)
committeralbert-github <albert.tests@gmail.com>2019-11-22 13:56:50 (GMT)
commit146bec22e9ff91e8274becd719149f7ab9c7cfb9 (patch)
treecf306ab8fce7c29a7fc8db53f0a16d55120a2507 /src/util.cpp
parente7d47ec23ba1b109754d6e47b1eb4d341efc3b36 (diff)
downloadDoxygen-146bec22e9ff91e8274becd719149f7ab9c7cfb9.zip
Doxygen-146bec22e9ff91e8274becd719149f7ab9c7cfb9.tar.gz
Doxygen-146bec22e9ff91e8274becd719149f7ab9c7cfb9.tar.bz2
Better termination message
In case a `WARN_LOGFILE` is used it in this file no clear whether doxygen finished correctly or exited beforehand in case a fatal error. Now a 'Exiting...' is also given in the warning log file in case an error is a fatal error.
Diffstat (limited to 'src/util.cpp')
-rw-r--r--src/util.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/util.cpp b/src/util.cpp
index f58a630..92b97b6 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -7950,10 +7950,9 @@ static int transcodeCharacterBuffer(const char *fileName,BufStr &srcBuf,int size
void *cd = portable_iconv_open(outputEncoding,inputEncoding);
if (cd==(void *)(-1))
{
- err("unsupported character conversion: '%s'->'%s': %s\n"
+ term(1,"unsupported character conversion: '%s'->'%s': %s\n"
"Check the INPUT_ENCODING setting in the config file!\n",
inputEncoding,outputEncoding,strerror(errno));
- exit(1);
}
int tmpBufSize=size*4+1;
BufStr tmpBuf(tmpBufSize);
@@ -7971,9 +7970,8 @@ static int transcodeCharacterBuffer(const char *fileName,BufStr &srcBuf,int size
}
else
{
- err("%s: failed to translate characters from %s to %s: check INPUT_ENCODING\n",
+ term(1,"%s: failed to translate characters from %s to %s: check INPUT_ENCODING\n",
fileName,inputEncoding,outputEncoding);
- exit(1);
}
portable_iconv_close(cd);
return newSize;