misc: create better-packaged static analysis reports

Fix some minor bugs relating to passing CFLAGS to cppcheck, and
package the cppcheck output into nicer looking reports.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/MCONFIG.in b/MCONFIG.in
index d47847ce42ae80c9ed9c1415776055a05f33ea1f..044f256b3aac50f391d2e942d592218a348e4f9c 100644 (file)
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -54,7 +54,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 @ifGNUmake@ CHECK=sparse
 @ifGNUmake@ CHECK_OPTS=-Wsparse-all -Wno-transparent-union -Wno-return-void -Wno-undef -Wno-non-pointer-null
 @ifGNUmake@ CPPCHECK=cppcheck
-@ifGNUmake@ CPPCHECK_OPTS=--force --enable=all
+@ifGNUmake@ CPPCHECK_OPTS=--force --enable=all --quiet
 @ifGNUmake@ ifeq ("$(C)", "2")
 @ifGNUmake@   CHECK_CMD=$(CHECK) $(CHECK_OPTS) -Wbitwise -D__CHECK_ENDIAN__
 @ifGNUmake@   CPPCHECK_CMD=$(CPPCHECK) $(CPPCHECK_OPTS)
@@ -184,7 +184,7 @@ DEP_INSTALL_SYMLINK = $(top_builddir)/util/install-symlink \
 # Run make gcc-wall to do a build with warning messages.
 #
 #
-WFLAGS=                -std=c99 -D_XOPEN_SOURCE=600 -D_GNU_SOURCE \
+WFLAGS=                -std=gnu99 -D_XOPEN_SOURCE=600 -D_GNU_SOURCE \
                        -pedantic $(WFLAGS_EXTRA) \
                        -Wall -W -Wwrite-strings -Wpointer-arith \
                        -Wcast-qual -Wcast-align -Wno-variadic-macros \
@@ -195,11 +195,18 @@ WFLAGS=           -std=c99 -D_XOPEN_SOURCE=600 -D_GNU_SOURCE \
                        -UENABLE_NLS
 
 gcc-wall-new:
-       (make CFLAGS="@CFLAGS@ $(WFLAGS)" > /dev/null) 2>&1 | sed -f $(top_srcdir)/util/gcc-wall-cleanup 
+       ($(MAKE) CFLAGS="@CFLAGS@ $(WFLAGS)" > /dev/null) 2>&1 | sed -f $(top_srcdir)/util/gcc-wall-cleanup
 
 gcc-wall:
-       make clean > /dev/null
-       make gcc-wall-new
+       $(MAKE) clean > /dev/null
+       $(MAKE) gcc-wall-new
+
+static-check:
+       ($(MAKE) C=1 V=1 CFLAGS="@CFLAGS@ $(WFLAGS)") 2>&1 | sed -f $(top_srcdir)/util/static-analysis-cleanup
+
+static-check-all:
+       $(MAKE) clean > /dev/null
+       $(MAKE) static-check
 
 #
 # Installation user and groups

diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in
index 34cdac1a5d6622bd629c5c1ed28bbaea20ade0b4..5097749ab9af69079ea20e80c19e87f6eafc4d35 100644 (file)
--- a/debugfs/Makefile.in
+++ b/debugfs/Makefile.in
@@ -46,7 +46,7 @@ STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBSS) \
        $(E) "  CC $<"
        $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
-       $(Q) $(CPPCHECK_CMD) $<
+       $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
 
 all:: $(PROGS) $(MANPAGES)
 

diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index 5c8ce39db991f840e26573938d8ca882406c889c..5a6883a6380fe8b26e756b6430767215ad851836 100644 (file)
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -40,7 +40,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
        $(E) "  CC $<"
        $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
-       $(Q) $(CPPCHECK_CMD) $<
+       $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 
 #

diff --git a/ext2ed/Makefile.in b/ext2ed/Makefile.in
index f05a562ea159f1e009348f9dc193d3b0f999cf12..0697431ebf7ec6817300214596468d5ad6a6ae0f 100644 (file)
--- a/ext2ed/Makefile.in
+++ b/ext2ed/Makefile.in
@@ -34,7 +34,7 @@ DOCS=   doc/ext2ed-design.pdf doc/user-guide.pdf doc/ext2fs-overview.pdf \
 .c.o:
        $(CC) -c $(ALL_CFLAGS) $< -o $@
        $(CHECK_CMD) $(ALL_CFLAGS) $<
-       $(CPPCHECK_CMD) $<
+       $(CPPCHECK_CMD) $(CPPFLAGS) $<
 
 .SUFFIXES: .sgml .ps .pdf .html
 

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 07700c80beec366a6bff20063f7426666412e37c..db6d7d71876677a30538cb2dc69ecf0aff5c35b1 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -62,7 +62,7 @@ mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
 @ifGNUmake@ CHECK=sparse
 @ifGNUmake@ CHECK_OPTS=-Wsparse-all -Wno-transparent-union -Wno-return-void -Wno-undef -Wno-non-pointer-null
 @ifGNUmake@ CPPCHECK=cppcheck
-@ifGNUmake@ CPPCHECK_OPTS=--force --enable=all
+@ifGNUmake@ CPPCHECK_OPTS=--force --enable=all --quiet --check-config
 @ifGNUmake@ ifeq ("$(C)", "2")
 @ifGNUmake@   CHECK_CMD=$(CHECK) $(CHECK_OPTS) -Wbitwise -D__CHECK_ENDIAN__
 @ifGNUmake@   CPPCHECK_CMD=$(CPPCHECK) $(CPPCHECK_OPTS)
