Revert r207677 which is considered a violation of style(9).

Pointed out by:	bde
Pointy hat to:	delphij

7 files changed, 46 insertions, 16 deletions

diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c
index 35ef5b25f467..cc2d797a541d 100644
--- a/usr.bin/find/find.c
+++ b/usr.bin/find/find.c
@@ -32,10 +32,15 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)find.c	8.5 (Berkeley) 8/5/94
  */
 
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)find.c	8.5 (Berkeley) 8/5/94";
+#else
+#endif
+#endif /* not lint */
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index 4329887b09ef..1714627d1fc3 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -32,10 +32,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)function.c	8.10 (Berkeley) 5/4/95
  */
 
+#ifndef lint
+#if 0
+static const char sccsid[] = "@(#)function.c	8.10 (Berkeley) 5/4/95";
+#endif
+#endif /* not lint */
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c
index e96994b71849..88e45938cc6d 100644
--- a/usr.bin/find/ls.c
+++ b/usr.bin/find/ls.c
@@ -29,10 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)ls.c	8.1 (Berkeley) 6/6/93
  */
 
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)ls.c	8.1 (Berkeley) 6/6/93";
+#endif
+#endif /* not lint */
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c
index 7d4c24ac41a0..8e2b42cd298c 100644
--- a/usr.bin/find/main.c
+++ b/usr.bin/find/main.c
@@ -32,8 +32,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)main.c	8.4 (Berkeley) 5/4/95
  */
 
 #ifndef lint
@@ -42,6 +40,12 @@ char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)main.c	8.4 (Berkeley) 5/4/95";
+#endif
+#endif /* not lint */
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c
index 3696c13305fd..15329064cf44 100644
--- a/usr.bin/find/misc.c
+++ b/usr.bin/find/misc.c
@@ -32,10 +32,15 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)misc.c	8.2 (Berkeley) 4/1/94
  */
 
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)misc.c	8.2 (Berkeley) 4/1/94";
+#else
+#endif
+#endif /* not lint */
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/usr.bin/find/operator.c b/usr.bin/find/operator.c
index d1a7ea8e807b..c774efa0dc89 100644
--- a/usr.bin/find/operator.c
+++ b/usr.bin/find/operator.c
@@ -32,10 +32,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)operator.c	8.1 (Berkeley) 6/6/93
  */
 
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)operator.c	8.1 (Berkeley) 6/6/93";
+#endif
+#endif /* not lint */
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index 6ae3958315bf..02287c9c17ab 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -32,10 +32,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)option.c	8.2 (Berkeley) 4/16/94
  */
 
+#ifndef lint
+/*
+static char sccsid[] = "@(#)option.c	8.2 (Berkeley) 4/16/94";
+*/
+#endif /* not lint */
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
@@ -51,7 +55,7 @@ __FBSDID("$FreeBSD$");
 
 #include "find.h"
 
-int typecompare(const void *, const void *);
+static int typecompare(const void *, const void *);
 
 /* NB: the following table must be sorted lexically. */
 /* Options listed with C++ comments are in gnu find, but not our find */
@@ -190,7 +194,7 @@ lookup_option(const char *name)
 	    sizeof(options)/sizeof(OPTION), sizeof(OPTION), typecompare));
 }
 
-int
+static int
 typecompare(const void *a, const void *b)
 {
 	return (strcmp(((const OPTION *)a)->name, ((const OPTION *)b)->name));