From 9524e274b5484ac8b43bacd90d4029183ccf6476 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 16 Aug 2023 11:55:47 -0600 Subject: [PATCH] Remove $FreeBSD$: one-line xdr pattern Remove /^\s*%\s*__FBSDID\("\$FreeBSD\$"\);?\s*\n/ --- include/rpcsvc/bootparam_prot.x | 1 - include/rpcsvc/crypt.x | 1 - include/rpcsvc/key_prot.x | 1 - include/rpcsvc/klm_prot.x | 1 - include/rpcsvc/mount.x | 1 - include/rpcsvc/nfs_prot.x | 1 - include/rpcsvc/nis.x | 1 - include/rpcsvc/nis_cache.x | 1 - include/rpcsvc/nis_callback.x | 1 - include/rpcsvc/nlm_prot.x | 1 - include/rpcsvc/pmap_prot.x | 1 - include/rpcsvc/rex.x | 1 - include/rpcsvc/rnusers.x | 1 - include/rpcsvc/rquota.x | 1 - include/rpcsvc/rstat.x | 2 -- include/rpcsvc/sm_inter.x | 1 - include/rpcsvc/spray.x | 1 - include/rpcsvc/yp.x | 1 - include/rpcsvc/yppasswd.x | 1 - include/rpcsvc/ypupdate_prot.x | 1 - include/rpcsvc/ypxfrd.x | 1 - usr.sbin/rpc.yppasswdd/yppasswd_private.x | 1 - 22 files changed, 23 deletions(-) diff --git a/include/rpcsvc/bootparam_prot.x b/include/rpcsvc/bootparam_prot.x index 548d618755d..6e47bdb218d 100644 --- a/include/rpcsvc/bootparam_prot.x +++ b/include/rpcsvc/bootparam_prot.x @@ -51,7 +51,6 @@ %/*static char sccsid[] = "from: @(#)bootparam_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const MAX_MACHINE_NAME = 255; diff --git a/include/rpcsvc/crypt.x b/include/rpcsvc/crypt.x index 3b296c0ddf1..7d6b94d9606 100644 --- a/include/rpcsvc/crypt.x +++ b/include/rpcsvc/crypt.x @@ -32,7 +32,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif /* diff --git a/include/rpcsvc/key_prot.x b/include/rpcsvc/key_prot.x index 1fccd957941..09a20049832 100644 --- a/include/rpcsvc/key_prot.x +++ b/include/rpcsvc/key_prot.x @@ -48,7 +48,6 @@ %/* From: #pragma ident "@(#)key_prot.x 1.7 94/04/29 SMI" */ %/* Copyright (c) 1990, 1991 Sun Microsystems, Inc. */ %#include -%__FBSDID("$FreeBSD$"); % %/* % * Compiled from key_prot.x using rpcgen. diff --git a/include/rpcsvc/klm_prot.x b/include/rpcsvc/klm_prot.x index 5860f3251c1..b78dbfc20c3 100644 --- a/include/rpcsvc/klm_prot.x +++ b/include/rpcsvc/klm_prot.x @@ -44,7 +44,6 @@ %/*static char sccsid[] = "from: @(#)klm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const LM_MAXSTRLEN = 1024; diff --git a/include/rpcsvc/mount.x b/include/rpcsvc/mount.x index 9ebee835b27..e67cbc73d86 100644 --- a/include/rpcsvc/mount.x +++ b/include/rpcsvc/mount.x @@ -39,7 +39,6 @@ %/*static char sccsid[] = "from: @(#)mount.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const MNTPATHLEN = 1024; /* maximum bytes in a pathname argument */ diff --git a/include/rpcsvc/nfs_prot.x b/include/rpcsvc/nfs_prot.x index 17791b6a18b..9706c5a03bb 100644 --- a/include/rpcsvc/nfs_prot.x +++ b/include/rpcsvc/nfs_prot.x @@ -35,7 +35,6 @@ %/*static char sccsid[] = "from: @(#)nfs_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const NFS_PORT = 2049; diff --git a/include/rpcsvc/nis.x b/include/rpcsvc/nis.x index ee822d039b8..bd1e61828de 100644 --- a/include/rpcsvc/nis.x +++ b/include/rpcsvc/nis.x @@ -31,7 +31,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif /* diff --git a/include/rpcsvc/nis_cache.x b/include/rpcsvc/nis_cache.x index 6edaea92c38..e55173994c1 100644 --- a/include/rpcsvc/nis_cache.x +++ b/include/rpcsvc/nis_cache.x @@ -39,7 +39,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif #ifdef RPC_HDR diff --git a/include/rpcsvc/nis_callback.x b/include/rpcsvc/nis_callback.x index 74a555b4f16..7b717e918dc 100644 --- a/include/rpcsvc/nis_callback.x +++ b/include/rpcsvc/nis_callback.x @@ -40,7 +40,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif /* diff --git a/include/rpcsvc/nlm_prot.x b/include/rpcsvc/nlm_prot.x index 87bf6c84435..f53d8199680 100644 --- a/include/rpcsvc/nlm_prot.x +++ b/include/rpcsvc/nlm_prot.x @@ -15,7 +15,6 @@ %/*static char sccsid[] = "from: * @(#)nlm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ %__RCSID("$NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp $"); %#endif /* not lint */ -%__FBSDID("$FreeBSD$"); #endif /* diff --git a/include/rpcsvc/pmap_prot.x b/include/rpcsvc/pmap_prot.x index 19a4d8c5a2f..fb8a3bbde04 100644 --- a/include/rpcsvc/pmap_prot.x +++ b/include/rpcsvc/pmap_prot.x @@ -36,7 +36,6 @@ % %#pragma ident "@(#)pmap_prot.x 1.6 94/04/29 SMI" %#include -%__FBSDID("$FreeBSD$"); % %#ifndef _KERNEL % diff --git a/include/rpcsvc/rex.x b/include/rpcsvc/rex.x index 4d4bda65f28..20cce24e0ff 100644 --- a/include/rpcsvc/rex.x +++ b/include/rpcsvc/rex.x @@ -39,7 +39,6 @@ %/*static char sccsid[] = "from: @(#)rex.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const STRINGSIZE = 1024; diff --git a/include/rpcsvc/rnusers.x b/include/rpcsvc/rnusers.x index 421a515ac72..1b6dcada2ff 100644 --- a/include/rpcsvc/rnusers.x +++ b/include/rpcsvc/rnusers.x @@ -39,7 +39,6 @@ %/*static char sccsid[] = "from: @(#)rnusers.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const MAXUSERS = 100; diff --git a/include/rpcsvc/rquota.x b/include/rpcsvc/rquota.x index 8c8dfe452b5..b4ef0d3a6dd 100644 --- a/include/rpcsvc/rquota.x +++ b/include/rpcsvc/rquota.x @@ -8,7 +8,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif const RQ_PATHLEN = 1024; diff --git a/include/rpcsvc/rstat.x b/include/rpcsvc/rstat.x index a34456082af..1b62470777e 100644 --- a/include/rpcsvc/rstat.x +++ b/include/rpcsvc/rstat.x @@ -51,8 +51,6 @@ %/*static char sccsid[] = "from: @(#)rstat.x 2.2 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); - #endif /* def RPC_HDR */ const RSTAT_CPUSTATES = 4; diff --git a/include/rpcsvc/sm_inter.x b/include/rpcsvc/sm_inter.x index 42a00915e8f..a9a69c8b24e 100644 --- a/include/rpcsvc/sm_inter.x +++ b/include/rpcsvc/sm_inter.x @@ -40,7 +40,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif program SM_PROG { diff --git a/include/rpcsvc/spray.x b/include/rpcsvc/spray.x index b6a5b849a07..406d318a494 100644 --- a/include/rpcsvc/spray.x +++ b/include/rpcsvc/spray.x @@ -40,7 +40,6 @@ %/*static char sccsid[] = "from: @(#)spray.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const SPRAYMAX = 8845; /* max amount can spray */ diff --git a/include/rpcsvc/yp.x b/include/rpcsvc/yp.x index 91614b20486..d11902c4a27 100644 --- a/include/rpcsvc/yp.x +++ b/include/rpcsvc/yp.x @@ -37,7 +37,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif const YPMAXRECORD = 16777216; diff --git a/include/rpcsvc/yppasswd.x b/include/rpcsvc/yppasswd.x index 1b39a632fa9..2ad2215689f 100644 --- a/include/rpcsvc/yppasswd.x +++ b/include/rpcsvc/yppasswd.x @@ -40,7 +40,6 @@ %/*static char sccsid[] = "from: @(#)yppasswd.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif program YPPASSWDPROG { diff --git a/include/rpcsvc/ypupdate_prot.x b/include/rpcsvc/ypupdate_prot.x index 90648a023e6..328a07432f0 100644 --- a/include/rpcsvc/ypupdate_prot.x +++ b/include/rpcsvc/ypupdate_prot.x @@ -35,7 +35,6 @@ %/* from @(#)ypupdate_prot.x 1.3 91/03/11 TIRPC 1.0 */ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif % %/* diff --git a/include/rpcsvc/ypxfrd.x b/include/rpcsvc/ypxfrd.x index e6ff902a1df..44ce886f64f 100644 --- a/include/rpcsvc/ypxfrd.x +++ b/include/rpcsvc/ypxfrd.x @@ -66,7 +66,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif /* XXX cribbed from yp.x */ diff --git a/usr.sbin/rpc.yppasswdd/yppasswd_private.x b/usr.sbin/rpc.yppasswdd/yppasswd_private.x index a1d6be51f36..d1e32f8819b 100644 --- a/usr.sbin/rpc.yppasswdd/yppasswd_private.x +++ b/usr.sbin/rpc.yppasswdd/yppasswd_private.x @@ -32,7 +32,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif #ifdef RPC_HDR