summaryrefslogtreecommitdiffstats
path: root/src/util.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-12-22 15:43:21 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2019-12-22 15:43:21 (GMT)
commit0ea72fdd522e6bc3bc442e7d2ae40e7607546e55 (patch)
treef6db48d3500b0c68464be9fe92ca1eb8a193427b /src/util.cpp
parent369c65635de29af6fd92c835879d70fdac7d2270 (diff)
parent146bec22e9ff91e8274becd719149f7ab9c7cfb9 (diff)
downloadDoxygen-0ea72fdd522e6bc3bc442e7d2ae40e7607546e55.zip
Doxygen-0ea72fdd522e6bc3bc442e7d2ae40e7607546e55.tar.gz
Doxygen-0ea72fdd522e6bc3bc442e7d2ae40e7607546e55.tar.bz2
Merge branch 'feature/bug_terminate' of https://github.com/albert-github/doxygen into albert-github-feature/bug_terminate
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 aac0d4f..9cff297 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -7958,10 +7958,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);
@@ -7979,9 +7978,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;