4 files changed, 47 insertions, 10 deletions

diff --git a/lib/liby/Makefile b/lib/liby/Makefile
index 2f357f3c7617d..23e1197fa4777 100644
--- a/lib/liby/Makefile
+++ b/lib/liby/Makefile
@@ -5,6 +5,4 @@ LIB=	y
 SRCS=	main.c yyerror.c
 NO_PIC=
 
-WARNS?=	1
-
 .include <bsd.lib.mk>
diff --git a/lib/liby/main.c b/lib/liby/main.c
index 6a8fa39c2a6d9..7c3a6acf0ccc8 100644
--- a/lib/liby/main.c
+++ b/lib/liby/main.c
@@ -32,16 +32,17 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#ifndef lint
+#if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
+#endif /* LIBC_SCCS and not lint */
 
 #include <stdlib.h>
 
-int yyparse(void);
+#include "yyerror.h"
 
 int
 main(void)
 {
+
 	exit(yyparse());
 }
diff --git a/lib/liby/yyerror.c b/lib/liby/yyerror.c
index 122ce105fbe43..861ad5ad4c35c 100644
--- a/lib/liby/yyerror.c
+++ b/lib/liby/yyerror.c
@@ -32,16 +32,18 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#ifndef lint
+#if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)yyerror.c	8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
+#endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
 
+#include "yyerror.h"
+
 int
-yyerror(msg)
-char *msg;
+yyerror(const char *msg)
 {
-	(void)fprintf(stderr, "%s\n", msg);
+
+	fprintf(stderr, "%s\n", msg);
 	return(0);
 }
diff --git a/lib/liby/yyerror.h b/lib/liby/yyerror.h
new file mode 100644
index 0000000000000..7ef3ab9e8d8c6
--- /dev/null
+++ b/lib/liby/yyerror.h
@@ -0,0 +1,36 @@
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+int yyparse(void);
+int yyerror(const char *msg);