Upstream: cppcheck fixes

openzfs · Jun 10, 2021 · 9d4233f · 9d4233f
1 parent 73e6f4d
commit 9d4233f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/cmd/Makefile.am b/cmd/Makefile.am
@@ -24,3 +24,9 @@ endif
 if BUILD_MACOS
 SUBDIRS += zed os
 endif
+
+PHONY = cppcheck
+cppcheck: $(CPPCHECKDIRS)
+	set -e ; for dir in $(CPPCHECKDIRS) ; do \
+		$(MAKE) -C $$dir cppcheck ; \
+	done
diff --git a/include/sys/zio.h b/include/sys/zio.h
@@ -219,7 +219,7 @@ enum zio_flag {
 	ZIO_FLAG_NOPWRITE	= 1 << 28,
 	ZIO_FLAG_REEXECUTED	= 1 << 29,
 	ZIO_FLAG_DELEGATED	= 1 << 30,
-	ZIO_FLAG_FASTWRITE	= 1 << 31,
+	ZIO_FLAG_FASTWRITE	= 1ULL << 31,
 };
 
 #define	ZIO_FLAG_MUSTSUCCEED		0

diff --git a/lib/libicp/Makefile.am b/lib/libicp/Makefile.am
@@ -83,3 +83,4 @@ nodist_libicp_la_SOURCES = \
 	$(KERNEL_C) \
 	$(KERNEL_ASM)
 
+include $(top_srcdir)/config/CppCheck.am
diff --git a/module/Makefile.in b/module/Makefile.in
@@ -15,7 +15,7 @@ check:
 	clean clean-Linux clean-FreeBSD \
 	modules_install modules_install-Linux modules_install-FreeBSD \
 	modules_uninstall modules_uninstall-Linux modules_uninstall-FreeBSD \
-	cppcheck cppcheck-Linux cppcheck-FreeBSD
+	cppcheck cppcheck-Linux cppcheck-FreeBSD cppcheck-macOS
 
 # For FreeBSD, use debug options from ./configure if not overridden.
 export WITH_DEBUG ?= @WITH_DEBUG@
@@ -144,6 +144,9 @@ cppcheck-Linux:
 cppcheck-FreeBSD:
 	@true
 
+cppcheck-macOS:
+	@true
+
 cppcheck: cppcheck-@ac_system@
 
 distdir:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -83,3 +83,4 @@ nodist_libicp_la_SOURCES = \
		$(KERNEL_C) \
		$(KERNEL_ASM)

		include $(top_srcdir)/config/CppCheck.am