Squash miscellaneous warnings.

Remove some redundant variables, and tweak code to avoid compiler
warnings.

20 files changed, 2 insertions, 105 deletions

diff --git a/contrib/pcl3/eprn/eprnfs.c b/contrib/pcl3/eprn/eprnfs.c
index 16560b4c5..d1557f409 100644
--- a/contrib/pcl3/eprn/eprnfs.c
+++ b/contrib/pcl3/eprn/eprnfs.c
@@ -22,12 +22,6 @@
 
 ******************************************************************************/
 
-/* Configuration management identification */
-#ifndef lint
-static const char
-  cm_id[] = "@(#)$Id: eprnfs.c,v 1.6 2001/05/01 07:02:01 Martin Rel $";
-#endif
-
 /*****************************************************************************/
 
 #ifndef _XOPEN_SOURCE
diff --git a/contrib/pcl3/eprn/eprnparm.c b/contrib/pcl3/eprn/eprnparm.c
index 041c24ae8..bde723cc5 100644
--- a/contrib/pcl3/eprn/eprnparm.c
+++ b/contrib/pcl3/eprn/eprnparm.c
@@ -32,12 +32,6 @@
 
 ******************************************************************************/
 
-/* Configuration management identification */
-#ifndef lint
-static const char
-  cm_id[] = "@(#)$Id: eprnparm.c,v 1.24 2001/08/18 17:42:34 Martin Rel $";
-#endif
-
 /*****************************************************************************/
 
 #ifndef _XOPEN_SOURCE
diff --git a/contrib/pcl3/eprn/eprnrend.c b/contrib/pcl3/eprn/eprnrend.c
index e465eb518..49f806941 100644
--- a/contrib/pcl3/eprn/eprnrend.c
+++ b/contrib/pcl3/eprn/eprnrend.c
@@ -44,12 +44,6 @@
 
 ******************************************************************************/
 
-/* Configuration management identification */
-#ifndef lint
-static const char
-  cm_id[] = "@(#)$Id: eprnrend.c,v 1.15 2001/08/01 05:12:56 Martin Rel $";
-#endif
-
 /*****************************************************************************/
 
 #ifndef _XOPEN_SOURCE
diff --git a/contrib/pcl3/eprn/gdeveprn.c b/contrib/pcl3/eprn/gdeveprn.c
index a1d7f1e81..c457ee78c 100644
--- a/contrib/pcl3/eprn/gdeveprn.c
+++ b/contrib/pcl3/eprn/gdeveprn.c
@@ -33,12 +33,6 @@
 
 ******************************************************************************/
 
-/* Configuration management identification */
-#ifndef lint
-static const char
-  cm_id[] = "@(#)$Id: gdeveprn.c,v 1.25 2001/04/30 05:15:51 Martin Rel $";
-#endif
-
 /*****************************************************************************/
 
 #ifndef _XOPEN_SOURCE
diff --git a/contrib/pcl3/eprn/gdeveprn.h b/contrib/pcl3/eprn/gdeveprn.h
index 6bec709c1..75d5b56d2 100644
--- a/contrib/pcl3/eprn/gdeveprn.h
+++ b/contrib/pcl3/eprn/gdeveprn.h
@@ -173,9 +173,6 @@
 #ifndef _gdeveprn_h	/* Inclusion protection */
 #define _gdeveprn_h
 
-/* Configuration management identification */
-#pragma ident "@(#)$Id: gdeveprn.h,v 1.23 2001/04/30 05:15:51 Martin Rel $"
-
 /*****************************************************************************/
 
 /* Special Aladdin header, must be included before <sys/types.h> on some
diff --git a/contrib/pcl3/eprn/mediasize.c b/contrib/pcl3/eprn/mediasize.c
index 04c9a2af3..8cfe3d916 100644
--- a/contrib/pcl3/eprn/mediasize.c
+++ b/contrib/pcl3/eprn/mediasize.c
@@ -11,12 +11,6 @@
 *									      *
 ******************************************************************************/
 
-/* Configuration management identification */
-#ifndef lint
-static const char
-  cm_id[] = "@(#)$Id: mediasize.c,v 1.11 2001/04/12 18:35:26 Martin Rel $";
-#endif
-
 /*****************************************************************************/
 
 #ifndef _XOPEN_SOURCE
diff --git a/contrib/pcl3/eprn/mediasize.h b/contrib/pcl3/eprn/mediasize.h
index fab1e6886..8553b6eaa 100644
--- a/contrib/pcl3/eprn/mediasize.h
+++ b/contrib/pcl3/eprn/mediasize.h
@@ -14,9 +14,6 @@
 #ifndef _mediasize_h	/* Inclusion protection */
 #define _mediasize_h
 
