summaryrefslogtreecommitdiffstats
path: root/usr.sbin/lpr/common_source/printcap.c
diff options
context:
space:
mode:
authorgad <gad@FreeBSD.org>2001-06-12 16:38:20 +0000
committergad <gad@FreeBSD.org>2001-06-12 16:38:20 +0000
commitd61428321f0ceb41de748a616b592b50195c51fb (patch)
tree115b09aed7f19dda18dbe2e66eba92a08b0d2441 /usr.sbin/lpr/common_source/printcap.c
parentb39990d7f9947621a844c7a4936eeb286a471c47 (diff)
downloadFreeBSD-src-d61428321f0ceb41de748a616b592b50195c51fb.zip
FreeBSD-src-d61428321f0ceb41de748a616b592b50195c51fb.tar.gz
Fix about 90-100 warnings one gets when trying to compile lpr&friends
with BDECFLAGS on, mainly by adding 'const' to parameters in a number of routine declarations. While I'm at it, ANSI-fy all of the routine declarations. The resulting object code is exactly the same after this update as before it, with the exception of one unavoidable change to lpd.o on freebsd/alpha. Also added $FreeBSD$ line to lpc/extern.h lpc/lpc.h lptest/lptest.c Reviewed by: /sbin/md5, and no feedback from freebsd-audit
Diffstat (limited to 'usr.sbin/lpr/common_source/printcap.c')
-rw-r--r--usr.sbin/lpr/common_source/printcap.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/lpr/common_source/printcap.c b/usr.sbin/lpr/common_source/printcap.c
index 390de46..d70c5b1 100644
--- a/usr.sbin/lpr/common_source/printcap.c
+++ b/usr.sbin/lpr/common_source/printcap.c
@@ -58,14 +58,16 @@ static const char rcsid[] =
/*
* Routines and data used in processing the printcap file.
*/
-static char *printcapdb[2] = { _PATH_PRINTCAP, 0 }; /* list for cget* */
+static char *printcapdb[2] = { _PATH_PRINTCAP, 0 }; /* list for cget* */
-static char *capdb_canonical_name(const char *);
-static int capdb_getaltlog(char *, const char *, const char *);
-static int capdb_getaltnum(char *, const char *, const char *, long, long *);
-static int capdb_getaltstr(char *, const char *, const char *, const char *,
- char **);
-static int getprintcap_int(char *bp, struct printer *pp);
+static char *capdb_canonical_name(const char *_bp);
+static int capdb_getaltlog(char *_bp, const char *_shrt,
+ const char *_lng);
+static int capdb_getaltnum(char *_bp, const char *_shrt,
+ const char *_lng, long _dflt, long *_result);
+static int capdb_getaltstr(char *_bp, const char *_shrt,
+ const char *lng, const char *_dflt, char **_result);
+static int getprintcap_int(char *_bp, struct printer *_pp);
/*
* Change the name of the printcap file. Used by chkprintcap(8),
@@ -210,9 +212,7 @@ static const char *longfilters[] = {
* and store a malloced copy of it in pp->printer.
*/
static int
-getprintcap_int(bp, pp)
- char *bp;
- struct printer *pp;
+getprintcap_int(char *bp, struct printer *pp)
{
enum lpd_filters filt;
char *rp_name;
@@ -371,7 +371,7 @@ free_printer(struct printer *pp)
*/
static int
capdb_getaltstr(char *bp, const char *shrt, const char *lng,
- const char *dflt, char **result)
+ const char *dflt, char **result)
{
int status;
@@ -395,7 +395,7 @@ capdb_getaltstr(char *bp, const char *shrt, const char *lng,
*/
static int
capdb_getaltnum(char *bp, const char *shrt, const char *lng, long dflt,
- long *result)
+ long *result)
{
int status;
OpenPOWER on IntegriCloud