svn commit: r334106 - head/lib/libutil

[John Baldwin]

Author: jhb
Date: Wed May 23 17:02:12 2018
New Revision: 334106
URL: https://svnweb.freebsd.org/changeset/base/334106

Log:
  Use __SCCSID() for SCCS IDs.
  
  - Define NO__SCCSID in CFLAGS to preserve existing behavior of omitting
    SCCS IDs by default.
  - While here, fix the $FreeBSD$ in pw_util.c to use __FBSDID.

Modified:
  head/lib/libutil/Makefile
  head/lib/libutil/login_tty.c
  head/lib/libutil/pty.c
  head/lib/libutil/pw_util.c
  head/lib/libutil/uucplock.c

Modified: head/lib/libutil/Makefile
==============================================================================
--- head/lib/libutil/Makefile	Wed May 23 17:01:28 2018	(r334105)
+++ head/lib/libutil/Makefile	Wed May 23 17:02:12 2018	(r334106)
@@ -19,7 +19,7 @@ SRCS=	_secure_path.c auth.c expand_number.c flopen.c f
 	stub.c trimdomain.c uucplock.c
 INCS=	libutil.h login_cap.h
 
-CFLAGS+= -DLIBC_SCCS
+CFLAGS+= -DNO__SCCSID
 
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+= -DINET6

Modified: head/lib/libutil/login_tty.c
==============================================================================
--- head/lib/libutil/login_tty.c	Wed May 23 17:01:28 2018	(r334105)
+++ head/lib/libutil/login_tty.c	Wed May 23 17:02:12 2018	(r334106)
@@ -31,12 +31,7 @@
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)login_tty.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* LIBC_SCCS and not lint */
+__SCCSID("@(#)login_tty.c	8.1 (Berkeley) 6/4/93");
 
 #include <sys/param.h>
 

Modified: head/lib/libutil/pty.c
==============================================================================
--- head/lib/libutil/pty.c	Wed May 23 17:01:28 2018	(r334105)
+++ head/lib/libutil/pty.c	Wed May 23 17:02:12 2018	(r334106)
@@ -31,12 +31,7 @@
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)pty.c	8.3 (Berkeley) 5/16/94";
-#endif
-#endif /* LIBC_SCCS and not lint */
+__SCCSID("@(#)pty.c	8.3 (Berkeley) 5/16/94");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>

Modified: head/lib/libutil/pw_util.c
==============================================================================
--- head/lib/libutil/pw_util.c	Wed May 23 17:01:28 2018	(r334105)
+++ head/lib/libutil/pw_util.c	Wed May 23 17:02:12 2018	(r334106)
@@ -36,13 +36,9 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)pw_util.c	8.3 (Berkeley) 4/2/94";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+__SCCSID("@(#)pw_util.c	8.3 (Berkeley) 4/2/94");
 
 /*
  * This file is used by all the "password" programs; vipw(8), chpass(1),

Modified: head/lib/libutil/uucplock.c
==============================================================================
--- head/lib/libutil/uucplock.c	Wed May 23 17:01:28 2018	(r334105)
+++ head/lib/libutil/uucplock.c	Wed May 23 17:02:12 2018	(r334106)
@@ -31,10 +31,7 @@
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
-
-#ifndef lint
-static const char sccsid[] = "@(#)uucplock.c	8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
+__SCCSID("@(#)uucplock.c	8.1 (Berkeley) 6/6/93");
 
 #include <sys/types.h>
 #include <sys/file.h>