-/* Configuration management identification */
-#pragma ident "@(#)$Id: mediasize.h,v 1.11 2001/04/12 18:35:26 Martin Rel $"
-
 /*****************************************************************************/
 
 /* Macros for conversion between units.
diff --git a/contrib/pcl3/eprn/pagecount.c b/contrib/pcl3/eprn/pagecount.c
index d83d8b275..2af073228 100644
--- a/contrib/pcl3/eprn/pagecount.c
+++ b/contrib/pcl3/eprn/pagecount.c
@@ -16,12 +16,6 @@
 int dummy;
 #else
 
-/* Configuration management identification */
-#ifndef lint
-static const char
-  cm_id[] = "@(#)$Id: pagecount.c,v 1.6 2000/10/07 17:48:49 Martin Rel $";
-#endif
-
 /*****************************************************************************/
 
 #ifndef _XOPEN_SOURCE
diff --git a/contrib/pcl3/eprn/pagecount.h b/contrib/pcl3/eprn/pagecount.h
index 1fb3fad4d..6acd3341e 100644
--- a/contrib/pcl3/eprn/pagecount.h
+++ b/contrib/pcl3/eprn/pagecount.h
@@ -18,9 +18,6 @@
 #define EPRN_NO_PAGECOUNTFILE
 #else
 
-/* Configuration management identification */
-#pragma ident "@(#)$Id: pagecount.h,v 1.3 2000/11/19 07:05:17 Martin Rel $"
-
 /*****************************************************************************/
 
 /*  The following two functions are used to read and write a "page count file".
diff --git a/contrib/pcl3/src/gdevpcl3.c b/contrib/pcl3/src/gdevpcl3.c
index 7f1fcc68b..a763cf72e 100644
--- a/contrib/pcl3/src/gdevpcl3.c
+++ b/contrib/pcl3/src/gdevpcl3.c
@@ -23,12 +23,6 @@
 
 ******************************************************************************/
 
-/* Configuration management identification */
-#ifndef lint
-static const char
-  cm_id[] = "@(#)$Id: gdevpcl3.c,v 1.32 2001/08/14 15:22:35 Martin Rel $";
-#endif
-
 /*****************************************************************************/
 
 #ifndef _XOPEN_SOURCE
@@ -127,7 +121,7 @@ static const ms_MediaCode
 /*****************************************************************************/
 
 /* Forward declaration */
