summaryrefslogtreecommitdiffstats
path: root/usr.sbin/lpr
diff options
context:
space:
mode:
authorgad <gad@FreeBSD.org>2003-07-14 22:24:28 +0000
committergad <gad@FreeBSD.org>2003-07-14 22:24:28 +0000
commit5ecf206bdeaff7188680193fa691cc07690809e6 (patch)
tree23bb523c7eb4fad0439ccbbb26b7176aa8b0bdef /usr.sbin/lpr
parente8546e1e8a0c12670c5aae26dd37842101f1b0a2 (diff)
downloadFreeBSD-src-5ecf206bdeaff7188680193fa691cc07690809e6.zip
FreeBSD-src-5ecf206bdeaff7188680193fa691cc07690809e6.tar.gz
More changes to use __FBSDID() for setting rcsids, and fix the
format of 'sccsid' lines so they consistently match style(9) guidelines. Note that this means you will have to add '-a' to the 'strings' command when searching for rcs ids, eg: strings -a /usr/sbin/lpc | grep '$FreeBSD' Reviewed by: discussed on cvs-src & with bde and obrien MFC after: 15 days
Diffstat (limited to 'usr.sbin/lpr')
-rw-r--r--usr.sbin/lpr/lpc/cmds.c9
-rw-r--r--usr.sbin/lpr/lpc/cmdtab.c9
-rw-r--r--usr.sbin/lpr/lpc/extern.h2
-rw-r--r--usr.sbin/lpr/lpc/lpc.c9
-rw-r--r--usr.sbin/lpr/lpc/movejobs.c6
5 files changed, 17 insertions, 18 deletions
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c
index 79fbe84..06ea4b0 100644
--- a/usr.sbin/lpr/lpc/cmds.c
+++ b/usr.sbin/lpr/lpc/cmds.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[] = "@(#)cmds.c 8.2 (Berkeley) 4/28/95";
-*/
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
+#endif
+
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD$");
/*
* lpc -- line printer control program -- commands:
diff --git a/usr.sbin/lpr/lpc/cmdtab.c b/usr.sbin/lpr/lpc/cmdtab.c
index 045bc34..21dc6e1c 100644
--- a/usr.sbin/lpr/lpc/cmdtab.c
+++ b/usr.sbin/lpr/lpc/cmdtab.c
@@ -31,15 +31,14 @@
* SUCH DAMAGE.
*/
+#if 0
#ifndef lint
-/*
static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
-*/
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
+#endif
-#include <sys/cdefs.h>
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD$");
#include "lpc.h"
#include "extern.h"
diff --git a/usr.sbin/lpr/lpc/extern.h b/usr.sbin/lpr/lpc/extern.h
index ee9fe97..fe82d46 100644
--- a/usr.sbin/lpr/lpc/extern.h
+++ b/usr.sbin/lpr/lpc/extern.h
@@ -38,7 +38,7 @@
#include <sys/types.h>
-#include <sys/cdefs.h>
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
/*
* Options for setup_myprinter().
diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c
index d681bb6..a559e0a 100644
--- a/usr.sbin/lpr/lpc/lpc.c
+++ b/usr.sbin/lpr/lpc/lpc.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[] = "@(#)lpc.c 8.3 (Berkeley) 4/28/95";
-#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* not lint */
+#endif
+
+#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD$");
#include <sys/param.h>
diff --git a/usr.sbin/lpr/lpc/movejobs.c b/usr.sbin/lpr/lpc/movejobs.c
index 08b805d..60c9b38 100644
--- a/usr.sbin/lpr/lpc/movejobs.c
+++ b/usr.sbin/lpr/lpc/movejobs.c
@@ -32,10 +32,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$");
/*
* movejobs.c - The lpc commands which move jobs around.
OpenPOWER on IntegriCloud