From 349c6025d0a60742a40c122420d7285baefc97ab Mon Sep 17 00:00:00 2001 From: obrien Date: Tue, 10 Jun 2003 21:44:29 +0000 Subject: [PATCH] Use __FBSDID(). --- sys/compat/svr4/imgact_svr4.c | 5 +++-- sys/compat/svr4/svr4_fcntl.c | 5 +++-- sys/compat/svr4/svr4_filio.c | 5 +++-- sys/compat/svr4/svr4_ioctl.c | 5 +++-- sys/compat/svr4/svr4_ipc.c | 12 ++++-------- sys/compat/svr4/svr4_misc.c | 6 +++--- sys/compat/svr4/svr4_resource.c | 14 +++++--------- sys/compat/svr4/svr4_signal.c | 5 +++-- sys/compat/svr4/svr4_socket.c | 5 +++-- sys/compat/svr4/svr4_sockio.c | 5 +++-- sys/compat/svr4/svr4_stat.c | 5 +++-- sys/compat/svr4/svr4_stream.c | 5 +++-- sys/compat/svr4/svr4_sysvec.c | 5 +++-- sys/compat/svr4/svr4_termios.c | 5 +++-- sys/compat/svr4/svr4_ttold.c | 5 +++-- sys/crypto/blowfish/bf_enc.c | 5 ++++- sys/crypto/blowfish/bf_skey.c | 5 ++++- sys/crypto/cast128/cast128.c | 5 ++++- sys/crypto/md5.c | 5 +++-- sys/crypto/rc4/rc4.c | 6 +++--- sys/crypto/rijndael/rijndael-alg-fst.c | 4 +++- sys/crypto/rijndael/rijndael-api-fst.c | 4 +++- sys/crypto/sha1.c | 6 ++++-- sys/crypto/sha2/sha2.c | 4 ++-- 24 files changed, 78 insertions(+), 58 deletions(-) diff --git a/sys/compat/svr4/imgact_svr4.c b/sys/compat/svr4/imgact_svr4.c index 693793ac522a..5d8d550cde59 100644 --- a/sys/compat/svr4/imgact_svr4.c +++ b/sys/compat/svr4/imgact_svr4.c @@ -28,10 +28,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/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c index 8632b3c1c319..c21afa720e86 100644 --- a/sys/compat/svr4/svr4_fcntl.c +++ b/sys/compat/svr4/svr4_fcntl.c @@ -27,10 +27,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 "opt_mac.h" #include diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c index 374338f46c7f..3b4467a715da 100644 --- a/sys/compat/svr4/svr4_filio.c +++ b/sys/compat/svr4/svr4_filio.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/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c index 08ba009a8551..545d20644eed 100644 --- a/sys/compat/svr4/svr4_ioctl.c +++ b/sys/compat/svr4/svr4_ioctl.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/sys/compat/svr4/svr4_ipc.c b/sys/compat/svr4/svr4_ipc.c index 28d3321d0dca..ff148b33b9ba 100644 --- a/sys/compat/svr4/svr4_ipc.c +++ b/sys/compat/svr4/svr4_ipc.c @@ -1,11 +1,4 @@ -/* - * $FreeBSD$ - * Derived from: - * $NetBSD: svr4_ipc.c,v 1.7 1998/10/19 22:43:00 tron Exp $ */ - /*- - * Original copyright: - * * Copyright (c) 1995 The NetBSD Foundation, Inc. * All rights reserved. * @@ -40,7 +33,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - /* * Portions of this code have been derived from software contributed * to the FreeBSD Project by Mark Newton. @@ -75,8 +67,12 @@ * novice might be to MakeItGo, but I have more important fish to fry * at present. * + * Derived from: $NetBSD: svr4_ipc.c,v 1.7 1998/10/19 22:43:00 tron Exp $ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c index 22fdc66138cf..7cdb576c3493 100644 --- a/sys/compat/svr4/svr4_misc.c +++ b/sys/compat/svr4/svr4_misc.c @@ -24,10 +24,7 @@ * 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$ */ - /* * SVR4 compatibility module. * @@ -35,6 +32,9 @@ * handled here. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include diff --git a/sys/compat/svr4/svr4_resource.c b/sys/compat/svr4/svr4_resource.c index e9adace66bb4..f04d591b2534 100644 --- a/sys/compat/svr4/svr4_resource.c +++ b/sys/compat/svr4/svr4_resource.c @@ -1,10 +1,4 @@ -/* Derived from: - * $NetBSD: svr4_resource.c,v 1.3 1998/12/13 18:00:52 christos Exp $ - */ - /*- - * Original copyright: - * * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. * @@ -38,10 +32,7 @@ * 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$ */ - /* * Portions of this software have been derived from software contributed * to the FreeBSD Project by Mark Newton. @@ -70,8 +61,13 @@ * 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. + * + * Derived from: $NetBSD: svr4_resource.c,v 1.3 1998/12/13 18:00:52 christos Exp $ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/compat/svr4/svr4_signal.c b/sys/compat/svr4/svr4_signal.c index c02a89cba61e..f1d276933fe8 100644 --- a/sys/compat/svr4/svr4_signal.c +++ b/sys/compat/svr4/svr4_signal.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/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c index a1c7adc986ed..95014e019a32 100644 --- a/sys/compat/svr4/svr4_socket.c +++ b/sys/compat/svr4/svr4_socket.c @@ -27,8 +27,6 @@ * 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$ */ /* @@ -42,6 +40,9 @@ * every time a stat(2) call finds a socket. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c index 8ecd1d42a5e1..089daff81f2c 100644 --- a/sys/compat/svr4/svr4_sockio.c +++ b/sys/compat/svr4/svr4_sockio.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/sys/compat/svr4/svr4_stat.c b/sys/compat/svr4/svr4_stat.c index 6f67a9fa4a40..a361bd2f1ec0 100644 --- a/sys/compat/svr4/svr4_stat.c +++ b/sys/compat/svr4/svr4_stat.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/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c index 95d67cd2d0dd..c9fb65a345bb 100644 --- a/sys/compat/svr4/svr4_stream.c +++ b/sys/compat/svr4/svr4_stream.c @@ -26,8 +26,6 @@ * 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$ */ /* @@ -37,6 +35,9 @@ * ToDo: The state machine for getmsg needs re-thinking */ +#include +__FBSDID("$FreeBSD$"); + #define COMPAT_43 1 #include "opt_mac.h" diff --git a/sys/compat/svr4/svr4_sysvec.c b/sys/compat/svr4/svr4_sysvec.c index 8abcbb2d5488..9b4588ca2559 100644 --- a/sys/compat/svr4/svr4_sysvec.c +++ b/sys/compat/svr4/svr4_sysvec.c @@ -26,10 +26,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$"); + /* XXX we use functions that might not exist. */ #include "opt_compat.h" diff --git a/sys/compat/svr4/svr4_termios.c b/sys/compat/svr4/svr4_termios.c index ab1e7991a442..a6cb59fdae97 100644 --- a/sys/compat/svr4/svr4_termios.c +++ b/sys/compat/svr4/svr4_termios.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/sys/compat/svr4/svr4_ttold.c b/sys/compat/svr4/svr4_ttold.c index 7e4f23478de8..7672465b7942 100644 --- a/sys/compat/svr4/svr4_ttold.c +++ b/sys/compat/svr4/svr4_ttold.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/sys/crypto/blowfish/bf_enc.c b/sys/crypto/blowfish/bf_enc.c index 831db17b8bff..5f26d408960a 100644 --- a/sys/crypto/blowfish/bf_enc.c +++ b/sys/crypto/blowfish/bf_enc.c @@ -1,7 +1,7 @@ -/* $FreeBSD$ */ /* $KAME: bf_enc.c,v 1.7 2002/02/27 01:33:59 itojun Exp $ */ /* crypto/bf/bf_enc.c */ + /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,6 +59,9 @@ * [including the GNU Public Licence.] */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/crypto/blowfish/bf_skey.c b/sys/crypto/blowfish/bf_skey.c index a93558c280bc..df8d1cf3d779 100644 --- a/sys/crypto/blowfish/bf_skey.c +++ b/sys/crypto/blowfish/bf_skey.c @@ -1,7 +1,7 @@ -/* $FreeBSD$ */ /* $KAME: bf_skey.c,v 1.7 2002/02/27 01:33:59 itojun Exp $ */ /* crypto/bf/bf_skey.c */ + /* Copyright (C) 1995-1997 Eric Young (eay@mincom.oz.au) * All rights reserved. * @@ -59,6 +59,9 @@ * [including the GNU Public Licence.] */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/crypto/cast128/cast128.c b/sys/crypto/cast128/cast128.c index 8c31d9d90bde..0eabf90ce4e2 100644 --- a/sys/crypto/cast128/cast128.c +++ b/sys/crypto/cast128/cast128.c @@ -1,9 +1,9 @@ -/* $FreeBSD$ */ /* $KAME: cast128.c,v 1.5 2001/11/27 09:47:32 sakane Exp $ */ /* * heavily modified by Tomomi Suzuki */ + /* * The CAST-128 Encryption Algorithm (RFC 2144) * @@ -36,6 +36,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/crypto/md5.c b/sys/crypto/md5.c index 3ce093e97119..615a133f9b57 100644 --- a/sys/crypto/md5.c +++ b/sys/crypto/md5.c @@ -1,6 +1,4 @@ -/* $FreeBSD$ */ /* $KAME: md5.c,v 1.5 2000/11/08 06:13:08 itojun Exp $ */ - /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. @@ -30,6 +28,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/crypto/rc4/rc4.c b/sys/crypto/rc4/rc4.c index ae8360a5bca9..f94a554b98d4 100644 --- a/sys/crypto/rc4/rc4.c +++ b/sys/crypto/rc4/rc4.c @@ -1,4 +1,3 @@ - /* * rc4.c * @@ -33,10 +32,11 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/crypto/rijndael/rijndael-alg-fst.c b/sys/crypto/rijndael/rijndael-alg-fst.c index 46842a883473..d27fda27de6b 100644 --- a/sys/crypto/rijndael/rijndael-alg-fst.c +++ b/sys/crypto/rijndael/rijndael-alg-fst.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $KAME: rijndael-alg-fst.c,v 1.7 2001/05/27 00:23:23 itojun Exp $ */ /* @@ -13,6 +12,9 @@ * This code is placed in the public domain. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #ifdef _KERNEL diff --git a/sys/crypto/rijndael/rijndael-api-fst.c b/sys/crypto/rijndael/rijndael-api-fst.c index d2fdd67de44b..d22c06e0af50 100644 --- a/sys/crypto/rijndael/rijndael-api-fst.c +++ b/sys/crypto/rijndael/rijndael-api-fst.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $KAME: rijndael-api-fst.c,v 1.10 2001/05/27 09:34:18 itojun Exp $ */ /* @@ -16,6 +15,9 @@ * This code is placed in the public domain. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #ifdef _KERNEL diff --git a/sys/crypto/sha1.c b/sys/crypto/sha1.c index 3ba2c10329d9..208789ab1339 100644 --- a/sys/crypto/sha1.c +++ b/sys/crypto/sha1.c @@ -1,6 +1,4 @@ -/* $FreeBSD$ */ /* $KAME: sha1.c,v 1.5 2000/11/08 06:13:08 itojun Exp $ */ - /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. @@ -29,12 +27,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + /* * FIPS pub 180-1: Secure Hash Algorithm (SHA-1) * based on: http://csrc.nist.gov/fips/fip180-1.txt * implemented by Jun-ichiro itojun Itoh */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/crypto/sha2/sha2.c b/sys/crypto/sha2/sha2.c index 8740fbba11b3..492d658e6abc 100644 --- a/sys/crypto/sha2/sha2.c +++ b/sys/crypto/sha2/sha2.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $KAME: sha2.c,v 1.8 2001/11/08 01:07:52 itojun Exp $ */ /* @@ -33,9 +32,10 @@ * 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. - * */ +#include +__FBSDID("$FreeBSD$"); #include #include