Eliminate "whitelist" and "blacklist" terms.

[mirror_ovs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6981b943e39d685370a4888a0c3e3f03e40f83df..a3fbb15e2ec8cc93da5da6f0c8560010972e869f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -276,7 +276,7 @@ static-check:
        fi
 .PHONY: static-check
 
-# Check that assert.h is not used outside a whitelist of files.
+# Check that assert.h is not used (outside a small set of files).
 ALL_LOCAL += check-assert-h-usage
 check-assert-h-usage:
        @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
@@ -323,7 +323,7 @@ check-tabs:
        if test -e .git && (git --version) >/dev/null 2>&1 && \
          grep -ln "^   " \
            `git ls-files \
-             | grep -v -f build-aux/initial-tab-whitelist` /dev/null \
+             | grep -v -f build-aux/initial-tab-allowed-files` /dev/null \
              | $(EGREP) -v ':[         ]*/?\*'; \
        then \
          echo "See above for files that use tabs for indentation."; \
@@ -336,16 +336,16 @@ ALL_LOCAL += thread-safety-check
 thread-safety-check:
        @cd $(srcdir); \
        if test -e .git && (git --version) >/dev/null 2>&1 && \
-         grep -n -f build-aux/thread-safety-blacklist \
+         grep -n -f build-aux/thread-safety-forbidden \
            `git ls-files | grep '\.[ch]$$' \
              | $(EGREP) -v '^datapath|^lib/sflow|^third-party'` /dev/null \
              | $(EGREP) -v ':[         ]*/?\*'; \
        then \
          echo "See above for list of calls to functions that are"; \
-         echo "blacklisted due to thread safety issues"; \
+         echo "forbidden due to thread safety issues"; \
          exit 1; \
        fi
-EXTRA_DIST += build-aux/thread-safety-blacklist
+EXTRA_DIST += build-aux/thread-safety-forbidden
 .PHONY: thread-safety-check
 
 # Check that "ip" is used in preference to "ifconfig", because