summaryrefslogtreecommitdiffstats
path: root/usr.sbin/lpr
diff options
context:
space:
mode:
authorgad <gad@FreeBSD.org>2003-07-15 08:48:30 +0000
committergad <gad@FreeBSD.org>2003-07-15 08:48:30 +0000
commit77121414dda7ed884fa4e22e6f13e2bc474a7c0b (patch)
tree29d08cb1a84767e0f44e65738fa2788566a578e1 /usr.sbin/lpr
parent33bafddbc518c46941c9af1efad83f6dd0c00be0 (diff)
downloadFreeBSD-src-77121414dda7ed884fa4e22e6f13e2bc474a7c0b.zip
FreeBSD-src-77121414dda7ed884fa4e22e6f13e2bc474a7c0b.tar.gz
(Hopefully) Last set of changes so all of lpr uses __FBSDID() for
setting rcsids, and uses a consistent format for 'sccsid' lines. Reviewed by: discussed with bde and obrien MFC after: 15 days
Diffstat (limited to 'usr.sbin/lpr')
-rw-r--r--usr.sbin/lpr/chkprintcap/chkprintcap.c5
-rw-r--r--usr.sbin/lpr/chkprintcap/skimprintcap.c6
-rw-r--r--usr.sbin/lpr/lpq/lpq.c9
-rw-r--r--usr.sbin/lpr/lprm/lprm.c9
-rw-r--r--usr.sbin/lpr/pac/pac.c9
5 files changed, 20 insertions, 18 deletions
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.c b/usr.sbin/lpr/chkprintcap/chkprintcap.c
index 5a5592b..91e8299 100644
--- a/usr.sbin/lpr/chkprintcap/chkprintcap.c
+++ b/usr.sbin/lpr/chkprintcap/chkprintcap.c
@@ -29,8 +29,9 @@
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 <sys/cdefs.h> */
+__FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.sbin/lpr/chkprintcap/skimprintcap.c b/usr.sbin/lpr/chkprintcap/skimprintcap.c
index e3cb485..da28282 100644
--- a/usr.sbin/lpr/chkprintcap/skimprintcap.c
+++ b/usr.sbin/lpr/chkprintcap/skimprintcap.c
@@ -31,10 +31,8 @@
* ------+---------+---------+---------+---------+---------+---------+---------*
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD$");
#include <sys/types.h>
diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c
index 734750d..e1809cf 100644
--- a/usr.sbin/lpr/lpq/lpq.c
+++ b/usr.sbin/lpr/lpq/lpq.c
@@ -38,13 +38,14 @@ static const char copyright[] =
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
+#if 0
#ifndef lint
-/*
static char sccsid[] = "@(#)lpq.c 8.3 (Berkeley) 5/10/95";
-*/
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
+#endif
+
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD$");
/*
* Spool Queue examination program
diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c
index 7c27a26..47f233c 100644
--- a/usr.sbin/lpr/lprm/lprm.c
+++ b/usr.sbin/lpr/lprm/lprm.c
@@ -38,13 +38,14 @@ static const char copyright[] =
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
-#ifndef lint
#if 0
+#ifndef lint
static char sccsid[] = "@(#)lprm.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
+#endif
+
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD$");
/*
* lprm - remove the current user's spool entry
diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c
index c948f24..34a247f 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -38,13 +38,14 @@ static const char copyright[] =
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
-#ifndef lint
#if 0
+#ifndef lint
static char sccsid[] = "@(#)pac.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
+#endif
+
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD$");
/*
* Do Printer accounting summary.
OpenPOWER on IntegriCloud