diff --git a/arcanist/linter/CheckNonFatalOverAssertInRpc.php b/arcanist/linter/CheckNonFatalOverAssertInRpc.php index 9066324dd..4ab39f60c 100644 --- a/arcanist/linter/CheckNonFatalOverAssertInRpc.php +++ b/arcanist/linter/CheckNonFatalOverAssertInRpc.php @@ -1,64 +1,64 @@ ArcanistLintSeverity::SEVERITY_ERROR, ); } public function getLintNameMap() { return array( self::BAD_ASSERT_IN_RPC => pht('Use CHECK_NONFATAL(condition) over assert(condition) in RPC code.'), ); } public function lintPath($path) { $absPath = Filesystem::resolvePath($path, $this->getProjectRoot()); $fileContent = Filesystem::readFile($absPath); - if (!preg_match_all("/(assert\((.*)\);)/", $fileContent, + if (!preg_match_all("/((A|a)ssert\((.*)\);)/", $fileContent, $matches, PREG_OFFSET_CAPTURE)) { return; } foreach ($matches[1] as $match) { list($cpp, $offset) = $match; $this->raiseLintAtOffset( $offset, self::BAD_ASSERT_IN_RPC, pht(self::RATIONALE_MSG), $cpp, null); } } } diff --git a/src/init.cpp b/src/init.cpp index 7fbd0f41f..09a731759 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1,2893 +1,2893 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) #include #endif #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include