[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 02/20] scripts/clean-includes: Don't claim duplicate headers f
From: |
Markus Armbruster |
Subject: |
[PATCH v5 02/20] scripts/clean-includes: Don't claim duplicate headers found when not |
Date: |
Mon, 30 Jan 2023 14:21:38 +0100 |
When running with --check-dup-head, the script always claims it "Found
duplicate header file includes." Fix to do it only when it actually
found some.
Fixes: d66253e46ae2 ("scripts/clean-includes: added duplicate #include check")
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
scripts/clean-includes | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/scripts/clean-includes b/scripts/clean-includes
index 86944f27fc..8e8420d785 100755
--- a/scripts/clean-includes
+++ b/scripts/clean-includes
@@ -177,9 +177,8 @@ for f in "$@"; do
done
if [ "$DUPHEAD" = "yes" ] && [ -n "$files" ]; then
- egrep "^[[:space:]]*#[[:space:]]*include" $files | tr -d '[:blank:]' \
- | sort | uniq -c | awk '{if ($1 > 1) print $0}'
- if [ $? -eq 0 ]; then
+ if egrep "^[[:space:]]*#[[:space:]]*include" $files | tr -d '[:blank:]' \
+ | sort | uniq -c | grep -v '^ *1 '; then
echo "Found duplicate header file includes. Please check the above
files manually."
exit 1
fi
--
2.39.0
- [PATCH v5 14/20] riscv: Clean up includes, (continued)
- [PATCH v5 14/20] riscv: Clean up includes, Markus Armbruster, 2023/01/30
- [PATCH v5 04/20] scripts/clean-includes: Improve --git commit message, Markus Armbruster, 2023/01/30
- [PATCH v5 15/20] block: Clean up includes, Markus Armbruster, 2023/01/30
- [PATCH v5 05/20] bsd-user: Clean up includes, Markus Armbruster, 2023/01/30
- [PATCH v5 01/20] scripts/clean-includes: Fully skip / ignore files, Markus Armbruster, 2023/01/30
- [PATCH v5 16/20] accel: Clean up includes, Markus Armbruster, 2023/01/30
- [PATCH v5 07/20] hw/cxl: Clean up includes, Markus Armbruster, 2023/01/30
- [PATCH v5 13/20] target/hexagon: Clean up includes, Markus Armbruster, 2023/01/30
- [PATCH v5 11/20] migration: Clean up includes, Markus Armbruster, 2023/01/30
- [PATCH v5 09/20] hw/tricore: Clean up includes, Markus Armbruster, 2023/01/30
- [PATCH v5 02/20] scripts/clean-includes: Don't claim duplicate headers found when not,
Markus Armbruster <=
- [PATCH v5 17/20] Fix non-first inclusions of qemu/osdep.h, Markus Armbruster, 2023/01/30
- [PATCH v5 03/20] scripts/clean-includes: Skip symbolic links, Markus Armbruster, 2023/01/30
- [PATCH v5 06/20] crypto: Clean up includes, Markus Armbruster, 2023/01/30
- [PATCH v5 12/20] net: Clean up includes, Markus Armbruster, 2023/01/30
- [PATCH v5 10/20] qga: Clean up includes, Markus Armbruster, 2023/01/30
- [PATCH v5 20/20] Drop duplicate #include, Markus Armbruster, 2023/01/30
- [PATCH v5 18/20] Don't include headers already included by qemu/osdep.h, Markus Armbruster, 2023/01/30
- [PATCH v5 19/20] 9p: Drop superfluous include of linux/limits.h, Markus Armbruster, 2023/01/30