d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Take advantage of the common_source/lp.cdefs.h file to change lpr

Browse Source 
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
This commit is contained in:
Garance A Drosehn 2003-07-14 05:15:21 +00:00
parent b9ec9b4d77
commit 1f589b4737
12 changed files with 26 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/lpr/common_source/common.c
View File

@ -36,13 +36,11 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef lint #if 0
/*
static char sccsid[] = "@(#)common.c 8.5 (Berkeley) 4/28/95"; static char sccsid[] = "@(#)common.c 8.5 (Berkeley) 4/28/95";
*/ #endif
static const char rcsid[] = #include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
"$FreeBSD$"; __FBSDID("$FreeBSD$");
#endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
#include <sys/stat.h> #include <sys/stat.h>

6
usr.sbin/lpr/common_source/ctlinfo.c
View File

@ -31,10 +31,8 @@
* ------+---------+---------+---------+---------+---------+---------+---------* * ------+---------+---------+---------+---------+---------+---------+---------*
*/ */
#ifndef lint #include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
static const char rcsid[] = __FBSDID("$FreeBSD$");
"$FreeBSD$";
#endif /* not lint */
/* /*
* ctlinfo - This collection of routines will know everything there is to * ctlinfo - This collection of routines will know everything there is to

2
usr.sbin/lpr/common_source/ctlinfo.h
View File

@ -64,7 +64,7 @@ struct cjobinfo {
struct cjprivate *cji_priv; struct cjprivate *cji_priv;
}; };
#include <sys/cdefs.h> #include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
__BEGIN_DECLS __BEGIN_DECLS
void ctl_freeinf(struct cjobinfo *_cjinf); void ctl_freeinf(struct cjobinfo *_cjinf);

10
usr.sbin/lpr/common_source/displayq.c
View File

@ -31,13 +31,11 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef lint #if 0
/*
static char sccsid[] = "@(#)displayq.c 8.4 (Berkeley) 4/28/95"; static char sccsid[] = "@(#)displayq.c 8.4 (Berkeley) 4/28/95";
*/ #endif
static const char rcsid[] = #include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
"$FreeBSD$"; __FBSDID("$FreeBSD$");
#endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
#include <sys/stat.h> #include <sys/stat.h>

2
usr.sbin/lpr/common_source/lp.h
View File

@ -253,7 +253,7 @@ typedef enum { TR_SENDING, TR_RECVING, TR_PRINTING } tr_sendrecv;
#define CMD_SHOWQ_LONG '\4' #define CMD_SHOWQ_LONG '\4'
#define CMD_RMJOB '\5' #define CMD_RMJOB '\5'
#include <sys/cdefs.h> #include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
__BEGIN_DECLS __BEGIN_DECLS
struct dirent; struct dirent;

6
usr.sbin/lpr/common_source/matchjobs.c
View File

@ -32,10 +32,8 @@
* ------+---------+---------+---------+---------+---------+---------+---------* * ------+---------+---------+---------+---------+---------+---------+---------*
*/ */
#ifndef lint #include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
static const char rcsid[] = __FBSDID("$FreeBSD$");
"$FreeBSD$";
#endif /* not lint */
/* /*
* movejobs.c - The lpc commands which move jobs around. * movejobs.c - The lpc commands which move jobs around.

3
usr.sbin/lpr/common_source/matchjobs.h
View File

@ -84,7 +84,8 @@ STAILQ_HEAD(jobspec_hdr, jobspec);
#define SCQ_JSORDER 0x0001 /* follow the user-specified order */ #define SCQ_JSORDER 0x0001 /* follow the user-specified order */
#define SCQ_QORDER 0x0002 /* the order of jobs in the queue */ #define SCQ_QORDER 0x0002 /* the order of jobs in the queue */
#include <sys/cdefs.h> #include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
__BEGIN_DECLS __BEGIN_DECLS
struct jobqueue; struct jobqueue;

6
usr.sbin/lpr/common_source/net.c
View File

@ -38,10 +38,8 @@
* From: @(#)common.c 8.5 (Berkeley) 4/28/95 * From: @(#)common.c 8.5 (Berkeley) 4/28/95
*/ */
#ifndef lint #include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
static const char rcsid[] = __FBSDID("$FreeBSD$");
"$FreeBSD$";
#endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
#include <sys/socket.h> #include <sys/socket.h>

6
usr.sbin/lpr/common_source/printcap.c
View File

@ -38,10 +38,8 @@
* From: @(#)common.c 8.5 (Berkeley) 4/28/95 * From: @(#)common.c 8.5 (Berkeley) 4/28/95
*/ */
#ifndef lint #include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
static const char rcsid[] = __FBSDID("$FreeBSD$");
"$FreeBSD$";
#endif /* not lint */
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>

4
usr.sbin/lpr/common_source/request.c
View File

@ -29,8 +29,8 @@
static const char copyright[] = static const char copyright[] =
"Copyright (C) 1997, Massachusetts Institute of Technology\r\n"; "Copyright (C) 1997, Massachusetts Institute of Technology\r\n";
static const char rcsid[] = #include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
"$FreeBSD$"; __FBSDID("$FreeBSD$");
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

6
usr.sbin/lpr/common_source/rmjob.c
View File

@ -31,13 +31,11 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef lint
#if 0 #if 0
static char sccsid[] = "@(#)rmjob.c 8.2 (Berkeley) 4/28/95"; static char sccsid[] = "@(#)rmjob.c 8.2 (Berkeley) 4/28/95";
#endif #endif
static const char rcsid[] = #include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
"$FreeBSD$"; __FBSDID("$FreeBSD$");
#endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
#include <sys/uio.h> #include <sys/uio.h>

7
usr.sbin/lpr/common_source/startdaemon.c
View File

@ -31,14 +31,11 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef lint
#if 0 #if 0
static char sccsid[] = "@(#)startdaemon.c 8.2 (Berkeley) 4/17/94"; static char sccsid[] = "@(#)startdaemon.c 8.2 (Berkeley) 4/17/94";
#endif #endif
static const char rcsid[] = #include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
"$FreeBSD$"; __FBSDID("$FreeBSD$");
#endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
#include <sys/socket.h> #include <sys/socket.h>