From e67f5b9fcac5f0ebb78f0b3a50c0128432cca584 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Sun, 16 Sep 2001 21:35:07 +0000 Subject: [PATCH] Implement __FBSDID() --- lib/libcrypt/crypt-md5.c | 6 ++---- lib/libcrypt/crypt.c | 6 ++---- lib/libcrypt/misc.c | 6 +++--- lib/libdevinfo/devinfo.c | 5 +++-- lib/libdevstat/devstat.c | 5 +++-- lib/libkvm/kvm.c | 6 +++--- lib/libkvm/kvm_alpha.c | 4 +++- lib/libkvm/kvm_amd64.c | 6 +++--- lib/libkvm/kvm_file.c | 6 +++--- lib/libkvm/kvm_getloadavg.c | 6 +++--- lib/libkvm/kvm_getswapinfo.c | 12 ++---------- lib/libkvm/kvm_i386.c | 6 +++--- lib/libkvm/kvm_proc.c | 3 +++ lib/libkvm/kvm_sparc.c | 6 +++--- lib/libvgl/bitmap.c | 5 +++-- lib/libvgl/keyboard.c | 5 +++-- lib/libvgl/main.c | 5 +++-- lib/libvgl/mouse.c | 5 +++-- lib/libvgl/simple.c | 5 +++-- lib/libvgl/text.c | 5 +++-- 20 files changed, 57 insertions(+), 56 deletions(-) diff --git a/lib/libcrypt/crypt-md5.c b/lib/libcrypt/crypt-md5.c index 98bf0b499f85..32ad75b02401 100644 --- a/lib/libcrypt/crypt-md5.c +++ b/lib/libcrypt/crypt-md5.c @@ -7,10 +7,8 @@ * ---------------------------------------------------------------------------- */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = \ -"$FreeBSD$"; -#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/lib/libcrypt/crypt.c b/lib/libcrypt/crypt.c index b1a0bb1fdfba..4f77c75d106e 100644 --- a/lib/libcrypt/crypt.c +++ b/lib/libcrypt/crypt.c @@ -24,10 +24,8 @@ * SUCH DAMAGE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = -"$FreeBSD$"; -#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/lib/libcrypt/misc.c b/lib/libcrypt/misc.c index 5cad45d2d99d..de2e024d809b 100644 --- a/lib/libcrypt/misc.c +++ b/lib/libcrypt/misc.c @@ -25,11 +25,11 @@ * 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. - * - * $FreeBSD$ - * */ +#include +__FBSDID("$FreeBSD$"); + static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; diff --git a/lib/libdevinfo/devinfo.c b/lib/libdevinfo/devinfo.c index b5427022c119..650b7f89a81e 100644 --- a/lib/libdevinfo/devinfo.c +++ b/lib/libdevinfo/devinfo.c @@ -23,10 +23,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$ */ +#include +__FBSDID("$FreeBSD$"); + /* * An interface to the FreeBSD kernel's bus/devce information interface. * diff --git a/lib/libdevstat/devstat.c b/lib/libdevstat/devstat.c index 0f1948a77304..915cbc52f724 100644 --- a/lib/libdevstat/devstat.c +++ b/lib/libdevstat/devstat.c @@ -24,10 +24,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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c index 3ef71f00a621..a00c36f6544d 100644 --- a/lib/libkvm/kvm.c +++ b/lib/libkvm/kvm.c @@ -35,12 +35,12 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #if defined(LIBC_SCCS) && !defined(lint) #if 0 static char sccsid[] = "@(#)kvm.c 8.2 (Berkeley) 2/13/94"; -#else -static const char rcsid[] = - "$FreeBSD$"; #endif #endif /* LIBC_SCCS and not lint */ diff --git a/lib/libkvm/kvm_alpha.c b/lib/libkvm/kvm_alpha.c index 59bc2c6b4675..5fcda15943fb 100644 --- a/lib/libkvm/kvm_alpha.c +++ b/lib/libkvm/kvm_alpha.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: kvm_alpha.c,v 1.7.2.1 1997/11/02 20:34:26 mellon Exp $ */ /* @@ -28,6 +27,9 @@ * rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/lib/libkvm/kvm_amd64.c b/lib/libkvm/kvm_amd64.c index 5801e0c0d7dc..eac32c052ae2 100644 --- a/lib/libkvm/kvm_amd64.c +++ b/lib/libkvm/kvm_amd64.c @@ -35,12 +35,12 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #if defined(LIBC_SCCS) && !defined(lint) #if 0 static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93"; -#else -static const char rcsid[] = - "$FreeBSD$"; #endif #endif /* LIBC_SCCS and not lint */ diff --git a/lib/libkvm/kvm_file.c b/lib/libkvm/kvm_file.c index b59ae0b41372..83882e07352a 100644 --- a/lib/libkvm/kvm_file.c +++ b/lib/libkvm/kvm_file.c @@ -31,12 +31,12 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #if defined(LIBC_SCCS) && !defined(lint) #if 0 static char sccsid[] = "@(#)kvm_file.c 8.1 (Berkeley) 6/4/93"; -#else -static const char rcsid[] = - "$FreeBSD$"; #endif #endif /* LIBC_SCCS and not lint */ diff --git a/lib/libkvm/kvm_getloadavg.c b/lib/libkvm/kvm_getloadavg.c index 023fcd58a972..6ca3869aa713 100644 --- a/lib/libkvm/kvm_getloadavg.c +++ b/lib/libkvm/kvm_getloadavg.c @@ -31,12 +31,12 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #if defined(LIBC_SCCS) && !defined(lint) #if 0 static char sccsid[] = "@(#)kvm_getloadavg.c 8.1 (Berkeley) 6/4/93"; -#else -static const char rcsid[] = - "$FreeBSD$"; #endif #endif /* LIBC_SCCS and not lint */ diff --git a/lib/libkvm/kvm_getswapinfo.c b/lib/libkvm/kvm_getswapinfo.c index d23045fb5f50..c2cc5a0a2434 100644 --- a/lib/libkvm/kvm_getswapinfo.c +++ b/lib/libkvm/kvm_getswapinfo.c @@ -7,16 +7,8 @@ * Copyright as found in /usr/src/COPYRIGHT in the FreeBSD source tree. */ -#ifndef lint -static const char copyright[] = - "@(#) Copyright (c) 1999\n" - "Matthew Dillon. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c index 5801e0c0d7dc..eac32c052ae2 100644 --- a/lib/libkvm/kvm_i386.c +++ b/lib/libkvm/kvm_i386.c @@ -35,12 +35,12 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #if defined(LIBC_SCCS) && !defined(lint) #if 0 static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93"; -#else -static const char rcsid[] = - "$FreeBSD$"; #endif #endif /* LIBC_SCCS and not lint */ diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c index 815382c395f5..48cf4143529c 100644 --- a/lib/libkvm/kvm_proc.c +++ b/lib/libkvm/kvm_proc.c @@ -37,6 +37,9 @@ * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93"; #endif /* LIBC_SCCS and not lint */ diff --git a/lib/libkvm/kvm_sparc.c b/lib/libkvm/kvm_sparc.c index 7a538d8b193b..df26ad7decdf 100644 --- a/lib/libkvm/kvm_sparc.c +++ b/lib/libkvm/kvm_sparc.c @@ -35,12 +35,12 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #if defined(LIBC_SCCS) && !defined(lint) #if 0 static char sccsid[] = "@(#)kvm_sparc.c 8.1 (Berkeley) 6/4/93"; -#else -static const char rcsid[] = - "$FreeBSD$"; #endif #endif /* LIBC_SCCS and not lint */ diff --git a/lib/libvgl/bitmap.c b/lib/libvgl/bitmap.c index 6498e2659e85..f84139d3410a 100644 --- a/lib/libvgl/bitmap.c +++ b/lib/libvgl/bitmap.c @@ -24,10 +24,11 @@ * 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. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/lib/libvgl/keyboard.c b/lib/libvgl/keyboard.c index fe1286ac8873..ed30dfa8f3ef 100644 --- a/lib/libvgl/keyboard.c +++ b/lib/libvgl/keyboard.c @@ -24,10 +24,11 @@ * 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. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/lib/libvgl/main.c b/lib/libvgl/main.c index 5da2047fabab..ec7f4fe42c8d 100644 --- a/lib/libvgl/main.c +++ b/lib/libvgl/main.c @@ -24,10 +24,11 @@ * 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. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/lib/libvgl/mouse.c b/lib/libvgl/mouse.c index f75f81fd2ea8..d1315a72dc0f 100644 --- a/lib/libvgl/mouse.c +++ b/lib/libvgl/mouse.c @@ -24,10 +24,11 @@ * 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. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/lib/libvgl/simple.c b/lib/libvgl/simple.c index 3fe9d4d3f032..71067647d41f 100644 --- a/lib/libvgl/simple.c +++ b/lib/libvgl/simple.c @@ -24,10 +24,11 @@ * 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. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include "vgl.h" diff --git a/lib/libvgl/text.c b/lib/libvgl/text.c index 2117a601ef9b..d95f26e80cde 100644 --- a/lib/libvgl/text.c +++ b/lib/libvgl/text.c @@ -24,10 +24,11 @@ * 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. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include "vgl.h"