From 043c9b9b340bcaf8f77fa2208f43dfdaf50bf82f Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Tue, 11 Dec 2001 23:16:25 +0000
Subject: [PATCH] WARNS=2 fixes, use __FBSDID().

---
 usr.bin/uname/uname.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c
index 68fd38b0f60d..acb0e3af3cc9 100644
--- a/usr.bin/uname/uname.c
+++ b/usr.bin/uname/uname.c
@@ -31,15 +31,19 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
 
 #ifndef lint
-static char sccsid[] = "@(#)uname.c	8.2 (Berkeley) 5/4/95";
-#endif /* not lint */
+static const char copyright[] =
+"@(#) Copyright (c) 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
+#endif
+
+#ifndef lint
+static const char sccsid[] = "@(#)uname.c	8.2 (Berkeley) 5/4/95";
+#endif
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
@@ -64,7 +68,8 @@ main(argc, argv)
 	u_int flags;
 	int ch, mib[2];
 	size_t len, tlen;
-	char *p, *prefix, buf[1024];
+	char *p, buf[1024];
+	const char *prefix;
 
 	flags = 0;
 	while ((ch = getopt(argc, argv, "amnprsv")) != -1)