From b2b9cde8cdccfb951ba810ffd421a3379f2a148b Mon Sep 17 00:00:00 2001 From: bloodstalker Date: Fri, 6 Mar 2020 16:05:53 +0330 Subject: coverity fix --- .travis.yml | 6 +++--- cgrep.cpp | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 54bc624..609322f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,12 +14,12 @@ addons: - sudo apt-get install libstdc++-7-dev -y - wget https://apt.llvm.org/llvm.sh - chmod +x llvm.sh - - sudo ./llvm.sh 10 - - sudo apt-get install llvm-10-dev libclang-common-10-dev libclang-10-dev libboost-system-dev libboost-filesystem-dev -y + - sudo ./llvm.sh 9 + - sudo apt-get install llvm-9-dev libclang-common-9-dev libclang-9-dev libboost-system-dev libboost-filesystem-dev -y - git submodule init - git submodule update build_command: - - make CXX=clang-10 LLVM_CONF=llvm-config-10 + - make CXX=clang-9 LLVM_CONF=llvm-config-9 branch_pattern: master matrix: diff --git a/cgrep.cpp b/cgrep.cpp index 1acf4a6..a764ba9 100644 --- a/cgrep.cpp +++ b/cgrep.cpp @@ -158,10 +158,10 @@ static std::string get_line_from_file(SourceManager &SM, std::string mainfile_str = MR.SourceManager->getFilename(SR.getBegin()).str(); mainfile.open(mainfile_str); auto linenumber = MR.SourceManager->getSpellingLineNumber(SR.getBegin()); - auto columnnumber_start = - MR.SourceManager->getSpellingColumnNumber(SR.getBegin()) - 1; - auto columnnumber_end = - MR.SourceManager->getSpellingColumnNumber(SR.getEnd()) - 1; + //auto columnnumber_start = + //MR.SourceManager->getSpellingColumnNumber(SR.getBegin()) - 1; + //auto columnnumber_end = + //MR.SourceManager->getSpellingColumnNumber(SR.getEnd()) - 1; std::string line; unsigned line_nu = 0; @@ -290,8 +290,8 @@ void output_handler(const MatchFinder::MatchResult &MR, SourceRange SR, std::vector listDirs(std::string path) { std::vector dummy; DIR *dir; - struct dirent *ent; if ((dir = opendir(path.c_str())) != nullptr) { + struct dirent *ent; while ((ent = readdir(dir)) != nullptr) { std::cout << "name: " << ent->d_name << "\ttype:" << int(ent->d_type) << "\n"; @@ -393,7 +393,6 @@ public: if (regex_handler(REGEX_PP(CO_REGEX), name)) { ast_type_traits::DynTypedNode DNode = ast_type_traits::DynTypedNode::create(*MD); - NamedDecl const *ND = DNode.get(); auto StartLocation = MD->getLocation(); auto EndLocation = StartLocation.getLocWithOffset(name.size() - 1); auto Range = SourceRange(StartLocation, EndLocation); -- cgit v1.2.3