[src/trunk]: src/usr.bin/find Attack of the whiteout police, including the "f...

[atatat <atatat%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/81f88ed1d082
branches:  trunk
changeset: 572265:81f88ed1d082
user:      atatat <atatat%NetBSD.org@localhost>
date:      Tue Dec 28 05:11:07 2004 +0000

description:
Attack of the whiteout police, including the "fix whitespace problems"
department followed by the "and fix the the ifdefs as well" brigade,
leading to a janitorial "just combine those two" strike team.

diffstat:

 usr.bin/find/function.c |  19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diffs (51 lines):

diff -r a4e42877a7e0 -r 81f88ed1d082 usr.bin/find/function.c
--- a/usr.bin/find/function.c   Tue Dec 28 01:12:26 2004 +0000
+++ b/usr.bin/find/function.c   Tue Dec 28 05:11:07 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: function.c,v 1.48 2004/04/21 01:05:47 christos Exp $   */
+/*     $NetBSD: function.c,v 1.49 2004/12/28 05:11:07 atatat Exp $     */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "from: @(#)function.c   8.10 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: function.c,v 1.48 2004/04/21 01:05:47 christos Exp $");
+__RCSID("$NetBSD: function.c,v 1.49 2004/12/28 05:11:07 atatat Exp $");
 #endif
 #endif /* not lint */
 
@@ -1520,14 +1520,6 @@
        ftsoptions &= ~FTS_NOSTAT;
 
        switch (typestring[0]) {
-#ifdef S_IFWHT
-       case 'W':
-#ifdef FTS_WHITEOUT
-             ftsoptions |= FTS_WHITEOUT;
-#endif
-              mask = S_IFWHT;
-              break;
-#endif
        case 'b':
                mask = S_IFBLK;
                break;
@@ -1549,12 +1541,15 @@
        case 's':
                mask = S_IFSOCK;
                break;
-#ifdef FTS_WHITEOUT
+#ifdef S_IFWHT
+       case 'W':
        case 'w':
                mask = S_IFWHT;
+#ifdef FTS_WHITEOUT
                ftsoptions |= FTS_WHITEOUT;
+#endif
                break;
-#endif /* FTS_WHITEOUT */
+#endif /* S_IFWHT */
        default:
                errx(1, "-type: %s: unknown type", typestring);
        }