Merge pull request #230 from bigbrett/scan-build-fixes

Scan-build improvements

Author: miyazakh

Makefile

@@ -44,10 +44,7 @@ scan:
 	@rm -rf $(SCAN_DIR)
 	@mkdir -p $(SCAN_DIR)
 	@make clean
-	-@make SCAN=1 -C test scan
-	-@make SCAN=1 -C benchmark scan
-	-@make NOCRYPTO=1 SCAN=1 -C tools/whnvmtool scan
-	-@make NOCRYPTO=1 SCAN=1 -C examples
+	-@make -j SCAN=1 -C test scan
 	@$(MAKE) scan_result_check
 
 clean:

benchmark/Makefile

@@ -172,7 +172,9 @@ analyze: $(OBJS_ASM) $(OBJS_C)
 scan:$(BUILD_DIR)
 	@echo "Running scan-build static analysis"
 	@mkdir -p $(WOLFHSM_DIR)/scan_out/
-	@scan-build --status-bugs $(MAKE) analyze 2> $(WOLFHSM_DIR)/scan_out/$(SCAN_LOG)
+	@scan-build --exclude $(WOLFSSL_DIR)/wolfcrypt \
+	            --exclude $(WOLFSSL_DIR)/src \
+	            --status-bugs $(MAKE) analyze 2> $(WOLFHSM_DIR)/scan_out/$(SCAN_LOG)
 
 $(BUILD_DIR):
 	$(CMD_ECHO) mkdir -p $(BUILD_DIR)

examples/posix/wh_posix_client/Makefile

@@ -186,7 +186,9 @@ analyze: $(OBJS_ASM) $(OBJS_C)
 scan:$(BUILD_DIR)
 	@echo "Running scan-build static analysis"
 	@mkdir -p $(WOLFHSM_DIR)/scan_out/
-	@scan-build --status-bugs $(MAKE) analyze 2> $(WOLFHSM_DIR)/scan_out/$(SCAN_LOG)
+	@scan-build --exclude $(WOLFSSL_DIR)/wolfcrypt \
+	            --exclude $(WOLFSSL_DIR)/src \
+	            --status-bugs $(MAKE) analyze 2> $(WOLFHSM_DIR)/scan_out/$(SCAN_LOG)
 
 clean:
 	@echo "Cleaning build files"

examples/posix/wh_posix_server/Makefile

@@ -139,7 +139,9 @@ analyze: $(OBJS_ASM) $(OBJS_C)
 scan:$(BUILD_DIR)
 	@echo "Running scan-build static analysis"
 	@mkdir -p $(WOLFHSM_DIR)/scan_out/
-	@scan-build --status-bugs $(MAKE) analyze 2> $(WOLFHSM_DIR)/scan_out/$(SCAN_LOG)
+	@scan-build --exclude $(WOLFSSL_DIR)/wolfcrypt \
+	            --exclude $(WOLFSSL_DIR)/src \
+	            --status-bugs $(MAKE) analyze 2> $(WOLFHSM_DIR)/scan_out/$(SCAN_LOG)
 
 $(BUILD_DIR):
 	$(CMD_ECHO) mkdir -p $(BUILD_DIR)

test/Makefile

@@ -221,7 +221,9 @@ analyze:$(OBJS_ASM) $(OBJS_C)
 scan:$(BUILD_DIR)
 	@echo "Running scan-build static analysis"
 	@mkdir -p $(WOLFHSM_DIR)/scan_out/
-	@scan-build --status-bugs $(MAKE) analyze 2> $(WOLFHSM_DIR)/scan_out/$(SCAN_LOG)
+	@scan-build --exclude $(WOLFSSL_DIR)/wolfcrypt \
+	            --exclude $(WOLFSSL_DIR)/src \
+	            --status-bugs $(MAKE) analyze 2> $(WOLFHSM_DIR)/scan_out/$(SCAN_LOG)
 
 $(BUILD_DIR):
 	$(CMD_ECHO) mkdir -p $(BUILD_DIR)

tools/whnvmtool/Makefile

@@ -104,7 +104,9 @@ analyze: $(SRC)
 scan:
 	@echo "Running scan-build static analysis"
 	@mkdir -p $(WOLFHSM_DIR)/scan_out/
-	@scan-build --status-bugs $(MAKE) analyze 2> $(WOLFHSM_DIR)/scan_out/$(SCAN_LOG)
+	@scan-build --exclude $(WOLFSSL_DIR)/wolfcrypt \
+	            --exclude $(WOLFSSL_DIR)/src \
+	            --status-bugs $(MAKE) analyze 2> $(WOLFHSM_DIR)/scan_out/$(SCAN_LOG)
 
 clean: clean-test
 	rm -f whNvmImage.bin whNvmImage.hex