Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aabca6c0 authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Todd Kennedy
Browse files

idmap2: fix static checks 

Fix two errors detected by static-checks.sh:

  - bpfmt: remove -s flag (sort arrays) since it makes no sense to order
    clang-tidy flags alphabetically: flags must be passed to clang-tidy
    in the order specified to make sense

  - cpplint: allow NOLINT(cert-dcl50-cpp)

Test: cmds/idmap2/static-checks.sh
Change-Id: I6677f8e7504551746edae458acd523e643044c7e
parent 74d69971

cmds/idmap2/static-checks.sh

+3 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ function _clang_format() 


function _bpfmt()

{

    local output="$(bpfmt -s -d $bp_files)"

    local output="$(bpfmt -d $bp_files)"

    if [[ "$output" ]]; then

        echo "$output"

        return 1
@@ -72,6 +72,7 @@ function _cpplint() 
    local cpplint="${ANDROID_BUILD_TOP}/tools/repohooks/tools/cpplint.py"

    local output="$($cpplint --quiet $cpp_files 2>&1 >/dev/null | grep -v \

        -e 'Found C system header after C++ system header.' \

        -e 'Unknown NOLINT error category: cert-dcl50-cpp' \

        -e 'Unknown NOLINT error category: misc-non-private-member-variables-in-classes' \

    )"

    if [[ "$output" ]]; then
@@ -115,7 +116,7 @@ if [[ $opt_mode == "check" ]]; then 
    exit $errors

elif [[ $opt_mode == "fix" ]]; then

    clang-format -style=file -i $cpp_files

    bpfmt -s -w $bp_files

    bpfmt -w $bp_files

    exit 0

elif [[ $opt_mode == "help" ]]; then

    echo "Run static analysis tools such as clang-format and cpplint on the idmap2"