Index: usr.sbin/lpr/common_source/printcap.c
===================================================================
--- usr.sbin/lpr/common_source/printcap.c (revision 347012)
+++ usr.sbin/lpr/common_source/printcap.c (working copy)
@@ -99,15 +99,9 @@
getprintcap(const char *printer, struct printer *pp)
{
int status;
- char *XXX;
char *bp;
- /*
- * A bug in the declaration of cgetent(3) means that we have
- * to hide the constness of its third argument.
- */
- XXX = (char *)printer;
- if ((status = cgetent(&bp, printcapdb, XXX)) < 0)
+ if ((status = cgetent(&bp, printcapdb, printer)) < 0)
return status;
status = getprintcap_int(bp, pp);
free(bp);
@@ -380,10 +374,10 @@
{
int status;
- status = cgetstr(bp, (char *)/*XXX*/lng, result);
+ status = cgetstr(bp, lng, result);
if (status >= 0 || status == PCAPERR_OSERR)
return status;
- status = cgetstr(bp, (char *)/*XXX*/shrt, result);
+ status = cgetstr(bp, shrt, result);
if (status >= 0 || status == PCAPERR_OSERR)
return status;
if (dflt) {
@@ -404,10 +398,10 @@
{
int status;
- status = cgetnum(bp, (char *)/*XXX*/lng, result);
+ status = cgetnum(bp, lng, result);
if (status >= 0)
return status;
- status = cgetnum(bp, (char *)/*XXX*/shrt, result);
+ status = cgetnum(bp, shrt, result);
if (status >= 0)
return status;
*result = dflt;
@@ -421,9 +415,9 @@
static int
capdb_getaltlog(char *bp, const char *shrt, const char *lng)
{
- if (cgetcap(bp, (char *)/*XXX*/lng, ':'))
+ if (cgetcap(bp, lng, ':'))
return 1;
- if (cgetcap(bp, (char *)/*XXX*/shrt, ':'))
+ if (cgetcap(bp, shrt, ':'))
return 1;
return 0;
}