-static void pcl3_flag_mismatch_reporter(FILE *err,
+static void pcl3_flag_mismatch_reporter(
   const struct s_eprn_Device *eprn, bool no_match);
 
 /* Macro for creating device structure instances */
@@ -428,7 +422,7 @@ static void init(pcl3_Device *dev)
 
 ******************************************************************************/
 
-static void pcl3_flag_mismatch_reporter(FILE *err,
+static void pcl3_flag_mismatch_reporter(
   const struct s_eprn_Device *eprn, bool no_match)
 {
   const char *epref = eprn->CUPS_messages? CUPS_ERRPREF: "";
diff --git a/contrib/pcl3/src/pcl3opts.c b/contrib/pcl3/src/pcl3opts.c
index c624c9990..77a8fd57b 100644
--- a/contrib/pcl3/src/pcl3opts.c
+++ b/contrib/pcl3/src/pcl3opts.c
@@ -13,12 +13,6 @@
 *									      *
 ******************************************************************************/
 
-/* Configuration management identification */
-#ifndef lint
-static char
-  cm_id[] = "@(#)$Id: pcl3opts.c,v 1.17 2001/05/31 15:19:16 Martin Rel $";
-#endif
-
 /*****************************************************************************/
 
 #ifndef _XOPEN_SOURCE
diff --git a/contrib/pcl3/src/pclcap.c b/contrib/pcl3/src/pclcap.c
index c1195f137..f07b93a29 100644
--- a/contrib/pcl3/src/pclcap.c
+++ b/contrib/pcl3/src/pclcap.c
@@ -11,12 +11,6 @@
 *									      *
 ******************************************************************************/
 
-/* Configuration management identification */
-#ifndef lint
-static const char
-  cm_id[] = "@(#)$Id: pclcap.c,v 1.17 2001/03/08 09:17:51 Martin Rel $";
-#endif
-
 /*****************************************************************************/
 
 #ifndef _XOPEN_SOURCE
diff --git a/contrib/pcl3/src/pclcap.h b/contrib/pcl3/src/pclcap.h
index 3ae4cf15b..0b461989e 100644
--- a/contrib/pcl3/src/pclcap.h
+++ b/contrib/pcl3/src/pclcap.h
@@ -14,9 +14,6 @@
 #ifndef _pclcap_h	/* Inclusion protection */
 #define _pclcap_h
 
-/* Configuration management identification */
-#pragma ident "@(#)$Id: pclcap.h,v 1.10 2000/11/19 07:05:17 Martin Rel $"
-
 /*****************************************************************************/
 
 #include "gdeveprn.h"
diff --git a/contrib/pcl3/src/pclcomp.c b/contrib/pcl3/src/pclcomp.c
index f3be31bb1..ea849ec04 100644
--- a/contrib/pcl3/src/pclcomp.c
+++ b/contrib/pcl3/src/pclcomp.c
@@ -16,12 +16,6 @@
 
 ******************************************************************************/
 
-/* Configuration management identification */
-#ifndef lint
-static const char
-  cm_id[] = "@(#)$Id: pclcomp.c,v 1.11 2000/10/07 17:51:57 Martin Rel $";
-#endif
-
 /*****************************************************************************/
 
 #ifndef _XOPEN_SOURCE
diff --git a/contrib/pcl3/src/pclgen.c b/contrib/pcl3/src/pclgen.c
index 29a1cc7b1..ad71c34e1 100644
--- a/contrib/pcl3/src/pclgen.c
+++ b/contrib/pcl3/src/pclgen.c
@@ -49,12 +49,6 @@
 
 ******************************************************************************/
 
-/* Configuration management identification */
-#ifndef lint
-static const char
-  cm_id[] = "@(#)$Id: pclgen.c,v 1.21 2001/04/29 10:37:08 Martin Rel $";
-#endif
-
 /*****************************************************************************/
 
 #ifndef _XOPEN_SOURCE
diff --git a/contrib/pcl3/src/pclgen.h b/contrib/pcl3/src/pclgen.h
index 6e8bd5b4b..c4d693447 100644
--- a/contrib/pcl3/src/pclgen.h
+++ b/contrib/pcl3/src/pclgen.h
@@ -22,9 +22,6 @@
 #ifndef _pclgen_h	/* Inclusion protection */
 #define _pclgen_h
 
-/* Configuration management identification */
-#pragma ident "@(#)$Id: pclgen.h,v 1.25 2001/08/18 17:41:29 Martin Rel $"
-
 /*****************************************************************************/
 
 /* Standard headers */
diff --git a/contrib/pcl3/src/pclscan.c b/contrib/pcl3/src/pclscan.c
index 725c0e544..461023cd2 100644
--- a/contrib/pcl3/src/pclscan.c
+++ b/contrib/pcl3/src/pclscan.c
@@ -11,12 +11,6 @@
 *									      *
 ******************************************************************************/
 
-/* Configuration management identification */
-#ifndef lint
-static const char
-  cm_id[] = "@(#)$Id: pclscan.c,v 1.8 2000-10-22 11:05:34+02 Martin Rel $";
-#endif
-
 /*****************************************************************************/
 
 #ifndef _XOPEN_SOURCE
diff --git a/contrib/pcl3/src/pclscan.h b/contrib/pcl3/src/pclscan.h
index a3232dad1..33ee5d969 100644
--- a/contrib/pcl3/src/pclscan.h
+++ b/contrib/pcl3/src/pclscan.h
@@ -14,13 +14,6 @@
 #ifndef _pclscan_h	/* Inclusion protection */
 #define _pclscan_h
 
-/* Configuration management identification */
-#ifdef __GNUC__
-#ident "@(#)$Id: pclscan.h,v 1.6 2000-10-22 11:05:34+02 Martin Rel $"
-#else
-#pragma ident "@(#)$Id: pclscan.h,v 1.6 2000-10-22 11:05:34+02 Martin Rel $"
-#endif
-
 /*****************************************************************************/
 
 /* Standard headers */
diff --git a/contrib/pcl3/src/pclsize.c b/contrib/pcl3/src/pclsize.c
index 511e6fa4e..831b82bc8 100644
--- a/contrib/pcl3/src/pclsize.c
+++ b/contrib/pcl3/src/pclsize.c
@@ -11,12 +11,6 @@
 *									      *
 ******************************************************************************/
 
-/* Configuration management identification */
-#ifndef lint
-static const char
-  cm_id[] = "@(#)$Id: pclsize.c,v 1.10 2001/08/18 17:41:49 Martin Rel $";
-#endif
-
 /*****************************************************************************/
 
 #ifndef _XOPEN_SOURCE
diff --git a/contrib/pcl3/src/pclsize.h b/contrib/pcl3/src/pclsize.h
index 13a246e77..90a5320ef 100644
--- a/contrib/pcl3/src/pclsize.h
+++ b/contrib/pcl3/src/pclsize.h
@@ -15,9 +15,6 @@
 #ifndef _pclsize_h	/* Inclusion protection */
 #define _pclsize_h
 
-/* Configuration management identification */
-#pragma ident "@(#)$Id: pclsize.h,v 1.7 2000/11/19 07:05:17 Martin Rel $"
-
 /*****************************************************************************/
 
 #include "mediasize.h"