Commit f60362e1 authored by Franziskus Kiefer's avatar Franziskus Kiefer

Bug 1118245 - use blacklist or clang-format instead of white list, r=ttaubert

Differential Revision: https://nss-review.dev.mozaws.net/D312

--HG--
extra : amend_source : 2ae830cd551252e9309aec3ef30a0c74fd7a5e18
parent 39f4bc10
......@@ -2,52 +2,51 @@
source $(dirname "$0")/tools.sh
set +x
# Apply clang-format on the provided folder and verify that this doesn't change any file.
# If any file differs after formatting, the script eventually exits with 1.
# Any differences between formatted and unformatted files is printed to stdout to give a hint what's wrong.
# Includes a default set of directories.
# Includes a default set of directories NOT to clang-format on.
blacklist=(
"./automation" \
"./coreconf" \
"./doc" \
"./pkg" \
"./tests" \
"./lib/libpkix" \
"./lib/zlib" \
"./lib/sqlite" \
"./gtests/google_test" \
"./.hg" \
)
top="$PWD/$(dirname $0)/../../.."
cd "$top"
if [ $# -gt 0 ]; then
dirs=("$@")
else
top=$(dirname $0)/../../..
dirs=( \
"$top/cmd" \
"$top/fuzz" \
"$top/lib/base" \
"$top/lib/certdb" \
"$top/lib/certhigh" \
"$top/lib/ckfw" \
"$top/lib/crmf" \
"$top/lib/cryptohi" \
"$top/lib/dbm" \
"$top/lib/dev" \
"$top/lib/freebl" \
"$top/lib/jar" \
"$top/lib/nss" \
"$top/lib/pk11wrap" \
"$top/lib/pkcs7" \
"$top/lib/pkcs12" \
"$top/lib/pki" \
"$top/lib/smime" \
"$top/lib/softoken" \
"$top/lib/ssl" \
"$top/lib/sysinit" \
"$top/lib/util" \
"$top/gtests/common" \
"$top/gtests/der_gtest" \
"$top/gtests/freebl_gtest" \
"$top/gtests/pk11_gtest" \
"$top/gtests/ssl_gtest" \
"$top/gtests/util_gtest" \
"$top/nss-tool" \
"$top/cpputil" \
)
dirs=($(find . ! -path . \( ! -regex '.*/' \) -type d -maxdepth 2 -mindepth 2))
fi
format_folder()
{
for black in "${blacklist[@]}"; do
if [[ "$1" == "$black"* ]]; then
echo "skip $1"
return 1
fi
done
return 0
}
for dir in "${dirs[@]}"; do
find "$dir" -type f \( -name '*.[ch]' -o -name '*.cc' \) -exec clang-format -i {} \+
if format_folder "$dir" ; then
echo "formatting $dir ..."
find "$dir" -type f \( -name '*.[ch]' -o -name '*.cc' \) -exec clang-format -i {} \+
fi
done
TMPFILE=$(mktemp /tmp/$(basename $0).XXXXXX)
......
......@@ -65,8 +65,8 @@ class Config {
template <typename T>
void AddEntry(const std::string& name, T init) {
entries_[name] = std::unique_ptr<ConfigEntryBase>(
new ConfigEntry<T>(name, init));
entries_[name] =
std::unique_ptr<ConfigEntryBase>(new ConfigEntry<T>(name, init));
}
Status ParseArgs(int argc, char** argv);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment