[clang-tools-extra] r324084 - [clang-tidy] Kill marco. No functionality change.

[Benjamin Kramer via cfe-commits]

Author: d0k
Date: Fri Feb  2 05:39:07 2018
New Revision: 324084

URL: http://llvm.org/viewvc/llvm-project?rev=324084&view=rev
Log:
[clang-tidy] Kill marco. No functionality change.

Modified:
    clang-tools-extra/trunk/clang-tidy/android/CloexecAccept4Check.cpp
    clang-tools-extra/trunk/clang-tidy/android/CloexecEpollCreate1Check.cpp
    clang-tools-extra/trunk/clang-tidy/android/CloexecInotifyInit1Check.cpp
    clang-tools-extra/trunk/clang-tidy/android/CloexecOpenCheck.cpp
    clang-tools-extra/trunk/clang-tidy/android/CloexecSocketCheck.cpp
    clang-tools-extra/trunk/clang-tidy/modernize/UseNullptrCheck.cpp
    clang-tools-extra/trunk/clang-tidy/utils/ASTUtils.cpp

Modified: clang-tools-extra/trunk/clang-tidy/android/CloexecAccept4Check.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/android/CloexecAccept4Check.cpp?rev=324084&r1=324083&r2=324084&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/android/CloexecAccept4Check.cpp (original)
+++ clang-tools-extra/trunk/clang-tidy/android/CloexecAccept4Check.cpp Fri Feb  2 05:39:07 2018
@@ -32,7 +32,7 @@ void CloexecAccept4Check::registerMatche
 }
 
 void CloexecAccept4Check::check(const MatchFinder::MatchResult &Result) {
-  insertMacroFlag(Result, /*MarcoFlag=*/"SOCK_CLOEXEC", /*ArgPos=*/3);
+  insertMacroFlag(Result, /*MacroFlag=*/"SOCK_CLOEXEC", /*ArgPos=*/3);
 }
 
 } // namespace android

Modified: clang-tools-extra/trunk/clang-tidy/android/CloexecEpollCreate1Check.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/android/CloexecEpollCreate1Check.cpp?rev=324084&r1=324083&r2=324084&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/android/CloexecEpollCreate1Check.cpp (original)
+++ clang-tools-extra/trunk/clang-tidy/android/CloexecEpollCreate1Check.cpp Fri Feb  2 05:39:07 2018
@@ -25,7 +25,7 @@ void CloexecEpollCreate1Check::registerM
 }
 
 void CloexecEpollCreate1Check::check(const MatchFinder::MatchResult &Result) {
-  insertMacroFlag(Result, /*MarcoFlag=*/"EPOLL_CLOEXEC", /*ArgPos=*/0);
+  insertMacroFlag(Result, /*MacroFlag=*/"EPOLL_CLOEXEC", /*ArgPos=*/0);
 }
 
 } // namespace android

Modified: clang-tools-extra/trunk/clang-tidy/android/CloexecInotifyInit1Check.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/android/CloexecInotifyInit1Check.cpp?rev=324084&r1=324083&r2=324084&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/android/CloexecInotifyInit1Check.cpp (original)
+++ clang-tools-extra/trunk/clang-tidy/android/CloexecInotifyInit1Check.cpp Fri Feb  2 05:39:07 2018
@@ -25,7 +25,7 @@ void CloexecInotifyInit1Check::registerM
 }
 
 void CloexecInotifyInit1Check::check(const MatchFinder::MatchResult &Result) {
-  insertMacroFlag(Result, /*MarcoFlag=*/"IN_CLOEXEC", /*ArgPos=*/0);
+  insertMacroFlag(Result, /*MacroFlag=*/"IN_CLOEXEC", /*ArgPos=*/0);
 }
 
 } // namespace android

Modified: clang-tools-extra/trunk/clang-tidy/android/CloexecOpenCheck.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/android/CloexecOpenCheck.cpp?rev=324084&r1=324083&r2=324084&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/android/CloexecOpenCheck.cpp (original)
+++ clang-tools-extra/trunk/clang-tidy/android/CloexecOpenCheck.cpp Fri Feb  2 05:39:07 2018
@@ -36,7 +36,7 @@ void CloexecOpenCheck::check(const Match
   const auto *FD = Result.Nodes.getNodeAs<FunctionDecl>(FuncDeclBindingStr);
   assert(FD->param_size() > 1);
   int ArgPos = (FD->param_size() > 2) ? 2 : 1;
-  insertMacroFlag(Result, /*MarcoFlag=*/"O_CLOEXEC", ArgPos);
+  insertMacroFlag(Result, /*MacroFlag=*/"O_CLOEXEC", ArgPos);
 }
 
 } // namespace android

Modified: clang-tools-extra/trunk/clang-tidy/android/CloexecSocketCheck.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/android/CloexecSocketCheck.cpp?rev=324084&r1=324083&r2=324084&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/android/CloexecSocketCheck.cpp (original)
+++ clang-tools-extra/trunk/clang-tidy/android/CloexecSocketCheck.cpp Fri Feb  2 05:39:07 2018
@@ -27,7 +27,7 @@ void CloexecSocketCheck::registerMatcher
 }
 
 void CloexecSocketCheck::check(const MatchFinder::MatchResult &Result) {
-  insertMacroFlag(Result, /*MarcoFlag=*/"SOCK_CLOEXEC", /*ArgPos=*/1);
+  insertMacroFlag(Result, /*MacroFlag=*/"SOCK_CLOEXEC", /*ArgPos=*/1);
 }
 
 } // namespace android

Modified: clang-tools-extra/trunk/clang-tidy/modernize/UseNullptrCheck.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/modernize/UseNullptrCheck.cpp?rev=324084&r1=324083&r2=324084&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/modernize/UseNullptrCheck.cpp (original)
+++ clang-tools-extra/trunk/clang-tidy/modernize/UseNullptrCheck.cpp Fri Feb  2 05:39:07 2018
@@ -225,10 +225,10 @@ public:
     if (SM.isMacroArgExpansion(StartLoc) && SM.isMacroArgExpansion(EndLoc)) {
       SourceLocation FileLocStart = SM.getFileLoc(StartLoc),
                      FileLocEnd = SM.getFileLoc(EndLoc);
-      SourceLocation ImmediateMarcoArgLoc, MacroLoc;
+      SourceLocation ImmediateMacroArgLoc, MacroLoc;
       // Skip NULL macros used in macro.
-      if (!getMacroAndArgLocations(StartLoc, ImmediateMarcoArgLoc, MacroLoc) ||
-          ImmediateMarcoArgLoc != FileLocStart)
+      if (!getMacroAndArgLocations(StartLoc, ImmediateMacroArgLoc, MacroLoc) ||
+          ImmediateMacroArgLoc != FileLocStart)
         return skipSubTree();
 
       if (isReplaceableRange(FileLocStart, FileLocEnd, SM) &&

Modified: clang-tools-extra/trunk/clang-tidy/utils/ASTUtils.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/utils/ASTUtils.cpp?rev=324084&r1=324083&r2=324084&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/utils/ASTUtils.cpp (original)
+++ clang-tools-extra/trunk/clang-tidy/utils/ASTUtils.cpp Fri Feb  2 05:39:07 2018
@@ -49,7 +49,7 @@ bool exprHasBitFlagWithSpelling(const Ex
         !SM.isMacroArgExpansion(Flags->getLocStart()))
       return false;
 
-    // Get the marco name.
+    // Get the macro name.
     auto MacroName = Lexer::getSourceText(
         CharSourceRange::getTokenRange(Flags->getSourceRange()), SM, LangOpts);