From nobody Wed Aug 23 17:49:48 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RWDHx1DdTz4r9Xl; Wed, 23 Aug 2023 17:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RWDHx0Rqdz4TfW; Wed, 23 Aug 2023 17:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NwbG08nODne/W4HuRgz6on6DX3zjAhesZID5fKn5yyw=; b=ukqVCnHC4N3G1JNenq6eXTu0VZYmFDO2SbvclLO55wBBSSSLbggzGybkMR6UfAMmb3HR3R M1RhDdO2GvwVH4huouXs3vCZa0+qQISZKaNkRV4VXmEenKMDpDpHIEe56yDHUWWBckNAtg Eq1yIYIpAwWRf6xdMzEXqvQvoBc7nK/NGtUBBVOU/dDEPgBXsRDmOLL8XZZmonlxgbfYRE Dsg49xw5ZX0AqPdLEyf4D+rWe1S2UliZvvfbOOkFhZwi/nHyvdAtu3QeDf1gNINnkA84iv Ja7mcfrTvyfpPl9c6itTkqO0y0b5MPTj/pZuTzQiFjqXE6L6HPTu+wIG04fYHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692812989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NwbG08nODne/W4HuRgz6on6DX3zjAhesZID5fKn5yyw=; b=duv443BF6Z9wce2GpQqw82V1/jLNVQgSLbGcDndEJsVPCbCh1SRo2Re1Y+r8HLxo2zXakp ROImmL/X2Lv6EkuJZWRxm2nmRhH3G0vUG68Bui1SGvE8NFQ9ZR+dtwXRyPyaN5D9fWij4t ZGFNY8m9Y29WpxmdZyY/Ub3EDZAbnGQSrbfrlDjD1ertkX2LAURpqfWAw/8G6xb8hMWYRY Avtl/bKMiGIas/CLwtORuGb7xptEY1+EdOV1j2cz/EQzUESbXyip18Mfl7Jhpu1Ilh29ob 1HgDaM80W06AS1H41o9x+gLLK8q1w6CqDp+/H+aK0OPBzCrn1WzvZouWRwxMCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692812989; a=rsa-sha256; cv=none; b=lb2e2/AoBphjrDkJa4jO/MNa8Ejd30Alhhr2KnMasvJSKRpqr4ZtcwKosEFoBjtSgNS3Ei rpUVpUcXVNmUW5aDNiq35CKmhDY863Hp6/KaI7xvYCHVAEM9aY9tiKkR42hu8xvXTV8/hT K475EwFeCAOP22luZsf9baXxIJK8szoEIHAiuJLNHc/mcH1SHRxdyFTC5nySW6C1aUzXlo fXvvx91GcpvddcY6hXA/tv0tgbCIzEIDw92d2UPynGoytjW/65JmUcfL+kqfUH3olC81Yc 2woU11OdJf+TqGqfvGFVfoWeNiQCZiAR6Kc653fNlmYENxfcxanly1tHVIseNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDHw6f2DzvL6; Wed, 23 Aug 2023 17:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHnmD3040982; Wed, 23 Aug 2023 17:49:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHnmFp040979; Wed, 23 Aug 2023 17:49:48 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:49:48 GMT Message-Id: <202308231749.37NHnmFp040979@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 9a298a124729 - stable/13 - Remove $FreeBSD$: alt two-line .c pattern List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9a298a124729d1113219aacaf473594ef39927bd Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9a298a124729d1113219aacaf473594ef39927bd commit 9a298a124729d1113219aacaf473594ef39927bd Author: Warner Losh AuthorDate: 2023-08-22 01:31:46 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:43:26 +0000 Remove $FreeBSD$: alt two-line .c pattern Remove /^\s*__RCSID\("\$FreeBSD\$"\);\n\n/ Similar commit in main: (cherry picked from commit da5432eda807) --- 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 83d8fe503893..72894942fe05 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 854bfd8d9e66..238933d29e6b 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 cfc0c148971c..491a40026345 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 2974f2a6f19e..726fab2c11b5 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 bd4fab045f84..59f141c76c66 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 36a404f9d043..c4a0e5de2c2c 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 f72b1dd7fda7..2dfcc15768d8 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 7db9d784278b..b43c8bb873a5 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 1166039499bd..59929b130b1a 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 6cf7a2fb7f79..731ddae656bb 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 cc201b712745..c81e8193e072 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 a9cb269abc5f..448e4cea602f 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 83315090d730..a3297b4176cd 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 a0cc4a877b7d..98f476e3e234 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 91e4d23ab78d..b75f327cb993 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 ef20cd942d86..7454bf15e06c 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 396d5706cd5f..2c90668ec808 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 cb9563cefa60..0b6baa3aab93 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 04c13f0c25fe..2e636fb6ce25 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 79422c12dd89..8bcec08cd232 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 58894fb5ecc9..36c3881969c9 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 96004c7a3e74..bf5a52b0bfd7 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 b1c423f71031..6a077d4a906e 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 4bc2c7569f53..a70a4dd90bc8 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 9c160542f51c..aa28262e3709 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 0ec6620c8688..5e8b2eb71291 100644 --- a/usr.sbin/mptutil/mptutil.c +++ b/usr.sbin/mptutil/mptutil.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include