From owner-svn-src-all@freebsd.org Wed May 23 17:02:14 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 92E9DF2D913; Wed, 23 May 2018 17:02:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 324B37462C; Wed, 23 May 2018 17:02:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 14CCA25989; Wed, 23 May 2018 17:02:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4NH2DLc052098; Wed, 23 May 2018 17:02:13 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4NH2D1g052094; Wed, 23 May 2018 17:02:13 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201805231702.w4NH2D1g052094@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 23 May 2018 17:02:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334106 - head/lib/libutil X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/lib/libutil X-SVN-Commit-Revision: 334106 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 May 2018 17:02:14 -0000 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 __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 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 __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 #include 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 +__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 __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 #include