@@ -212,7 +212,7 @@ LTV_AGE=4
        $(E) "  CC $<"
        $(Q) $(COMPILE) $<
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
-       $(Q) $(CPPCHECK_CMD) $<
+       $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
 
 .y.c:
        $(YACC) $(YFLAGS) --output $@ $<

diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in
index f18d4226c45c1c5d70679b2ce69162f1c89160c0..a27b20c1472f808bae9ca33108b87aa8b7ac4dcb 100644 (file)
--- a/lib/blkid/Makefile.in
+++ b/lib/blkid/Makefile.in
@@ -56,7 +56,7 @@ DEPLIBS_BLKID=        $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID)
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
-       $(Q) $(CPPCHECK_CMD) $<
+       $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<

diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in
index f87b16429dbecce7463442addb8a655b3a4f8203..c8925cfd3484bfda0220ee190a6971348059679a 100644 (file)
--- a/lib/e2p/Makefile.in
+++ b/lib/e2p/Makefile.in
@@ -56,7 +56,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
-       $(Q) $(CPPCHECK_CMD) $<
+       $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<

diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in
index 9fdf988035721f03ca2c2a2932621a5cf5e4bb9e..f9a79c0713261c2f1a3b914c57e41428343ff2fb 100644 (file)
--- a/lib/et/Makefile.in
+++ b/lib/et/Makefile.in
@@ -44,7 +44,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
-       $(Q) $(CPPCHECK_CMD) $<
+       $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<

diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index 135272a480ae59bc1f873cf017f999bae9435b0d..97fd066b3a5f7ae56dbc3b14e4a72102f2f22d18 100644 (file)
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -205,7 +205,7 @@ all:: ext2fs.pc
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
-       $(Q) $(CPPCHECK_CMD) $<
+       $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<

diff --git a/lib/quota/Makefile.in b/lib/quota/Makefile.in
index 6de70c759a9d8bc0335d64fb7280175e1277ed35..6c3318c82ac7b55d94ccdd7a2239f0cc88d6ac47 100644 (file)
--- a/lib/quota/Makefile.in
+++ b/lib/quota/Makefile.in
@@ -48,7 +48,7 @@ LIBDIR= quota
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
-       $(Q) $(CPPCHECK_CMD) $<
+       $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 #ELF_CMT#      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<

diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in
index 14597c9fcbd40c4e3401fe5f387d81b219d4aac9..0647f6c163418ba852eeb0d809d95fe28692afe8 100644 (file)
--- a/lib/ss/Makefile.in
+++ b/lib/ss/Makefile.in
@@ -35,7 +35,7 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $<
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
-       $(Q) $(CPPCHECK_CMD) $<
+       $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $<

diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index 62a8f706fc02562a41c402e2e97e77318792e66e..f22ab26b5a55a32cff55411908211b3b3a54230d 100644 (file)
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -63,7 +63,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
-       $(Q) $(CPPCHECK_CMD) $<
+       $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 @CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<

diff --git a/misc/Makefile.in b/misc/Makefile.in
index 18a8a2fc49d8baf3d9ec505f4f828b98b6d9b3c6..7bd9b5f3a3c20e161003c6979312ccfdc5fce3ae 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -103,7 +103,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
        $(E) "  CC $<"
        $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
-       $(Q) $(CPPCHECK_CMD) $<
+       $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 
 all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \

diff --git a/resize/Makefile.in b/resize/Makefile.in
index 16f2a957689863a95b98b086f580a5f505b8ee27..201e2683beab0973a479f8e98488527a8f8800af 100644 (file)
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -39,7 +39,7 @@ DEPSTATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR)
        $(E) "  CC $<"
        $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
-       $(Q) $(CPPCHECK_CMD) $<
+       $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
 
 all:: $(PROGS) $(TEST_PROGS) $(MANPAGES) 
 

diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in
index 6c986e420f7d561167609c0c717d211dde3aa8cf..22d941799ae6990d07bcef070b45b4082ba353aa 100644 (file)
--- a/tests/progs/Makefile.in
+++ b/tests/progs/Makefile.in
@@ -28,7 +28,7 @@ DEPLIBS= $(LIBEXT2FS) $(DEPLIBSS) $(DEPLIBCOM_ERR)
        $(E) "  CC $<"
        $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
-       $(Q) $(CPPCHECK_CMD) $<
+       $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
 
 all:: $(PROGS)
 

diff --git a/util/Makefile.in b/util/Makefile.in
index 2375e1786d12761f5aac4ba8a3ad1dc7df6ac1f9..5171c1ccf706218f8427122029f77085cca2047b 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -17,7 +17,7 @@ SRCS = $(srcdir)/subst.c
        $(E) "  CC $<"
        $(Q) $(BUILD_CC) -c $(BUILD_CFLAGS) $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
-       $(Q) $(CPPCHECK_CMD) $<
+       $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
 
 PROGS=         subst symlinks
 

diff --git a/util/static-analysis-cleanup b/util/static-analysis-cleanup
new file mode 100644 (file)
index 0000000..6749259
--- /dev/null
+++ b/util/static-analysis-cleanup
@@ -0,0 +1,20 @@
+#!/bin/sed -f
+#
+# This script filters out gcc-wall crud that we're not interested in seeing.
+#
+/^cc /d
+/^kcc /d
+/^gcc /d
+/does not support `long long'/d
+/forbids long long integer constants/d
+/does not support the `ll' length modifier/d
+/does not support the `ll' printf length modifier/d
+/ANSI C forbids long long integer constants/d
+/traditional C rejects string concatenation/d
+/integer constant is unsigned in ANSI C, signed with -traditional/d
+/warning: missing initializer/d
+/warning: (near initialization for/d
+/^[    ]*from/d
+/unused parameter/d
+/e2_types.h" not found.$/d
+/e2_bitops.h" not found.$/d