From d4881b6bc3e300bc4fea508d2af1c05dd6755dfa Mon Sep 17 00:00:00 2001 From: netblue30 Date: Sun, 17 Aug 2025 17:17:42 -0400 Subject: [PATCH] cppcheck cleanup --- Makefile | 2 +- src/tools/mkcoverit.sh | 48 ------------------------------------------ 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100755 src/tools/mkcoverit.sh diff --git a/Makefile b/Makefile index 5c8dfb5a9..b07552f79 100644 --- a/Makefile +++ b/Makefile @@ -376,7 +376,7 @@ extras: all .PHONY: cppcheck cppcheck: - $(CPPCHECK) --force --error-exitcode=1 --enable=warning,performance --check-level=exhaustive \ + $(CPPCHECK) --force --error-exitcode=1 --enable=warning,performance --max-ctu-depth=40 \ -i src/firejail/checkcfg.c -i src/firejail/main.c . .PHONY: scan-build diff --git a/src/tools/mkcoverit.sh b/src/tools/mkcoverit.sh deleted file mode 100755 index b67f3a9a4..000000000 --- a/src/tools/mkcoverit.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -# This file is part of Firejail project -# Copyright (C) 2014-2025 Firejail Authors -# License GPL v2 - -# unpack firejail archive -ARCFIREJAIL=`ls *.tar.xz| grep firejail` -if [ "$?" -eq 0 ]; -then - echo "preparing $ARCFIREJAIL" - DIRFIREJAIL=`basename $ARCFIREJAIL .tar.xz` - rm -fr $DIRFIREJAIL - tar -xJvf $ARCFIREJAIL - cd $DIRFIREJAIL - ./configure --prefix=/usr - cd .. -else - echo "Error: firejail source archive missing" - exit 1 -fi - - -# unpack firetools archive -ARCFIRETOOLS=`ls *.tar.bz2 | grep firetools` -if [ "$?" -eq 0 ]; -then - echo "preparing $ARCFIRETOOLS" - DIRFIRETOOLS=`basename $ARCFIRETOOLS .tar.bz2` - rm -fr $DIRFIRETOOLS - tar -xjvf $ARCFIRETOOLS - cd $DIRFIRETOOLS - pwd - ./configure --prefix=/usr - cd .. - -else - echo "Error: firetools source archive missing" - exit 1 -fi - -# move firetools in firejail source tree -mkdir -p $DIRFIREJAIL/extras -mv $DIRFIRETOOLS $DIRFIREJAIL/extras/firetools - -# build -cd $DIRFIREJAIL -cov-build --dir cov-int make -j "$(nproc)" extras -tar czvf myproject.tgz cov-int