space: Fix --check.

The logic for when --check should report strangeness was confused with
the verbosity stuff.  Disentangle and fix.

diff --git a/space.c b/space.c
index ef9485f8ec3bddaab30989ae85bd250f9da34a6f..5a6a0de119949e5cd719b25b70cbc3f0f0974073 100644 (file)
--- a/space.c
+++ b/space.c
@@ -183,17 +183,17 @@ static int space(const char *name)
        break;
       case '\t':
        if (flags & F_UNTABIFY) {
-         if ((flags & F_CHECK) && !(f & f_warntabs)) {
+         if ((flags & F_VERBOSE) && !(f & f_warntabs)) {
            fprintf(stderr, "%s:%u: found tab\n", name, nl);
            f |= f_warntabs;
-           status = BADNESS;
          }
+         status = BADNESS;
        } else if (((flags & F_MIDLINETABS) || (f & f_newline)) && nsp) {
          if ((flags & F_VERBOSE) && !(f & f_warnspacetab)) {
            fprintf(stderr, "%s:%u: space followed by tab\n", name, nl);
            f |= f_warnspacetab;
-           status = BADNESS;
          }
+         status = BADNESS;
          f |= f_tabify | f_forced;
        }
        f |= f_tab;
@@ -210,8 +210,9 @@ static int space(const char *name)
        goto end;
       case '\n':
       case '\v':
-       if (nwsp && (flags & F_VERBOSE)) {
-         fprintf(stderr, "%s:%u: trailing whitespace\n", name, nl);
+       if (nwsp) {
+         if (flags & F_VERBOSE)
+           fprintf(stderr, "%s:%u: trailing whitespace\n", name, nl);
          status = BADNESS;
        }
        if (fout) putc('\n', fout);