format-code: Look for clang-format-6.0 as well
Otherwise we break the CI infrastructure. Also, fix up some errors that
v6.0 catches that v5.0 doesn't.
Change-Id: Idcbb102ebfda500f874a3e9f13d8ba2b72b6230d
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
diff --git a/format-code.sh b/format-code.sh
index a824ad1..bd5659c 100755
--- a/format-code.sh
+++ b/format-code.sh
@@ -6,7 +6,14 @@
[ -f .clang-format ] && rm .clang-format
-CLANG_FORMAT="$(which clang-format-5.0)"
+for cf in clang-format-6.0 clang-format-5.0
+do
+ CLANG_FORMAT="$(which ${cf})"
+ if [ -n "${CLANG_FORMAT}" ]
+ then
+ break;
+ fi
+done
# phosphor-mboxd is a fork of mboxbridge, the reference mbox daemon
# implementation. mboxbridge is C written with the style of the Linux kernel.