From owner-cvs-all Sun Sep 16 3: 5:42 2001 Delivered-To: cvs-all@freebsd.org Received: from mailman.zeta.org.au (mailman.zeta.org.au [203.26.10.16]) by hub.freebsd.org (Postfix) with ESMTP id B1AD737B408; Sun, 16 Sep 2001 03:05:31 -0700 (PDT) Received: from bde.zeta.org.au (bde.zeta.org.au [203.2.228.102]) by mailman.zeta.org.au (8.9.3/8.8.7) with ESMTP id UAA28380; Sun, 16 Sep 2001 20:05:20 +1000 Date: Sun, 16 Sep 2001 20:04:55 +1000 (EST) From: Bruce Evans X-X-Sender: To: "David O'Brien" Cc: , Subject: Re: cvs commit: src/share/man/man9 style.9 In-Reply-To: <20010915165402.A84034@dragon.nuxi.com> Message-ID: <20010916195045.X34241-100000@delplex.bde.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sat, 15 Sep 2001, David O'Brien wrote: > On Sun, Sep 16, 2001 at 06:15:45AM +1000, Bruce Evans wrote: > > I now prefer something like: > > > > --- > > > > > > #if 0 /* maybe change to #ifdef VENDOR_ID */ > > > > #endif > > > > #include > > __FBSDID($NetBSD$) > > --- > > Why do we need to "#if 0" out NetBSD's __RCSID's? Our macros handle them > just fine. Thus we would only be adding __FBSDID() to such code. "#if 0" is more general and easier to add, and I want to make it clear that the vendor ids are intentionally left out. > Is it OK to only comment out non-__RCSID using code? Doing it your way, > adds more of our changes around possible Vendor code -- CVS will barf > harder in the face of that. It's not only OK, it's usually necessary. I think it's less than useful to have a special way of handling the few percent of files that have NetBSD-style __RCSIDs. Most vendor ids are still from Berkeley, and look like: #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)alarm.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ in libraries, and: #ifndef lint static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95"; #endif /* not lint */ in utilities. The ones (like the above) in libraries are already ifdefed out if we avoid defining LIBC, but in the most common case of utilities there is only the lint ifdef so we would need to add an ifdef to disable these ids. Bruce To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message