Change some more 0 literals into nullptr.

lanurmi · lanurmi · commit 70a67eaf853f · 2014-02-16T13:38:50.000+02:00
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
@@ -79,7 +79,7 @@ void CheckBufferOverrun::arrayIndexOutOfBoundsError(const Token *tok, const Arra
         errmsg << " out of bounds.";
     }
 
-    const Token *condition = 0;
+    const Token *condition = nullptr;
     for (unsigned int i = 0; i < index.size(); ++i) {
         if (condition == nullptr)
             condition = index[i].condition;
@@ -428,7 +428,7 @@ static bool for3(const Token * const tok,
                  std::string &max_value,
                  const bool maxMinFlipped)
 {
-    assert(tok != 0);
+    assert(tok != nullptr);
     if (Token::Match(tok, "%varid%  = %num% + %varid% )", varid)) {
         if (!for_maxvalue(tok->tokAt(2), min_value, max_value))
             return false;
@@ -1498,7 +1498,7 @@ void CheckBufferOverrun::checkGlobalAndLocalVariable()
             std::string type;
 
             // varid : The variable id for the array
-            const Variable *var = 0;
+            const Variable *var = nullptr;
 
             // nextTok : number of tokens used in variable declaration - used to skip to next statement.
             int nextTok = 0;
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -917,8 +917,8 @@ void CheckClass::checkMemset()
                     continue;
 
 
-                const Token *typeTok = 0;
-                const Scope *type = 0;
+                const Token *typeTok = nullptr;
+                const Scope *type = nullptr;
                 if (Token::Match(arg3, "sizeof ( %type% ) )"))
                     typeTok = arg3->tokAt(2);
                 else if (Token::Match(arg3, "sizeof ( %type% :: %type% ) )"))
@@ -1252,7 +1252,7 @@ bool CheckClass::hasAllocation(const Function *func, const Scope* scope)
             return true;
 
         // check for deallocating memory
-        const Token *var = 0;
+        const Token *var = nullptr;
         if (Token::Match(tok, "free ( %var%"))
             var = tok->tokAt(2);
         else if (Token::Match(tok, "delete [ ] %var%"))
@@ -1395,7 +1395,7 @@ void CheckClass::virtualDestructor()
 
                 // Find the destructor declaration for the base class.
                 const Function *base_destructor = derivedFromScope->getDestructor();
-                const Token *base = 0;
+                const Token *base = nullptr;
                 if (base_destructor)
                     base = base_destructor->token;
 
diff --git a/lib/checkexceptionsafety.cpp b/lib/checkexceptionsafety.cpp
@@ -98,7 +98,7 @@ void CheckExceptionSafety::deallocThrow()
             const unsigned int varid(tok->varId());
 
             // Token where throw occurs
-            const Token *ThrowToken = 0;
+            const Token *ThrowToken = nullptr;
 
             // is there a throw after the deallocation?
             const Token* const end2 = tok->scope()->classEnd;
diff --git a/lib/checkio.cpp b/lib/checkio.cpp
@@ -318,7 +318,7 @@ void CheckIO::invalidScanf()
     for (std::size_t j = 0; j < functions; ++j) {
         const Scope * scope = symbolDatabase->functionScopes[j];
         for (const Token *tok = scope->classStart->next(); tok != scope->classEnd; tok = tok->next()) {
-            const Token *formatToken = 0;
+            const Token *formatToken = nullptr;
             if (Token::Match(tok, "scanf|vscanf ( %str% ,"))
                 formatToken = tok->tokAt(2);
             else if (Token::Match(tok, "sscanf|vsscanf|fscanf|vfscanf (")) {
@@ -424,7 +424,7 @@ static bool findFormat(unsigned int arg, const Token *firstArg,
                   argTok->variable()->dimensionKnown(0) &&
                   argTok->variable()->dimension(0) != 0)))) {
         *formatArgTok = argTok->nextArgument();
-        *formatStringTok = 0;
+        *formatStringTok = nullptr;
         if (argTok->variable()) {
             const Token *varTok = argTok->variable()->nameToken();
             if (Token::Match(varTok, "%var% ; %var% = %str% ;") &&
@@ -1330,7 +1330,7 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * tok, const Settings *settings)
                 tok = tok->tokAt(2);
             if (!tok || !(tok->type() == Token::eVariable || tok->type() == Token::eFunction))
                 return;
-            const Token *varTok = 0;
+            const Token *varTok = nullptr;
             const Token *tok1 = tok->next();
             for (; tok1; tok1 = tok1->next()) {
                 if (tok1->str() == "," || tok1->str() == ")") {
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
@@ -629,7 +629,7 @@ const char * CheckMemoryLeakInFunction::call_func(const Token *tok, std::list<co
 
         Token *ftok = getcode(func->functionScope->classStart->next(), callstack, 0, alloctype, dealloctype, false, 1);
         simplifycode(ftok);
-        const char *ret = 0;
+        const char *ret = nullptr;
         if (Token::simpleMatch(ftok, "; alloc ; }"))
             ret = "alloc";
         else if (Token::simpleMatch(ftok, "; dealloc ; }"))
@@ -688,7 +688,7 @@ const char * CheckMemoryLeakInFunction::call_func(const Token *tok, std::list<co
             while (func_ && func_->str() == ";")
                 func_ = func_->next();
 
-            const char *ret = 0;
+            const char *ret = nullptr;
             /** @todo handle "goto" */
             if (Token::findsimplematch(func_, "dealloc"))
                 ret = "dealloc";
@@ -782,7 +782,7 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
                 ;
 
             else {
-                const Token *skipToToken = 0;
+                const Token *skipToToken = nullptr;
 
                 // scan statement for interesting keywords / varid
                 for (tok2 = tok->next(); tok2; tok2 = tok2->next()) {
diff --git a/lib/checknullpointer.cpp b/lib/checknullpointer.cpp
@@ -629,8 +629,8 @@ void CheckNullPointer::nullPointerByCheckAndDeRef()
             continue;
 
         // vartok : token for the variable
-        const Token *vartok = 0;
-        const Token *checkConditionStart = 0;
+        const Token *vartok = nullptr;
+        const Token *checkConditionStart = nullptr;
         if (Token::Match(tok, "( ! %var% )|&&")) {
             vartok = tok->tokAt(2);
             checkConditionStart = vartok->next();
@@ -892,7 +892,7 @@ void CheckNullPointer::nullConstantDereference()
                 }
             }
 
-            const Variable *ovar = 0;
+            const Variable *ovar = nullptr;
             if (Token::Match(tok, "0 ==|!= %var% !!."))
                 ovar = tok->tokAt(2)->variable();
             else if (Token::Match(tok, "%var% ==|!= 0"))
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -514,7 +514,7 @@ void CheckOther::invalidPointerCast()
                 continue;
 
             // Find casted variable
-            const Variable *var = 0;
+            const Variable *var = nullptr;
             bool allocation = false;
             bool ref = false;
             if (Token::Match(nextTok, "new %type%"))
diff --git a/lib/checksizeof.cpp b/lib/checksizeof.cpp
@@ -113,7 +113,7 @@ void CheckSizeof::checkSizeofForPointerSize()
         for (const Token* tok = scope->classStart; tok != scope->classEnd; tok = tok->next()) {
             const Token *tokVar;
             const Token *variable;
-            const Token *variable2 = 0;
+            const Token *variable2 = nullptr;
 
             // Find any function that may use sizeof on a pointer
             // Once leaving those tests, it is mandatory to have:
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
@@ -655,7 +655,7 @@ void CheckStl::pushback()
                     if (varId == 0)
                         continue;
 
-                    const Token *pushbackTok = 0;
+                    const Token *pushbackTok = nullptr;
 
                     // Count { and } for tok3
                     const Token *tok3 = tok2->tokAt(20);
@@ -1077,7 +1077,7 @@ void CheckStl::missingComparison()
                 break;
             }
 
-            const Token *incrementToken = 0;
+            const Token *incrementToken = nullptr;
 
             // Parse loop..
             for (const Token *tok3 = i->classStart; tok3 != i->classEnd; tok3 = tok3->next()) {
diff --git a/lib/checkunusedfunctions.cpp b/lib/checkunusedfunctions.cpp
@@ -51,7 +51,7 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const char Fi
         if (tok->previous() && tok->previous()->str() == ">")
             continue;
 
-        const Token *funcname = 0;
+        const Token *funcname = nullptr;
 
         if (Token::Match(tok, "%type% %var% ("))
             funcname = tok->next();
@@ -188,7 +188,7 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const char Fi
         }
 
 
-        const Token *funcname = 0;
+        const Token *funcname = nullptr;
 
         if (Token::Match(tok->next(), "%var% (")) {
             funcname = tok->next();
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -40,7 +40,7 @@ class Variables {
     /** Store information about variable usage */
     class VariableUsage {
     public:
-        VariableUsage(const Variable *var = 0,
+        VariableUsage(const Variable *var = nullptr,
                       VariableType type = standard,
                       bool read = false,
                       bool write = false,
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -449,7 +449,7 @@ void CppCheck::executeRules(const std::string &tokenlist, const Tokenizer &token
         if (rule.pattern.empty() || rule.id.empty() || rule.severity.empty() || rule.tokenlist != tokenlist)
             continue;
 
-        const char *error = 0;
+        const char *error = nullptr;
         int erroffset = 0;
         pcre *re = pcre_compile(rule.pattern.c_str(),0,&error,&erroffset,nullptr);
         if (!re) {
diff --git a/lib/preprocessor.h b/lib/preprocessor.h
@@ -54,7 +54,7 @@ class CPPCHECKLIB Preprocessor {
     /** character that is inserted in expanded macros */
     static char macroChar;
 
-    Preprocessor(Settings *settings = 0, ErrorLogger *errorLogger = 0);
+    Preprocessor(Settings *settings = nullptr, ErrorLogger *errorLogger = nullptr);
 
     static bool missingIncludeFlag;
 
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -310,8 +310,8 @@ SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *setti
 
             // check if in class or structure
             else if (scope->type == Scope::eClass || scope->type == Scope::eStruct) {
-                const Token *funcStart = 0;
-                const Token *argStart = 0;
+                const Token *funcStart = nullptr;
+                const Token *argStart = nullptr;
 
                 // What section are we in..
                 if (tok->str() == "private:")
@@ -558,8 +558,8 @@ SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *setti
                     scope->definedType->friendList.push_back(friendInfo);
                 }
             } else if (scope->type == Scope::eNamespace || scope->type == Scope::eGlobal) {
-                const Token *funcStart = 0;
-                const Token *argStart = 0;
+                const Token *funcStart = nullptr;
+                const Token *argStart = nullptr;
 
                 // function?
                 if (isFunction(tok, scope, &funcStart, &argStart)) {
@@ -2723,7 +2723,7 @@ bool SymbolDatabase::isCPP() const
 
 const Scope *SymbolDatabase::findScope(const Token *tok, const Scope *startScope) const
 {
-    const Scope *scope = 0;
+    const Scope *scope = nullptr;
     // absolute path
     if (tok->str() == "::") {
         tok = tok->next();
diff --git a/lib/token.cpp b/lib/token.cpp
@@ -846,7 +846,7 @@ Token* Token::nextArgument() const
 
 const Token * Token::findClosingBracket() const
 {
-    const Token *closing = 0;
+    const Token *closing = nullptr;
 
     if (_str == "<") {
         unsigned int depth = 0;
diff --git a/lib/token.h b/lib/token.h
@@ -382,7 +382,7 @@ class CPPCHECKLIB Token {
      * @param title Title for the printout or use default parameter or 0
      * for no title.
      */
-    void printOut(const char *title = 0) const;
+    void printOut(const char *title = nullptr) const;
 
     /**
      * For debugging purposes, prints token and all tokens
@@ -591,7 +591,7 @@ class CPPCHECKLIB Token {
     }
 
     const ValueFlow::Value * getMaxValue(bool condition) const {
-        const ValueFlow::Value *ret = 0;
+        const ValueFlow::Value *ret = nullptr;
         std::list<ValueFlow::Value>::const_iterator it;
         for (it = values.begin(); it != values.end(); ++it) {
             if ((!ret || it->intvalue > ret->intvalue) &&
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
diff --git a/lib/tokenize.h b/lib/tokenize.h
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
