Refactoring: make sure all variables are initialized

Found using clang tidy's cppcoreguidelines-init-variables check

Author: doxygen

CMakeLists.txt

@@ -92,6 +92,7 @@ if (ENABLE_CLANG_TIDY)
        set(CMAKE_CXX_CLANG_TIDY clang-tidy;
                                 -header-filter=.;
                                 -checks=-*,cppcoreguidelines-special-member-functions
+                                #-checks=-*,cppcoreguidelines-init-variables
                                 #-checks=-*,modernize-use-nullptr
                                 #-checks=-*,modernize-use-override
                                 #-checks=-*,modernize-use-emplace

src/aliases.cpp

@@ -234,9 +234,9 @@ static std::string replaceAliasArguments(StringUnorderedSet &aliasesProcessed,
 
   // first make a list of arguments from the comma separated argument list
   StringViewVector args;
-  size_t i,l=argList.length();
+  size_t l=argList.length();
   size_t p=0;
-  for (i=0;i<l;i++)
+  for (size_t i=0;i<l;i++)
   {
     char c = argList[i];
     if (!sep.empty() &&
@@ -264,7 +264,7 @@ static std::string replaceAliasArguments(StringUnorderedSet &aliasesProcessed,
   bool insideMarkerId = false;
   size_t markerStart  = 0;
   auto isDigit = [](char c) { return c>='0' && c<='9'; };
-  for (i=0;i<=l;i++)
+  for (size_t i=0;i<=l;i++)
   {
     char c = i<l ? aliasValue[i] : '\0';
     if (insideMarkerId && !isDigit(c)) // found end of a markerId
@@ -472,12 +472,11 @@ static int countAliasArguments(std::string_view args, std::string_view sep)
 
 static std::string extractAliasArgs(std::string_view args)
 {
-  size_t i;
   int bc = 0;
   char prevChar = 0;
   if (!args.empty() && args[0]=='{') // alias has argument
   {
-    for (i=0;i<args.length();i++)
+    for (size_t i=0;i<args.length();i++)
     {
       char c = args[i];
       if (prevChar!='\\') // not escaped

src/cite.cpp

@@ -141,7 +141,7 @@ void CitationManager::insertCrossReferencesForBibFile(const QCString &bibFile)
   std::string lineStr;
   while (getline(f,lineStr))
   {
-    int i;
+    int i = -1;
     QCString line(lineStr);
     if (line.stripWhiteSpace().startsWith("@"))
     {
@@ -213,7 +213,7 @@ QCString CitationManager::getFormulas(const QCString &s)
   const size_t tmpLen = 30;
   char tmp[tmpLen];
   const char *ps=s.data();
-  char c;
+  char c = 0;
   while ((c=*ps++))
   {
     if (insideFormula)
@@ -283,7 +283,7 @@ QCString CitationManager::replaceFormulas(const QCString &s)
   if (s.isEmpty()) return s;
   QCString t;
   int pos=0;
-  int i;
+  int i = -1;
   while ((i=s.find(g_formulaMarker.c_str(),pos))!=-1)
   {
     t += s.mid(pos,i-pos);
@@ -397,10 +397,10 @@ void CitationManager::generatePage()
 
   // 5. run bib2xhtml perl script on the generated file which will insert the
   //    bibliography in citelist.doc
-  int exitCode;
   QCString perlArgs = "\""+bib2xhtmlFile+"\" "+bibOutputFiles+" \""+ citeListFile+"\"";
   if (citeDebug) perlArgs+=" -d";
-  if ((exitCode=Portable::system("perl",perlArgs)) != 0)
+  int exitCode = Portable::system("perl",perlArgs);
+  if (exitCode!=0)
   {
     err("Problems running bibtex. Verify that the command 'perl --version' works from the command line. Exit code: %d\n",
         exitCode);
@@ -461,7 +461,7 @@ void CitationManager::generatePage()
     CommentScanner   commentScanner;
     int              lineNr = 0;
     int              pos = 0;
-    Protection       prot;
+    Protection       prot = Protection::Public;
     commentScanner.parseCommentBlock(
         nullptr,
         &current,

src/clangparser.cpp

@@ -351,7 +351,7 @@ std::string ClangTUParser::lookup(uint32_t line,const char *symbol)
 
   auto getCurrentTokenLine = [=]() -> uint32_t
   {
-    uint32_t l, c;
+    uint32_t l=0, c=0;
     if (p->numTokens==0) return 1;
     // guard against filters that reduce the number of lines
     if (p->curToken>=p->numTokens) p->curToken=p->numTokens-1;
@@ -403,7 +403,7 @@ std::string ClangTUParser::lookup(uint32_t line,const char *symbol)
         ts = clang_getCString(tokenString);
         tl = ts ? strlen(ts) : 0;
         // skip over any spaces in the symbol
-        char c;
+        char c = 0;
         while (offset<sl && ((c=symbol[offset])==' ' || c=='\t' || c=='\r' || c=='\n'))
         {
           offset++;
@@ -574,7 +574,7 @@ void ClangTUParser::codifyLines(OutputCodeList &ol,const FileDef *fd,const char
 {
   if (fontClass) ol.startFontClass(fontClass);
   const char *p=text,*sp=p;
-  char c;
+  char c = 0;
   bool inlineCodeFragment = false;
   bool done=FALSE;
   while (!done)
@@ -624,7 +624,7 @@ void ClangTUParser::writeMultiLineCodeLink(OutputCodeList &ol,
   while (!done)
   {
     const char *sp=p;
-    char c;
+    char c = 0;
     while ((c=*p++) && c!='\n') { column++; }
     if (c=='\n')
     {
@@ -804,7 +804,7 @@ void ClangTUParser::writeSources(OutputCodeList &ol,const FileDef *fd)
   for (unsigned int i=0;i<p->numTokens;i++)
   {
     CXSourceLocation start = clang_getTokenLocation(p->tu, p->tokens[i]);
-    unsigned int l, c;
+    unsigned int l=0, c=0;
     clang_getSpellingLocation(start, nullptr, &l, &c, nullptr);
     if (l > line) column = 1;
     while (line<l)

src/classdef.cpp

@@ -2771,7 +2771,7 @@ void ClassDefImpl::writeDocumentation(OutputList &ol) const
   bool sliceOpt   = Config_getBool(OPTIMIZE_OUTPUT_SLICE);
   QCString pageTitle = title();
 
-  HighlightedItem hli;
+  HighlightedItem hli = HighlightedItem::None;
   if (sliceOpt)
   {
     if (compoundType()==Interface)
@@ -2918,7 +2918,7 @@ void ClassDefImpl::writeMemberList(OutputList &ol) const
   ol.pushGeneratorState();
   ol.disableAllBut(OutputType::Html);
 
-  HighlightedItem hli;
+  HighlightedItem hli = HighlightedItem::None;
   if (sliceOpt)
   {
     if (compoundType()==Interface)
@@ -3541,8 +3541,8 @@ void ClassDefImpl::mergeMembersFromBaseClasses(bool mergeVirtualBaseClass)
 
       for (auto &srcMni : srcMnd)
       {
-        MemberNameInfo *dstMni;
-        if ((dstMni=dstMnd.find(srcMni->memberName())))
+        MemberNameInfo *dstMni=dstMnd.find(srcMni->memberName());
+        if (dstMni)
           // a member with that name is already in the class.
           // the member may hide or reimplement the one in the sub class
           // or there may be another path to the base class that is already
@@ -4430,7 +4430,7 @@ int ClassDefImpl::countInheritedDecMembers(MemberListType lt,
     for (const auto &ibcd : m_impl->inherits)
     {
       ClassDefMutable *icd=toClassDefMutable(ibcd.classDef);
-      int lt1,lt2;
+      int lt1=-1,lt2=-1;
       if (icd && icd->isLinkable())
       {
         convertProtectionLevel(lt,ibcd.prot,&lt1,&lt2);
@@ -4547,7 +4547,7 @@ void ClassDefImpl::writeInheritedMemberDeclarations(OutputList &ol,ClassDefSet &
       ClassDefMutable *icd=toClassDefMutable(ibcd.classDef);
       if (icd && icd->isLinkable())
       {
-        int lt1,lt3;
+        int lt1=-1, lt3=-1;
         convertProtectionLevel(lt,ibcd.prot,&lt1,&lt3);
         if (lt2==-1 && lt3!=-1)
         {

src/code.l

@@ -502,9 +502,8 @@ ENDQopt ("const"|"volatile"|"sealed"|"override")({BN}+("const"|"volatile"|"seale
                                         }
 <ReadInclude>[^\n\"\>]+/(">"|"\"")      {
                                           //FileInfo *f;
-                                          bool ambig;
-                                          bool found=FALSE;
-
+                                          bool found = false;
+                                          bool ambig = false;
                                           QCString absIncFileName = determineAbsoluteIncludeName(yyextra->absFileName,yytext);
                                           const FileDef *fd=findFileDef(Doxygen::inputNameLinkedMap,absIncFileName,ambig);
                                           //printf("looking for include %s -> %s fd=%p\n",yytext,qPrint(absPath),fd);
@@ -2691,7 +2690,7 @@ static void writeMultiLineCodeLink(yyscan_t yyscanner,OutputCodeList &ol,
   while (!done)
   {
     const char *sp=p;
-    char c;
+    char c = 0;
     while ((c=*p++) && c!='\n') { }
     if (c=='\n')
     {
@@ -2832,7 +2831,6 @@ static const MemberDef *setCallContextForVar(yyscan_t yyscanner,const QCString &
     }
   }
 
-  const MemberName *mn;
   const ScopedTypeVariant *mcv = yyextra->theVarContext.findVariable(name);
   if (mcv)
   {
@@ -2866,7 +2864,8 @@ static const MemberDef *setCallContextForVar(yyscan_t yyscanner,const QCString &
   }
 
   // look for a global member
-  if ((mn=Doxygen::functionNameLinkedMap->find(name)))
+  const MemberName *mn = Doxygen::functionNameLinkedMap->find(name);
+  if (mn)
   {
     DBG_CTX((stderr,"global var '%s'\n",qPrint(name)));
     if (mn->size()==1) // global defined only once
@@ -2908,7 +2907,7 @@ static void updateCallContextForSmartPointer(yyscan_t yyscanner)
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   const Definition *d = yyextra->theCallContext.getScope().globalDef();
   //printf("updateCallContextForSmartPointer() cd=%s\n",cd ? qPrint(d->name()) : "<none>");
-  const MemberDef *md;
+  const MemberDef *md = nullptr;
   if (d && d->definitionType()==Definition::TypeClass && (md=(toClassDef(d))->isSmartPointer()))
   {
     const ClassDef *ncd = stripClassName(yyscanner,md->typeString(),md->getOuterScope());
@@ -3377,7 +3376,7 @@ static void generateMemberLink(yyscan_t yyscanner,
       MemberName *vmn=Doxygen::memberNameLinkedMap->find(varName);
       if (vmn==nullptr)
       {
-        int vi;
+        int vi = 0;
         QCString vn=varName;
         if ((vi=vn.findRev("::"))!=-1 || (vi=vn.findRev('.'))!=-1)  // explicit scope A::b(), probably static member
         {
@@ -3557,7 +3556,7 @@ static int countLines(yyscan_t yyscanner)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   const char *p=yyextra->inputString;
-  char c;
+  char c = 0;
   int count=1;
   while ((c=*p))
   {
@@ -3596,7 +3595,7 @@ static void writeObjCMethodCall(yyscan_t yyscanner,ObjCCallCtx *ctx)
 {
   if (ctx==nullptr) return;
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
-  char c;
+  char c = 0;
   if (!ctx->methodName.isEmpty())
   {
     DBG_CTX((stderr,"writeObjCMethodCall(%s) obj=%s method=%s\n",
@@ -3988,7 +3987,7 @@ static bool skipLanguageSpecificKeyword(yyscan_t yyscanner,const char *keyword)
     "union", "unsigned", "using", "virtual", "wchar_t",
     "xor", "xor_eq", "override", "sealed"
   };
-  bool retval;
+  bool retval = false;
   switch (yyextra->lang)
   {
     case SrcLangExt::Cpp:
@@ -3997,7 +3996,7 @@ static bool skipLanguageSpecificKeyword(yyscan_t yyscanner,const char *keyword)
     case SrcLangExt::Java:
       retval = (non_java_keywords.find(keyword) != non_java_keywords.end());
       break;
-    default: 
+    default:
       retval = false;
       break;
   }

src/codefragment.cpp

@@ -64,7 +64,7 @@ void CodeFragmentManager::Private::FragmentInfo::findBlockMarkers()
   // find the potential snippet blocks (can also be other array like stuff in the file)
   const char *s=fileContents.data();
   int lineNr=1;
-  char c;
+  char c=0;
   const char *foundOpen=nullptr;
   std::unordered_map<std::string,BlockMarker> candidates;
   while ((c=*s))
@@ -105,7 +105,7 @@ void CodeFragmentManager::Private::FragmentInfo::findBlockMarkers()
   s=fileContents.data();
   static auto gotoLine = [](const char *startBuf, const char *startPos, int startLine, int targetLine) -> const char *
   {
-    char cc;
+    char cc=0;
     if (targetLine<startLine)
     {
       //printf("gotoLine(pos=%p,start=%d,target=%d) backward\n",(void*)startPos,startLine,targetLine);
@@ -133,8 +133,8 @@ void CodeFragmentManager::Private::FragmentInfo::findBlockMarkers()
   static auto lineIndent = [](const char *&ss) -> int
   {
     int tabSize=Config_getInt(TAB_SIZE);
-    int col=0;
-    char cc;
+    int col = 0;
+    char cc = 0;
     while ((cc=*ss++))
     {
       if (cc==' ') col++;
@@ -205,8 +205,8 @@ void CodeFragmentManager::Private::FragmentInfo::findBlockMarkers()
         // process lines until the end of the indented block
         while (s < ee)
         {
-          int col=0;
-          char cc;
+          int col = 0;
+          char cc = 0;
           // skip over indentation
           while (col < marker.indent && (cc=*s++))
           {
@@ -263,7 +263,7 @@ static QCString readTextFileByName(const QCString &file)
   }
 
   // as a fallback we also look in the exampleNameDict
-  bool ambig;
+  bool ambig=false;
   FileDef *fd = findFileDef(Doxygen::exampleNameLinkedMap,file,ambig);
   if (fd)
   {

src/commentcnv.l

@@ -1378,7 +1378,7 @@ static void replaceCommentMarker(yyscan_t yyscanner,std::string_view s)
   if (s.empty()) return;
   size_t p   = 0;
   size_t len = s.length();
-  char c;
+  char c = 0;
   // copy leading blanks
   while (p<len && (c=s[p]) && (c==' ' || c=='\t' || c=='\n'))
   {
@@ -1421,7 +1421,7 @@ static inline int computeIndent(const char *s)
   int col=0;
   int tabSize=Config_getInt(TAB_SIZE);
   const char *p=s;
-  char c;
+  char c = 0;
   while ((c=*p++))
   {
     if (c==' ') col++;
@@ -1678,7 +1678,7 @@ static bool readIncludeFile(yyscan_t yyscanner,const QCString &inc,const QCStrin
         return false;
       }
       lineNr = lineBlock(incText, blockId);
-      int blockPos;
+      int blockPos = 0;
       incText = extractBlock(incText, blockId, blockPos);
       fs->fileBuf.clear();
       if (!incText.isEmpty())

src/commentscan.l

@@ -3923,11 +3923,11 @@ static bool handleToc(yyscan_t yyscanner,const QCString &, const StringVector &o
     for (const auto &opt_ : optList)
     {
       QCString opt = QCString(opt_).stripWhiteSpace().lower();
-      char dum;
       int level = SectionType::MaxLevel;
       int i = opt.find(':');
       if (i>0)  // found ':' but not on position 0 what would mean just a level
       {
+        char dum=0;
         if (sscanf(opt.right(opt.length() - i - 1).data(),"%d%c",&level,&dum) != 1)
         {
           warn(yyextra->fileName,yyextra->lineNr,"Unknown option:level specified with \\tableofcontents: '%s'", qPrint(QCString(opt_).stripWhiteSpace()));
@@ -4283,10 +4283,9 @@ static void stripTrailingWhiteSpace(QCString &s)
 {
   size_t len = s.length();
   int i = (int)len-1;
-  char c;
   while (i>=0)
   {
-    c = s.at(i);
+    char c = s.at(i);
     if (c==' ' || c=='\t' || c=='\r') // normal whitespace
     {
       i--;

src/condparser.cpp

@@ -190,19 +190,16 @@ bool CondParser::parseLevel1()
  */
 bool CondParser::parseLevel2()
 {
-  bool ans;
   int opId = getOperatorId(m_token);
   if (opId == NOT)
   {
     getToken();
-    ans = !parseLevel3();
+    return !parseLevel3();
   }
   else
   {
-    ans = parseLevel3();
+    return parseLevel3();
   }
-
-  return ans;
 }