summaryrefslogtreecommitdiffstats
path: root/src/definition.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-12-08 12:10:17 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2019-12-08 12:10:17 (GMT)
commit7d4f5205482b0f0212707d573c8c668a0125cc9f (patch)
tree83fa73cff0fbcd62182aff0cce8de83064954f45 /src/definition.cpp
parent6d4835dbe01a27923db8a1e4559b61da5065cb7a (diff)
parent6382986b77d302be187d95aaa850eff132ec1d7d (diff)
downloadDoxygen-7d4f5205482b0f0212707d573c8c668a0125cc9f.zip
Doxygen-7d4f5205482b0f0212707d573c8c668a0125cc9f.tar.gz
Doxygen-7d4f5205482b0f0212707d573c8c668a0125cc9f.tar.bz2
Merge branch 'memory_leakage_fix' of https://github.com/virusxp/doxygen into virusxp-memory_leakage_fix
Diffstat (limited to 'src/definition.cpp')
-rw-r--r--src/definition.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/definition.cpp b/src/definition.cpp
index 9a1519e..ee08e93 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -744,12 +744,12 @@ class FilterCache
// file already processed, get the results after filtering from the tmp file
Debug::print(Debug::FilterOutput,0,"Reusing filter result for %s from %s at offset=%d size=%d\n",
qPrint(fileName),qPrint(Doxygen::filterDBFileName),(int)item->filePos,(int)item->fileSize);
- f = portable_fopen(Doxygen::filterDBFileName,"rb");
+ f = Portables::fopen(Doxygen::filterDBFileName,"rb");
if (f)
{
bool success=TRUE;
str.resize(item->fileSize+1);
- if (portable_fseek(f,item->filePos,SEEK_SET)==-1)
+ if (Portables::fseek(f,item->filePos,SEEK_SET)==-1)
{
err("Failed to seek to position %d in filter database file %s\n",(int)item->filePos,qPrint(Doxygen::filterDBFileName));
success=FALSE;
@@ -780,8 +780,8 @@ class FilterCache
// filter file
QCString cmd=filter+" \""+fileName+"\"";
Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",qPrint(cmd));
- f = portable_popen(cmd,"r");
- FILE *bf = portable_fopen(Doxygen::filterDBFileName,"a+b");
+ f = Portables::popen(cmd,"r");
+ FILE *bf = Portables::fopen(Doxygen::filterDBFileName,"a+b");
FilterCacheItem *item = new FilterCacheItem;
item->filePos = m_endPos;
if (bf==0)
@@ -790,7 +790,7 @@ class FilterCache
err("Error opening filter database file %s\n",qPrint(Doxygen::filterDBFileName));
str.addChar('\0');
delete item;
- portable_pclose(f);
+ Portables::pclose(f);
return FALSE;
}
// append the filtered output to the database file
@@ -806,7 +806,7 @@ class FilterCache
qPrint(Doxygen::filterDBFileName),bytesWritten,bytesRead);
str.addChar('\0');
delete item;
- portable_pclose(f);
+ Portables::pclose(f);
fclose(bf);
return FALSE;
}
@@ -821,14 +821,14 @@ class FilterCache
qPrint(fileName),qPrint(Doxygen::filterDBFileName),(int)item->filePos,(int)item->fileSize);
// update end of file position
m_endPos += size;
- portable_pclose(f);
+ Portables::pclose(f);
fclose(bf);
}
else // no filtering
{
// normal file
//printf("getFileContents(%s): no filter\n",qPrint(fileName));
- f = portable_fopen(fileName,"r");
+ f = Portables::fopen(fileName,"r");
while (!feof(f))
{
int bytesRead = fread(buf,1,blockSize,f);