From da5432eda807c4b7232d030d5157d5b417ea4f52 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 16 Aug 2023 11:54:48 -0600 Subject: [PATCH] Remove $FreeBSD$: alt two-line .c pattern Remove /^\s*__RCSID\("\$FreeBSD\$"\);\n\n/ --- sbin/routed/if.c | 3 --- sbin/routed/input.c | 3 --- sbin/routed/main.c | 2 -- sbin/routed/output.c | 3 --- sbin/routed/parms.c | 3 --- sbin/routed/radix.c | 3 --- sbin/routed/rdisc.c | 3 --- sbin/routed/table.c | 3 --- sbin/routed/trace.c | 3 --- usr.bin/getconf/tests/arch_type.c | 2 -- usr.bin/procstat/tests/while1.c | 2 -- usr.sbin/mpsutil/mps_cmd.c | 2 -- usr.sbin/mpsutil/mps_debug.c | 2 -- usr.sbin/mpsutil/mps_flash.c | 2 -- usr.sbin/mpsutil/mps_set.c | 2 -- usr.sbin/mpsutil/mps_show.c | 2 -- usr.sbin/mpsutil/mps_slot.c | 2 -- usr.sbin/mpsutil/mpsutil.c | 2 -- usr.sbin/mptutil/mpt_cam.c | 2 -- usr.sbin/mptutil/mpt_cmd.c | 2 -- usr.sbin/mptutil/mpt_config.c | 2 -- usr.sbin/mptutil/mpt_drive.c | 2 -- usr.sbin/mptutil/mpt_evt.c | 2 -- usr.sbin/mptutil/mpt_show.c | 2 -- usr.sbin/mptutil/mpt_volume.c | 2 -- usr.sbin/mptutil/mptutil.c | 2 -- 26 files changed, 60 deletions(-) diff --git a/sbin/routed/if.c b/sbin/routed/if.c index 83d8fe50389..72894942fe0 100644 --- a/sbin/routed/if.c +++ b/sbin/routed/if.c @@ -33,9 +33,6 @@ #include "defs.h" #include "pathnames.h" - -__RCSID("$FreeBSD$"); - struct ifhead ifnet = LIST_HEAD_INITIALIZER(ifnet); /* all interfaces */ struct ifhead remote_if = LIST_HEAD_INITIALIZER(remote_if); /* remote interfaces */ diff --git a/sbin/routed/input.c b/sbin/routed/input.c index 854bfd8d9e6..238933d29e6 100644 --- a/sbin/routed/input.c +++ b/sbin/routed/input.c @@ -30,9 +30,6 @@ */ #include "defs.h" - -__RCSID("$FreeBSD$"); - static void input(struct sockaddr_in *, struct interface *, struct interface *, struct rip *, int); static void input_route(naddr, naddr, struct rt_spare *, struct netinfo *); diff --git a/sbin/routed/main.c b/sbin/routed/main.c index cfc0c148971..491a4002634 100644 --- a/sbin/routed/main.c +++ b/sbin/routed/main.c @@ -38,8 +38,6 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993 " "The Regents of the University of California." " All rights reserved."); -__RCSID("$FreeBSD$"); - pid_t mypid; naddr myaddr; /* system address */ diff --git a/sbin/routed/output.c b/sbin/routed/output.c index 2974f2a6f19..726fab2c11b 100644 --- a/sbin/routed/output.c +++ b/sbin/routed/output.c @@ -31,9 +31,6 @@ #include "defs.h" -__RCSID("$FreeBSD$"); - - u_int update_seqno; diff --git a/sbin/routed/parms.c b/sbin/routed/parms.c index bd4fab045f8..59f141c76c6 100644 --- a/sbin/routed/parms.c +++ b/sbin/routed/parms.c @@ -33,9 +33,6 @@ #include "pathnames.h" #include -__RCSID("$FreeBSD$"); - - static struct parm *parms; struct intnet *intnets; struct r1net *r1nets; diff --git a/sbin/routed/radix.c b/sbin/routed/radix.c index 36a404f9d04..c4a0e5de2c2 100644 --- a/sbin/routed/radix.c +++ b/sbin/routed/radix.c @@ -36,9 +36,6 @@ */ #include "defs.h" - -__RCSID("$FreeBSD$"); - #define log(x, msg) syslog(x, msg) #define panic(s) {log(LOG_ERR,s); exit(1);} #define min(a,b) (((a)<(b))?(a):(b)) diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c index f72b1dd7fda..2dfcc15768d 100644 --- a/sbin/routed/rdisc.c +++ b/sbin/routed/rdisc.c @@ -33,9 +33,6 @@ #include #include #include - -__RCSID("$FreeBSD$"); - /* router advertisement ICMP packet */ struct icmp_ad { u_int8_t icmp_type; /* type of message */ diff --git a/sbin/routed/table.c b/sbin/routed/table.c index 7db9d784278..b43c8bb873a 100644 --- a/sbin/routed/table.c +++ b/sbin/routed/table.c @@ -30,9 +30,6 @@ */ #include "defs.h" - -__RCSID("$FreeBSD$"); - static struct rt_spare *rts_better(struct rt_entry *); static struct rt_spare rts_empty = {0,0,0,HOPCNT_INFINITY,0,0,0}; static void set_need_flash(void); diff --git a/sbin/routed/trace.c b/sbin/routed/trace.c index 1166039499b..59929b130b1 100644 --- a/sbin/routed/trace.c +++ b/sbin/routed/trace.c @@ -36,9 +36,6 @@ #include #include -__RCSID("$FreeBSD$"); - - int tracelevel, new_tracelevel; FILE *ftrace; /* output trace file */ diff --git a/usr.bin/getconf/tests/arch_type.c b/usr.bin/getconf/tests/arch_type.c index 6cf7a2fb7f7..731ddae656b 100644 --- a/usr.bin/getconf/tests/arch_type.c +++ b/usr.bin/getconf/tests/arch_type.c @@ -24,8 +24,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.bin/procstat/tests/while1.c b/usr.bin/procstat/tests/while1.c index cc201b71274..c81e8193e07 100644 --- a/usr.bin/procstat/tests/while1.c +++ b/usr.bin/procstat/tests/while1.c @@ -24,8 +24,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include diff --git a/usr.sbin/mpsutil/mps_cmd.c b/usr.sbin/mpsutil/mps_cmd.c index a9cb269abc5..448e4cea602 100644 --- a/usr.sbin/mpsutil/mps_cmd.c +++ b/usr.sbin/mpsutil/mps_cmd.c @@ -34,8 +34,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mps_debug.c b/usr.sbin/mpsutil/mps_debug.c index 83315090d73..a3297b4176c 100644 --- a/usr.sbin/mpsutil/mps_debug.c +++ b/usr.sbin/mpsutil/mps_debug.c @@ -28,8 +28,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mps_flash.c b/usr.sbin/mpsutil/mps_flash.c index a0cc4a877b7..98f476e3e23 100644 --- a/usr.sbin/mpsutil/mps_flash.c +++ b/usr.sbin/mpsutil/mps_flash.c @@ -24,8 +24,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mps_set.c b/usr.sbin/mpsutil/mps_set.c index 91e4d23ab78..b75f327cb99 100644 --- a/usr.sbin/mpsutil/mps_set.c +++ b/usr.sbin/mpsutil/mps_set.c @@ -26,8 +26,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mps_show.c b/usr.sbin/mpsutil/mps_show.c index ef20cd942d8..7454bf15e06 100644 --- a/usr.sbin/mpsutil/mps_show.c +++ b/usr.sbin/mpsutil/mps_show.c @@ -32,8 +32,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mps_slot.c b/usr.sbin/mpsutil/mps_slot.c index 396d5706cd5..2c90668ec80 100644 --- a/usr.sbin/mpsutil/mps_slot.c +++ b/usr.sbin/mpsutil/mps_slot.c @@ -26,8 +26,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mpsutil.c b/usr.sbin/mpsutil/mpsutil.c index cb9563cefa6..0b6baa3aab9 100644 --- a/usr.sbin/mpsutil/mpsutil.c +++ b/usr.sbin/mpsutil/mpsutil.c @@ -32,8 +32,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_cam.c b/usr.sbin/mptutil/mpt_cam.c index 04c13f0c25f..2e636fb6ce2 100644 --- a/usr.sbin/mptutil/mpt_cam.c +++ b/usr.sbin/mptutil/mpt_cam.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_cmd.c b/usr.sbin/mptutil/mpt_cmd.c index 79422c12dd8..8bcec08cd23 100644 --- a/usr.sbin/mptutil/mpt_cmd.c +++ b/usr.sbin/mptutil/mpt_cmd.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_config.c b/usr.sbin/mptutil/mpt_config.c index 58894fb5ecc..36c3881969c 100644 --- a/usr.sbin/mptutil/mpt_config.c +++ b/usr.sbin/mptutil/mpt_config.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_drive.c b/usr.sbin/mptutil/mpt_drive.c index 96004c7a3e7..bf5a52b0bfd 100644 --- a/usr.sbin/mptutil/mpt_drive.c +++ b/usr.sbin/mptutil/mpt_drive.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_evt.c b/usr.sbin/mptutil/mpt_evt.c index b1c423f7103..6a077d4a906 100644 --- a/usr.sbin/mptutil/mpt_evt.c +++ b/usr.sbin/mptutil/mpt_evt.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_show.c b/usr.sbin/mptutil/mpt_show.c index 4bc2c7569f5..a70a4dd90bc 100644 --- a/usr.sbin/mptutil/mpt_show.c +++ b/usr.sbin/mptutil/mpt_show.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_volume.c b/usr.sbin/mptutil/mpt_volume.c index ddf6492a859..71251e591ee 100644 --- a/usr.sbin/mptutil/mpt_volume.c +++ b/usr.sbin/mptutil/mpt_volume.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mptutil.c b/usr.sbin/mptutil/mptutil.c index 0ec6620c868..5e8b2eb7129 100644 --- a/usr.sbin/mptutil/mptutil.c +++ b/usr.sbin/mptutil/mptutil.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include