From owner-cvs-all  Fri Dec 18 08:11:56 1998
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id IAA25242
          for cvs-all-outgoing; Fri, 18 Dec 1998 08:11:56 -0800 (PST)
          (envelope-from owner-cvs-all@FreeBSD.ORG)
Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.26.10.9])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id IAA25235
          for <committers@FreeBSD.ORG>; Fri, 18 Dec 1998 08:11:50 -0800 (PST)
          (envelope-from bde@godzilla.zeta.org.au)
Received: (from bde@localhost)
	by godzilla.zeta.org.au (8.8.7/8.8.7) id DAA31345;
	Sat, 19 Dec 1998 03:11:40 +1100
Date: Sat, 19 Dec 1998 03:11:40 +1100
From: Bruce Evans <bde@zeta.org.au>
Message-Id: <199812181611.DAA31345@godzilla.zeta.org.au>
To: committers@FreeBSD.ORG, kuriyama@sky.rim.or.jp
Subject: Re: Where should we put $Id$ to?
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

>I'm reviewing src/usr.sbin/pccard area for integrating
>non-bus-architectural part of PAO.  Then I found two styles of $Id$
>place.
>
>First one is:
>>  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF ...
>>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>>  */
>> 
>> #ifndef lint
>> static const char rcsid[] =
>>         "$Id: cardd.c,v 1.18 1997/10/06 11:36:06 charnier Exp $";
>> #endif /* not lint */
>> 
>> #include <fcntl.h>

If there is an rcsid, then it should contain $Id$, as above, and there
should be no other $Id$.

If there is an sccsid but no rcsid, then an rcsid should be added, as
above.  See bin/cat/cat.c for a canonical example.

>Second one is:
>>  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF ...
>>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>>  *
>>  * $Id: cardd.c,v 1.17 1997/02/22 16:08:52 peter Exp $
>>  */
>> 
>> #include <stdio.h>
>
>  Most of RELENG_2_2 code are second type, current's are first type. 

$Id$ in comments should go in copyrights, as in src/share/examples/*,
not as above (there should be a tab instead of a space before $Id$ to
line it up with any CSRG id).

Header files and man pages can't generate code, so they can't have
rcsids and must have $Id$ in comments.  For .c files, we normally
avoid using rcsid in the kernel and use it if and only if the original
sources use some sort of static id.  I suggest using it in all new
sources outside the kernel.  At least in the kernel, we should probably
switch to using the __RCSID macro so that static ids are optional
(default: no ids).  I wouldn't worry about this now.  We should also
switch to $FreeBSD$...

Bruce

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message