Skip to content

Commit

Permalink
sccs: Manual changes
Browse files Browse the repository at this point in the history
For the uncommon items: Go through the tree and remove sccs tags that
didn't fit any nice pattern. If in the neighborhood, other SCM tags were
removed when they were detritis of long-ago CVS somehow in the early
mists of the project. Some adjacent copyrights stringswere removed (they
duplicated the copyright notices in the file). This also removed
non-standard formations of omission of SCCS tags (usually by adding an
extra #if 0 somewhere.

After this commit, a number of strings tagged with the 'what' @(#)
prefix remain, but they are primarily copyright notices.

Sponsored by:		Netflix
  • Loading branch information
bsdimp committed Nov 27, 2023
1 parent 8a7b612 commit 5b31cc9
Showing 64 changed files with 9 additions and 340 deletions.
2 changes: 0 additions & 2 deletions include/rpc/rpcb_prot.x
Original file line number Diff line number Diff line change
@@ -33,8 +33,6 @@

#ifdef RPC_HDR
%
%/* #pragma ident "@(#)rpcb_prot.x 1.5 94/04/29 SMI" */
%
%#ifndef _KERNEL
%
#endif
6 changes: 0 additions & 6 deletions include/rpcsvc/bootparam_prot.x
Original file line number Diff line number Diff line change
@@ -45,12 +45,6 @@
%#include <sys/errno.h>
%#include <sys/param.h>
%#include <sys/syslimits.h>
#else
%#ifndef lint
%/*static char sccsid[] = "from: @(#)bootparam_prot.x 1.2 87/06/24 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)bootparam_prot.x 2.1 88/08/01 4.0 RPCSRC";*/
%#endif /* not lint */
%#include <sys/cdefs.h>
#endif

const MAX_MACHINE_NAME = 255;
4 changes: 0 additions & 4 deletions include/rpcsvc/crypt.x
Original file line number Diff line number Diff line change
@@ -30,10 +30,6 @@
* SUCH DAMAGE.
*/

#ifndef RPC_HDR
%#include <sys/cdefs.h>
#endif

/*
* This protocol definition exists because of the U.S. government and
* its stupid export laws. We can't export DES code from the United
4 changes: 0 additions & 4 deletions include/rpcsvc/key_prot.x
Original file line number Diff line number Diff line change
@@ -45,10 +45,6 @@
* requirements.
*/

%/* From: #pragma ident "@(#)key_prot.x 1.7 94/04/29 SMI" */
%/* Copyright (c) 1990, 1991 Sun Microsystems, Inc. */
%#include <sys/cdefs.h>
%
%/*
% * Compiled from key_prot.x using rpcgen.
% * DO NOT EDIT THIS FILE!
8 changes: 0 additions & 8 deletions include/rpcsvc/klm_prot.x
Original file line number Diff line number Diff line change
@@ -38,14 +38,6 @@
* above the kernel.
*/

#ifndef RPC_HDR
%#ifndef lint
%/*static char sccsid[] = "from: @(#)klm_prot.x 1.7 87/07/08 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)klm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/
%#endif /* not lint */
%#include <sys/cdefs.h>
#endif

const LM_MAXSTRLEN = 1024;

/*
8 changes: 0 additions & 8 deletions include/rpcsvc/mount.x
Original file line number Diff line number Diff line change
@@ -33,14 +33,6 @@
* Protocol description for the mount program
*/

#ifndef RPC_HDR
%#ifndef lint
%/*static char sccsid[] = "from: @(#)mount.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)mount.x 2.1 88/08/01 4.0 RPCSRC";*/
%#endif /* not lint */
%#include <sys/cdefs.h>
#endif

const MNTPATHLEN = 1024; /* maximum bytes in a pathname argument */
const MNTNAMLEN = 255; /* maximum bytes in a name argument */
const FHSIZE = 32; /* size in bytes of a file handle */
8 changes: 0 additions & 8 deletions include/rpcsvc/nfs_prot.x
Original file line number Diff line number Diff line change
@@ -29,14 +29,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef RPC_HDR
%#ifndef lint
%/*static char sccsid[] = "from: @(#)nfs_prot.x 1.2 87/10/12 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)nfs_prot.x 2.1 88/08/01 4.0 RPCSRC";*/
%#endif /* not lint */
%#include <sys/cdefs.h>
#endif

const NFS_PORT = 2049;
const NFS_MAXDATA = 8192;
const NFS_MAXPATHLEN = 1024;
4 changes: 0 additions & 4 deletions include/rpcsvc/nis.x
Original file line number Diff line number Diff line change
@@ -29,10 +29,6 @@
% * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
% */

#ifndef RPC_HDR
%#include <sys/cdefs.h>
#endif

/*
*
* RPC Language Protocol description file for NIS Plus
4 changes: 0 additions & 4 deletions include/rpcsvc/nis_cache.x
Original file line number Diff line number Diff line change
@@ -35,10 +35,6 @@
* All Rights Reserved.
*/

#ifndef RPC_HDR
%#include <sys/cdefs.h>
#endif

#ifdef RPC_HDR
%#include <rpc/types.h>
%#include <rpcsvc/nis.h>
4 changes: 0 additions & 4 deletions include/rpcsvc/nis_callback.x
Original file line number Diff line number Diff line change
@@ -36,10 +36,6 @@
* All Rights Reserved.
*/

#ifndef RPC_HDR
%#include <sys/cdefs.h>
#endif

/*
*
* RPCL description of the Callback Service.
8 changes: 1 addition & 7 deletions include/rpcsvc/nlm_prot.x
Original file line number Diff line number Diff line change
@@ -8,14 +8,8 @@
#ifdef RPC_HDR
%#define LM_MAXSTRLEN 1024
%#define MAXNAMELEN LM_MAXSTRLEN+1
#else
%#include <sys/cdefs.h>
%#ifndef lint
%/*static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";*/
%/*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 */
#endif
/* $NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp $ */

/*
* status of a call to the lock manager
3 changes: 0 additions & 3 deletions include/rpcsvc/pmap_prot.x
Original file line number Diff line number Diff line change
@@ -34,9 +34,6 @@

#ifdef RPC_HDR
%
%#pragma ident "@(#)pmap_prot.x 1.6 94/04/29 SMI"
%#include <sys/cdefs.h>
%
%#ifndef _KERNEL
%
#endif
8 changes: 0 additions & 8 deletions include/rpcsvc/rex.x
Original file line number Diff line number Diff line change
@@ -33,14 +33,6 @@
* Remote execution (rex) protocol specification
*/

#ifndef RPC_HDR
%#ifndef lint
%/*static char sccsid[] = "from: @(#)rex.x 1.3 87/09/18 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)rex.x 2.1 88/08/01 4.0 RPCSRC";*/
%#endif /* not lint */
%#include <sys/cdefs.h>
#endif

const STRINGSIZE = 1024;
typedef string rexstring<1024>;

8 changes: 0 additions & 8 deletions include/rpcsvc/rnusers.x
Original file line number Diff line number Diff line change
@@ -33,14 +33,6 @@
* Find out about remote users
*/

#ifndef RPC_HDR
%#ifndef lint
%/*static char sccsid[] = "from: @(#)rnusers.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)rnusers.x 2.1 88/08/01 4.0 RPCSRC";*/
%#endif /* not lint */
%#include <sys/cdefs.h>
#endif

const MAXUSERS = 100;
const MAXUTLEN = 256;

4 changes: 0 additions & 4 deletions include/rpcsvc/rquota.x
Original file line number Diff line number Diff line change
@@ -3,10 +3,6 @@
* Requires unix authentication
*/

#ifndef RPC_HDR
%#include <sys/cdefs.h>
#endif

const RQ_PATHLEN = 1024;

struct sq_dqblk {
7 changes: 0 additions & 7 deletions include/rpcsvc/rstat.x
Original file line number Diff line number Diff line change
@@ -44,13 +44,6 @@
%
%#endif /* ndef FSCALE */

#else

%#ifndef lint
%/*static char sccsid[] = "from: @(#)rstat.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)rstat.x 2.2 88/08/01 4.0 RPCSRC";*/
%#endif /* not lint */
%#include <sys/cdefs.h>
#endif /* def RPC_HDR */

const RSTAT_CPUSTATES = 4;
2 changes: 0 additions & 2 deletions include/rpcsvc/rwall.x
Original file line number Diff line number Diff line change
@@ -31,8 +31,6 @@
%/*
% * Copyright (c) 1984, 1990 by Sun Microsystems, Inc.
% */
%
%/* from @(#)rwall.x 1.6 91/03/11 TIRPC 1.0 */

#ifdef RPC_HDR
%
4 changes: 0 additions & 4 deletions include/rpcsvc/sm_inter.x
Original file line number Diff line number Diff line change
@@ -35,10 +35,6 @@
*
*/

#ifndef RPC_HDR
%#include <sys/cdefs.h>
#endif

program SM_PROG {
version SM_VERS {
/* res_stat = stat_succ if status monitor agrees to monitor */
8 changes: 0 additions & 8 deletions include/rpcsvc/spray.x
Original file line number Diff line number Diff line change
@@ -34,14 +34,6 @@
* Useful for testing flakiness of network interfaces
*/

#ifndef RPC_HDR
%#ifndef lint
%/*static char sccsid[] = "from: @(#)spray.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)spray.x 2.1 88/08/01 4.0 RPCSRC";*/
%#endif /* not lint */
%#include <sys/cdefs.h>
#endif

const SPRAYMAX = 8845; /* max amount can spray */

/*
4 changes: 0 additions & 4 deletions include/rpcsvc/yp.x
Original file line number Diff line number Diff line change
@@ -33,10 +33,6 @@
* Protocol description file for the Yellow Pages Service
*/

#ifndef RPC_HDR
%#include <sys/cdefs.h>
#endif

const YPMAXRECORD = 16777216;
const YPMAXDOMAIN = 64;
const YPMAXMAP = 64;
8 changes: 0 additions & 8 deletions include/rpcsvc/yppasswd.x
Original file line number Diff line number Diff line change
@@ -34,14 +34,6 @@
* Requires unix authentication
*/

#ifndef RPC_HDR
%#ifndef lint
%/*static char sccsid[] = "from: @(#)yppasswd.x 1.1 87/04/13 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)yppasswd.x 2.1 88/08/01 4.0 RPCSRC";*/
%#endif /* not lint */
%#include <sys/cdefs.h>
#endif

program YPPASSWDPROG {
version YPPASSWDVERS {
/*
1 change: 0 additions & 1 deletion include/rpcsvc/ypupdate_prot.x
Original file line number Diff line number Diff line change
@@ -32,7 +32,6 @@
% * Copyright (c) 1986, 1990 by Sun Microsystems, Inc.
% */
%
%/* from @(#)ypupdate_prot.x 1.3 91/03/11 TIRPC 1.0 */
#ifndef RPC_HDR
%#include <sys/cdefs.h>
#endif
3 changes: 1 addition & 2 deletions kerberos5/include/config.h
Original file line number Diff line number Diff line change
@@ -3,8 +3,7 @@


#ifndef RCSID
#define RCSID(msg) \
static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
#define RCSID(msg)
#endif

/* Maximum values on all known systems */
Binary file modified lib/libc/db/docs/hash.usenix.ps
Binary file not shown.
Binary file modified lib/libc/db/docs/libtp.usenix.ps
Binary file not shown.
3 changes: 0 additions & 3 deletions lib/libc/rpc/clnt_bcast.c
Original file line number Diff line number Diff line change
@@ -33,9 +33,6 @@
* Copyright (c) 1986-1991 by Sun Microsystems Inc.
*/

#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)clnt_bcast.c 1.15 89/04/21 Copyr 1988 Sun Micro";
#endif
/*
* clnt_bcast.c
* Client interface to broadcast service.
3 changes: 0 additions & 3 deletions lib/libc/rpc/clnt_dg.c
Original file line number Diff line number Diff line change
@@ -33,9 +33,6 @@
* Copyright (c) 1986-1991 by Sun Microsystems Inc.
*/

#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro";
#endif
/*
* Implements a connectionless client side RPC.
*/
3 changes: 0 additions & 3 deletions lib/libc/rpc/svc_auth.c
Original file line number Diff line number Diff line change
@@ -33,9 +33,6 @@
* Copyright (c) 1986-1991 by Sun Microsystems Inc.
*/

#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro";
#endif
/*
* svc_auth.c, Server-side rpc authenticator interface.
*
3 changes: 0 additions & 3 deletions lib/libc/rpc/svc_generic.c
Original file line number Diff line number Diff line change
@@ -34,9 +34,6 @@
* Copyright (c) 1986-1991 by Sun Microsystems Inc.
*/

#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro";
#endif
/*
* svc_generic.c, Server side for RPC.
*
10 changes: 3 additions & 7 deletions lib/libc/string/wcscmp.c
Original file line number Diff line number Diff line change
@@ -32,13 +32,9 @@
* SUCH DAMAGE.
*/

#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)strcmp.c 8.1 (Berkeley) 6/4/93";
#if 0
__RCSID("$NetBSD: wcscmp.c,v 1.3 2001/01/05 12:13:12 itojun Exp $");
#endif
#endif /* LIBC_SCCS and not lint */

/* $NetBSD: wcscmp.c,v 1.3 2001/01/05 12:13:12 itojun Exp $ */

#include <wchar.h>

/*
9 changes: 2 additions & 7 deletions lib/libc/string/wcsncmp.c
Original file line number Diff line number Diff line change
@@ -29,13 +29,8 @@
* SUCH DAMAGE.
*/

#include <sys/cdefs.h>
#if 0
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)strncmp.c 8.1 (Berkeley) 6/4/93";
__RCSID("$NetBSD: wcsncmp.c,v 1.3 2001/01/05 12:13:13 itojun Exp $");
#endif /* LIBC_SCCS and not lint */
#endif
/* $NetBSD: wcsncmp.c,v 1.3 2001/01/05 12:13:13 itojun Exp $ */

#include <wchar.h>

int
9 changes: 1 addition & 8 deletions sbin/fsck/preen.c
Original file line number Diff line number Diff line change
@@ -31,14 +31,7 @@
* SUCH DAMAGE.
*/

#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)preen.c 8.5 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: preen.c,v 1.18 1998/07/26 20:02:36 mycroft Exp $");
#endif
#endif /* not lint */
/* $NetBSD: preen.c,v 1.18 1998/07/26 20:02:36 mycroft Exp $ */

#include <sys/param.h>
#include <sys/stat.h>
5 changes: 0 additions & 5 deletions sbin/ipf/ipf/bpf_filter.c
Original file line number Diff line number Diff line change
@@ -37,11 +37,6 @@
* SUCH DAMAGE.
*/

#if !(defined(lint) || defined(KERNEL) || defined(_KERNEL))
static const char rcsid[] =
"@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.3 2006/10/03 11:25:56 darrenr Exp $ (LBL)";
#endif

#include <sys/param.h>
#include <sys/types.h>
#include <sys/time.h>
4 changes: 0 additions & 4 deletions sbin/ipf/ipsend/ip.c
Original file line number Diff line number Diff line change
@@ -4,10 +4,6 @@
*
* See the IPFILTER.LICENCE file for details on licencing.
*/
#if !defined(lint)
static const char sccsid[] = "%W% %G% (C)1995";
static const char rcsid[] = "@(#)$Id$";
#endif
#include <sys/param.h>
#include <sys/types.h>
#include <netinet/in_systm.h>
Loading

0 comments on commit 5b31cc9

Please sign in to comment.