Date: Sat, 15 Sep 2001 20:58:55 +1000 (EST) From: Bruce Evans <bde@zeta.org.au> To: Matt Dillon <dillon@FreeBSD.org> Cc: <cvs-committers@FreeBSD.org>, <cvs-all@FreeBSD.org> Subject: Re: cvs commit: src/lib/libatm atm_addr.c cache_key.c ioctl_subr.c ip_addr.c ip_checksum.c timer.c Message-ID: <20010915201457.L26194-100000@delplex.bde.org> In-Reply-To: <200109150342.f8F3gBs64706@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 14 Sep 2001, Matt Dillon wrote:
> dillon 2001/09/14 20:42:10 PDT
>
> Modified files:
> lib/libatm atm_addr.c cache_key.c ioctl_subr.c
> ip_addr.c ip_checksum.c timer.c
> Log:
> Convert a library to use the new __FBSDID()'s for testing and review
> purposes.
>
> Revision Changes Path
> 1.5 +3 -5 src/lib/libatm/atm_addr.c
> 1.4 +3 -5 src/lib/libatm/cache_key.c
> 1.4 +3 -5 src/lib/libatm/ioctl_subr.c
> 1.4 +3 -5 src/lib/libatm/ip_addr.c
> 1.4 +3 -5 src/lib/libatm/ip_checksum.c
> 1.4 +3 -5 src/lib/libatm/timer.c
Review: this was not a good example for testing. The old ids had numerous
style bugs (they were corrupted vendor sccsids). The changes didn't fix
any of the style bugs. The changes added one new style bug: redundant
include of implementation detail header <sys/cdefs.h>). However, this
including this header would be needed if the __FREE^H^H^HBSDID()'s were
in the correct place.
More complete cleanups for one of the files:
- restore vendor sccsid in code. Ifdef it out. This was corrupted to
form a FreeBSD pseudo-sccsid (it still had the sccs magic "@(#)" but
was inside __RCSID()), and moved to the wrong place after the includes
so that __RCSID() was defined.
- mov __FBSDID() to the correct place. Move now non-redundant include of
<sys/cdefs.h> before it.
- remove duplicate $FreeBSD$ in comment. This was another corrupted
vendor id, complete with style bugs from the vendor.
Note that the hiding the lint and rcsid-expansion-control macros in
__FBSDID() doesn't simplify things much, because they are still needed
for the vendor id (if any, but there usually is one). At least, some
ifdef is needed to prevent expansion of the vendor id. In libraries,
this is normally "#if defined(LIBC_FOOCS) && !defined(lint)". I didn't
fix this right.
diff -c2 atm_addr.c~ atm_addr.c
*** atm_addr.c~ Sat Sep 15 20:20:39 2001
--- atm_addr.c Sat Sep 15 20:27:52 2001
***************
*** 23,29 ****
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
- *
- * @(#) $FreeBSD: src/lib/libatm/atm_addr.c,v 1.5 2001/09/15 03:42:10 dillon Exp $
- *
*/
--- 23,26 ----
***************
*** 36,41 ****
*/
- #include <sys/types.h>
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/socket.h>
--- 33,47 ----
*/
#include <sys/cdefs.h>
+
+ #ifndef lint
+ #if 0
+ static char *RCSid = "@(#) $Id: atm_addr.c,v 1.1 1998/07/09 21:45:18 johnc Exp $";
+ #endif
+ #endif
+
+ __FBSDID("$FreeBSD: src/lib/libatm/atm_addr.c,v 1.5 2001/09/15 03:42:10 dillon Exp $");
+
+ #include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
***************
*** 53,58 ****
#include "libatm.h"
-
- __FBSDID("$FreeBSD: src/lib/libatm/atm_addr.c,v 1.5 2001/09/15 03:42:10 dillon Exp $");
extern char *prog;
--- 59,62 ----
Bruce
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010915201457.L26194-100000>