svn commit: r334911 - in head/lib/libcompat: . 4.1 4.3 4.4

[John Baldwin]

Author: jhb
Date: Sun Jun 10 02:34:41 2018
New Revision: 334911
URL: https://svnweb.freebsd.org/changeset/base/334911

Log:
  Use __SCSSID() for SCCS IDs.
  
  While here, fix $FreeBSD$ ID in ftime.c to use __FBSDID instead of a static
  array.

Modified:
  head/lib/libcompat/4.1/ftime.c
  head/lib/libcompat/4.3/re_comp.c
  head/lib/libcompat/4.3/rexec.c
  head/lib/libcompat/4.4/cuserid.c
  head/lib/libcompat/Makefile

Modified: head/lib/libcompat/4.1/ftime.c
==============================================================================
--- head/lib/libcompat/4.1/ftime.c	Sun Jun 10 02:30:09 2018	(r334910)
+++ head/lib/libcompat/4.1/ftime.c	Sun Jun 10 02:34:41 2018	(r334911)
@@ -30,9 +30,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static char rcsid[] = "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/time.h>

Modified: head/lib/libcompat/4.3/re_comp.c
==============================================================================
--- head/lib/libcompat/4.3/re_comp.c	Sun Jun 10 02:30:09 2018	(r334910)
+++ head/lib/libcompat/4.3/re_comp.c	Sun Jun 10 02:34:41 2018	(r334911)
@@ -34,6 +34,7 @@
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
+__SCCSID("@(#)regex.c	5.1 (Berkeley) 3/29/92");
 
 /*
  * Compatibility routines that implement the old re_comp/re_exec interface in
@@ -41,10 +42,6 @@ __FBSDID("$FreeBSD$");
  * rely on dark corners of re_comp/re_exec and won't work with this version,
  * but most programs should be fine.
  */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)regex.c	5.1 (Berkeley) 3/29/92";
-#endif /* LIBC_SCCS and not lint */
 
 #include <regex.h>
 #include <stddef.h>

Modified: head/lib/libcompat/4.3/rexec.c
==============================================================================
--- head/lib/libcompat/4.3/rexec.c	Sun Jun 10 02:30:09 2018	(r334910)
+++ head/lib/libcompat/4.3/rexec.c	Sun Jun 10 02:34:41 2018	(r334911)
@@ -27,13 +27,11 @@
  * 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.
- *
- * $FreeBSD$
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rexec.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+__SCCSID("@(#)rexec.c	8.1 (Berkeley) 6/4/93");
 
 #include <sys/types.h>
 #include <sys/uio.h>

Modified: head/lib/libcompat/4.4/cuserid.c
==============================================================================
--- head/lib/libcompat/4.4/cuserid.c	Sun Jun 10 02:30:09 2018	(r334910)
+++ head/lib/libcompat/4.4/cuserid.c	Sun Jun 10 02:34:41 2018	(r334911)
@@ -29,11 +29,9 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)cuserid.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
+__SCCSID("@(#)cuserid.c	8.1 (Berkeley) 6/4/93");
 
 #include <pwd.h>
 #include <stdio.h>

Modified: head/lib/libcompat/Makefile
==============================================================================
--- head/lib/libcompat/Makefile	Sun Jun 10 02:30:09 2018	(r334910)
+++ head/lib/libcompat/Makefile	Sun Jun 10 02:34:41 2018	(r334911)
@@ -3,7 +3,7 @@
 
 PACKAGE=lib${LIB}
 LIB=	compat
-CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${SRCTOP}/lib/libc/locale
+CFLAGS+=-I${SRCTOP}/lib/libc/locale
 NO_PIC=
 
 WARNS?=	0