Skip to content

Commit ca61583

Browse files
committed
Refactoring: Avoid creating QCString from 0 pointer.
To prepare to migrate from QCString to std::string, 0 pointer initialization should be avoided as this is undefined behavior for std::string.
1 parent 15bf1f3 commit ca61583

33 files changed

+1454
-1447
lines changed

addon/doxyapp/doxyapp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@ static void findXRefSymbols(FileDef *fd)
129129

130130
// parse the source code
131131
intf->parseCode(xrefList,
132-
0,
132+
QCString(),
133133
fileToString(fd->absFilePath()),
134134
lang,
135135
FALSE,
136-
0,
136+
QCString(),
137137
fd);
138138
}
139139

addon/doxyparse/doxyparse.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ static void findXRefSymbols(FileDef *fd)
104104
parseList.add(OutputCodeDeferExtension(&parse));
105105

106106
// parse the source code
107-
intf->parseCode(parseList, 0, fileToString(fd->absFilePath()), lang, FALSE, 0, fd);
107+
intf->parseCode(parseList, QCString(), fileToString(fd->absFilePath()), lang, FALSE, QCString(), fd);
108108
}
109109

110110
static bool ignoreStaticExternalCall(const MemberDef *context, const MemberDef *md) {

src/configimpl.l

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -674,8 +674,8 @@ static QCString configStringRecode(
674674
{
675675
if (inputEncoding.isEmpty() || outputEncoding.isEmpty() || inputEncoding==outputEncoding) return str;
676676
size_t inputSize=str.length();
677-
size_t outputSize=inputSize*4+1;
678-
QCString output(outputSize);
677+
size_t outputSize=inputSize*4;
678+
QCString output(outputSize, QCString::ExplicitSize);
679679
void *cd = portable_iconv_open(outputEncoding.data(),inputEncoding.data());
680680
if (cd==reinterpret_cast<void *>(-1))
681681
{

src/dia.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void writeDiaGraphFromFile(const QCString &inFile,const QCString &outDir,
6868
}
6969
if ( (format==DIA_EPS) && (Config_getBool(USE_PDFLATEX)) )
7070
{
71-
QCString epstopdfArgs(maxCmdLine);
71+
QCString epstopdfArgs(maxCmdLine, QCString::ExplicitSize);
7272
epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"",
7373
qPrint(outFile),qPrint(outFile));
7474
if (Portable::system("epstopdf",epstopdfArgs)!=0)

src/diagram.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1354,7 +1354,7 @@ void ClassDiagram::writeFigure(TextStream &output,const QCString &path,
13541354

13551355
if (Config_getBool(USE_PDFLATEX))
13561356
{
1357-
QCString epstopdfArgs(4096);
1357+
QCString epstopdfArgs(4096, QCString::ExplicitSize);
13581358
epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"",
13591359
qPrint(epsBaseName),qPrint(epsBaseName));
13601360
//printf("Converting eps using '%s'\n",qPrint(epstopdfArgs));

src/docbookvisitor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ DB_VIS_C
359359
case DocVerbatim::Dot:
360360
{
361361
static int dotindex = 1;
362-
QCString baseName(4096);
362+
QCString baseName(4096, QCString::ExplicitSize);
363363
QCString name;
364364
QCString stext = s.text();
365365
m_t << "<para>\n";
@@ -384,7 +384,7 @@ DB_VIS_C
384384
case DocVerbatim::Msc:
385385
{
386386
static int mscindex = 1;
387-
QCString baseName(4096);
387+
QCString baseName(4096, QCString::ExplicitSize);
388388
QCString name;
389389
QCString stext = s.text();
390390
m_t << "<para>\n";

src/docparser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ QCString DocParser::findAndCopyImage(const QCString &fileName, DocImage::Type ty
176176
{ // we have an .eps image in pdflatex mode => convert it to a pdf.
177177
QCString outputDir = Config_getString(LATEX_OUTPUT);
178178
QCString baseName = fd->name().left(fd->name().length()-4);
179-
QCString epstopdfArgs(4096);
179+
QCString epstopdfArgs(4096, QCString::ExplicitSize);
180180
epstopdfArgs.sprintf("\"%s/%s.eps\" --outfile=\"%s/%s.pdf\"",
181181
qPrint(outputDir), qPrint(baseName),
182182
qPrint(outputDir), qPrint(baseName));

src/doxygen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ static void buildFileList(const Entry *root)
539539
}
540540
else
541541
{
542-
QCString text(4096);
542+
QCString text(4096, QCString::ExplicitSize);
543543
text.sprintf("the name '%s' supplied as "
544544
"the argument in the \\file statement ",
545545
qPrint(root->name));

src/htmldocvisitor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ void HtmlDocVisitor::operator()(const DocVerbatim &s)
601601
case DocVerbatim::Dot:
602602
{
603603
static int dotindex = 1;
604-
QCString fileName(4096);
604+
QCString fileName(4096, QCString::ExplicitSize);
605605

606606
forceEndParagraph(s);
607607
fileName.sprintf("%s%d%s",
@@ -635,7 +635,7 @@ void HtmlDocVisitor::operator()(const DocVerbatim &s)
635635
forceEndParagraph(s);
636636

637637
static int mscindex = 1;
638-
QCString baseName(4096);
638+
QCString baseName(4096, QCString::ExplicitSize);
639639

640640
baseName.sprintf("%s%d",
641641
qPrint(Config_getString(HTML_OUTPUT)+"/inline_mscgraph_"),

src/htmlhelp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ class HtmlHelpRecoder
6969
QCString recode(const QCString &s)
7070
{
7171
size_t iSize = s.length();
72-
size_t oSize = iSize*4+1;
73-
QCString output(oSize);
72+
size_t oSize = iSize*4;
73+
QCString output(oSize, QCString::ExplicitSize);
7474
size_t iLeft = iSize;
7575
size_t oLeft = oSize;
7676
const char *iPtr = s.data();

0 commit comments

Comments
 (0)