From owner-cvs-all Sat Sep 15 13:36:11 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 2030837B407; Sat, 15 Sep 2001 13:35:55 -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 GAA26700; Sun, 16 Sep 2001 06:35:52 +1000 Date: Sun, 16 Sep 2001 06:35:27 +1000 (EST) From: Bruce Evans X-X-Sender: To: Cc: , Subject: Re: cvs commit: src/lib/libatm atm_addr.c cache_key.c ioctl_subr.c ip_addr.c ip_checksum.c timer.c In-Reply-To: <200109151939.f8FJdKF28278@earth.backplane.com> Message-ID: <20010916062557.V30137-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, Matt Dillon wrote: > I'm redirecting this to freebsd-hackers. > > Ok, I've comitted a new set of changes to libatm. Please check them out. > When we get a format that enough people are happy with we can start > converting the other libraries. I'm not particularly interested in > fixing old old problems, I just want to get the __FBSDID() stuff in shape. I prefer the following (for one of the changed files). Especially the empty line after the copyright message: %%% Index: atm_addr.c =================================================================== RCS file: /home/ncvs/src/lib/libatm/atm_addr.c,v retrieving revision 1.6 diff -u -2 -r1.6 atm_addr.c --- atm_addr.c 2001/09/15 19:36:55 1.6 +++ atm_addr.c 2001/09/15 20:25:39 @@ -24,10 +24,12 @@ * notice must be reproduced on all copies. */ -#include + +#ifdef VENDOR_ID #ifndef lint -#if 0 /* original (broken) import id */ static char *RCSid = "@(#) $Id: atm_addr.c,v 1.1 1998/07/09 21:45:18 johnc Exp $"; #endif #endif + +#include __FBSDID("$FreeBSD: src/lib/libatm/atm_addr.c,v 1.6 2001/09/15 19:36:55 dillon Exp $"); %%% (VENDOR_ID is intended to be left undefined.) This still changes the vendor id excessively relative to rev.1.1. The vendor put it after the comment after the copyright comment, and restoring it in rev.1.5 moved it to a different place. Bruce To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message