From 1f589b473781e5dd070b60dd1e465b58d7102bf8 Mon Sep 17 00:00:00 2001 From: Garance A Drosehn Date: Mon, 14 Jul 2003 05:15:21 +0000 Subject: Take advantage of the common_source/lp.cdefs.h file to change lpr source to use __FBSDID() for setting rcsids. Also fix the format of 'sccsid' lines to consistently match style(9) guidelines. Reviewed by: discussed with bde and obrien MFC after: 15 days --- usr.sbin/lpr/common_source/common.c | 10 ++++------ usr.sbin/lpr/common_source/ctlinfo.c | 6 ++---- usr.sbin/lpr/common_source/ctlinfo.h | 2 +- usr.sbin/lpr/common_source/displayq.c | 10 ++++------ usr.sbin/lpr/common_source/lp.h | 2 +- usr.sbin/lpr/common_source/matchjobs.c | 6 ++---- usr.sbin/lpr/common_source/matchjobs.h | 3 ++- usr.sbin/lpr/common_source/net.c | 6 ++---- usr.sbin/lpr/common_source/printcap.c | 6 ++---- usr.sbin/lpr/common_source/request.c | 4 ++-- usr.sbin/lpr/common_source/rmjob.c | 6 ++---- usr.sbin/lpr/common_source/startdaemon.c | 7 ++----- 12 files changed, 26 insertions(+), 42 deletions(-) diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c index ae84b636b569..1ca43a079fea 100644 --- a/usr.sbin/lpr/common_source/common.c +++ b/usr.sbin/lpr/common_source/common.c @@ -36,13 +36,11 @@ * SUCH DAMAGE. */ -#ifndef lint -/* +#if 0 static char sccsid[] = "@(#)common.c 8.5 (Berkeley) 4/28/95"; -*/ -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#endif +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD$"); #include #include diff --git a/usr.sbin/lpr/common_source/ctlinfo.c b/usr.sbin/lpr/common_source/ctlinfo.c index 0445065d0367..67cac6bdd5da 100644 --- a/usr.sbin/lpr/common_source/ctlinfo.c +++ b/usr.sbin/lpr/common_source/ctlinfo.c @@ -31,10 +31,8 @@ * ------+---------+---------+---------+---------+---------+---------+---------* */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD$"); /* * ctlinfo - This collection of routines will know everything there is to diff --git a/usr.sbin/lpr/common_source/ctlinfo.h b/usr.sbin/lpr/common_source/ctlinfo.h index 501471b459c8..95fe57247842 100644 --- a/usr.sbin/lpr/common_source/ctlinfo.h +++ b/usr.sbin/lpr/common_source/ctlinfo.h @@ -64,7 +64,7 @@ struct cjobinfo { struct cjprivate *cji_priv; }; -#include +#include "lp.cdefs.h" /* A cross-platform version of */ __BEGIN_DECLS void ctl_freeinf(struct cjobinfo *_cjinf); diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c index f7e61d82e8e2..f3c02d0aa2b7 100644 --- a/usr.sbin/lpr/common_source/displayq.c +++ b/usr.sbin/lpr/common_source/displayq.c @@ -31,13 +31,11 @@ * SUCH DAMAGE. */ -#ifndef lint -/* +#if 0 static char sccsid[] = "@(#)displayq.c 8.4 (Berkeley) 4/28/95"; -*/ -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#endif +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD$"); #include #include diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h index 20438e38f712..fea03b9f7bd2 100644 --- a/usr.sbin/lpr/common_source/lp.h +++ b/usr.sbin/lpr/common_source/lp.h @@ -253,7 +253,7 @@ typedef enum { TR_SENDING, TR_RECVING, TR_PRINTING } tr_sendrecv; #define CMD_SHOWQ_LONG '\4' #define CMD_RMJOB '\5' -#include +#include "lp.cdefs.h" /* A cross-platform version of */ __BEGIN_DECLS struct dirent; diff --git a/usr.sbin/lpr/common_source/matchjobs.c b/usr.sbin/lpr/common_source/matchjobs.c index 9af0fd101553..eeeb0d428ed9 100644 --- a/usr.sbin/lpr/common_source/matchjobs.c +++ b/usr.sbin/lpr/common_source/matchjobs.c @@ -32,10 +32,8 @@ * ------+---------+---------+---------+---------+---------+---------+---------* */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD$"); /* * movejobs.c - The lpc commands which move jobs around. diff --git a/usr.sbin/lpr/common_source/matchjobs.h b/usr.sbin/lpr/common_source/matchjobs.h index d4c0682dc42f..6e4b9ffe2005 100644 --- a/usr.sbin/lpr/common_source/matchjobs.h +++ b/usr.sbin/lpr/common_source/matchjobs.h @@ -84,7 +84,8 @@ STAILQ_HEAD(jobspec_hdr, jobspec); #define SCQ_JSORDER 0x0001 /* follow the user-specified order */ #define SCQ_QORDER 0x0002 /* the order of jobs in the queue */ -#include +#include "lp.cdefs.h" /* A cross-platform version of */ + __BEGIN_DECLS struct jobqueue; diff --git a/usr.sbin/lpr/common_source/net.c b/usr.sbin/lpr/common_source/net.c index df70ef466136..3ae3e9058dc7 100644 --- a/usr.sbin/lpr/common_source/net.c +++ b/usr.sbin/lpr/common_source/net.c @@ -38,10 +38,8 @@ * From: @(#)common.c 8.5 (Berkeley) 4/28/95 */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD$"); #include #include diff --git a/usr.sbin/lpr/common_source/printcap.c b/usr.sbin/lpr/common_source/printcap.c index d9498936e727..f18470d68d36 100644 --- a/usr.sbin/lpr/common_source/printcap.c +++ b/usr.sbin/lpr/common_source/printcap.c @@ -38,10 +38,8 @@ * From: @(#)common.c 8.5 (Berkeley) 4/28/95 */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD$"); #include #include diff --git a/usr.sbin/lpr/common_source/request.c b/usr.sbin/lpr/common_source/request.c index 79ea90b1ef64..68d8a4d6b62d 100644 --- a/usr.sbin/lpr/common_source/request.c +++ b/usr.sbin/lpr/common_source/request.c @@ -29,8 +29,8 @@ static const char copyright[] = "Copyright (C) 1997, Massachusetts Institute of Technology\r\n"; -static const char rcsid[] = - "$FreeBSD$"; +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD$"); #include #include diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c index 3a60efb14eb5..ac854b2286e8 100644 --- a/usr.sbin/lpr/common_source/rmjob.c +++ b/usr.sbin/lpr/common_source/rmjob.c @@ -31,13 +31,11 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 static char sccsid[] = "@(#)rmjob.c 8.2 (Berkeley) 4/28/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD$"); #include #include diff --git a/usr.sbin/lpr/common_source/startdaemon.c b/usr.sbin/lpr/common_source/startdaemon.c index 16ec7cecc884..5e213ae2bafc 100644 --- a/usr.sbin/lpr/common_source/startdaemon.c +++ b/usr.sbin/lpr/common_source/startdaemon.c @@ -31,14 +31,11 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 static char sccsid[] = "@(#)startdaemon.c 8.2 (Berkeley) 4/17/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD$"); #include #include -- cgit v1.2.3