Squash warnings: Contrib devices

Workaround as many warnings as possible in the contrib devices.

Removing dead code, checking return values etc, fixing type casts
(char to unsigned char etc).

7 files changed, 14 insertions, 14 deletions

diff --git a/contrib/japanese/gdev10v.c b/contrib/japanese/gdev10v.c
index 62aa06dd3..5c8b7fb3d 100644
--- a/contrib/japanese/gdev10v.c
+++ b/contrib/japanese/gdev10v.c
@@ -183,7 +183,7 @@ prn_flush(gx_device_printer *pdev)
 
 static void
 bj10v_output_run(byte *data, int dnum, int bytes,
-                                 char *mode, gx_device_printer *pdev)
+                 const char *mode, gx_device_printer *pdev)
 {
         prn_putc(pdev, '\033');
         prn_puts(pdev, mode);
@@ -198,7 +198,7 @@ bj10v_print_page(gx_device_printer *pdev, FILE *prn_stream)
 {	int line_size = gdev_prn_raster((gx_device *)pdev);
         int xres = pdev->x_pixels_per_inch;
         int yres = pdev->y_pixels_per_inch;
-        char *mode = (yres == 180 ?
+        const char *mode = (yres == 180 ?
                       (xres == 180 ? "\052\047" : "\052\050") :
                       "|*");
         int bits_per_column = 24 * (yres / 180);
diff --git a/contrib/japanese/gdevalps.c b/contrib/japanese/gdevalps.c
index 6bbc70c75..f29aeb18f 100644
--- a/contrib/japanese/gdevalps.c
+++ b/contrib/japanese/gdevalps.c
@@ -201,6 +201,8 @@ md50_print_page(gx_device_printer *pdev, FILE *prn_stream,
     memset(data, 0, LINE_SIZE);
     n = gdev_prn_copy_scan_lines(pdev, lnum,
                              (byte *)data, line_size);
+    if (n != 1)
+      return n;
 
     /* Remove trailing 0s. */
     while ( end_data > data && end_data[-1] == 0 )
diff --git a/contrib/japanese/gdevespg.c b/contrib/japanese/gdevespg.c
index 30765bc3c..21c476b83 100644
--- a/contrib/japanese/gdevespg.c
+++ b/contrib/japanese/gdevespg.c
@@ -60,7 +60,7 @@ lprn_duplex_device(gx_device_lprn, escpage_prn_procs, "escpage",
 
 #define ppdev ((gx_device_printer *)pdev)
 
-static char *epson_remote_start = "\033\001@EJL \r\n";
+static const char *epson_remote_start = "\033\001@EJL \r\n";
 
 /* Open the printer. */
 static int
diff --git a/contrib/japanese/gdevfmpr.c b/contrib/japanese/gdevfmpr.c
index d7b9244b3..2243b2c3a 100644
--- a/contrib/japanese/gdevfmpr.c
+++ b/contrib/japanese/gdevfmpr.c
@@ -50,13 +50,13 @@ prn_putc(gx_device_printer *pdev, int c)
 }
 
 static int
-prn_puts(gx_device_printer *pdev, char *ptr)
+prn_puts(gx_device_printer *pdev, const char *ptr)
 {
   return fputs(ptr, pdev->file);
 }
 
 static int
-prn_write(gx_device_printer *pdev, char *ptr, int size)
+prn_write(gx_device_printer *pdev, const char *ptr, int size)
 {
   return fwrite(ptr, 1, size, pdev->file);
 }
@@ -192,7 +192,7 @@ fmpr_print_page(gx_device_printer *pdev, FILE *prn_stream)
     size = out_end - out_beg + 1;
     gs_sprintf(prn_buf, "\033Q%d W", size / bytes_per_column);
     prn_puts(pdev, prn_buf);
-    prn_write(pdev, out_beg, size);
+    prn_write(pdev, (const char *)out_beg, size);
 
     prn_putc(pdev, '\n');
   }
diff --git a/contrib/japanese/gdevlbp3.c b/contrib/japanese/gdevlbp3.c
index eef8e0cf9..e1db9aa54 100644
--- a/contrib/japanese/gdevlbp3.c
+++ b/contrib/japanese/gdevlbp3.c
@@ -72,7 +72,7 @@ static int
 lbp310PrintPage(gx_device_printer *pDev, FILE *fp)
 {
         int	i;
-        byte	Buf[10];
+        char	Buf[10];
         long	DataSize;
         struct	bounding	Box;
 
@@ -81,7 +81,7 @@ lbp310PrintPage(gx_device_printer *pDev, FILE *fp)
         DataSize = CompressImage(pDev, &Box, fp, "\x1b[1;%d;%d;11;%d;.r");
 
         /* ----==== Set size ====---- */
-        gs_sprintf((char *)Buf, "0%ld", DataSize);
+        gs_sprintf(Buf, "0%ld", DataSize);
         i = (DataSize+strlen(Buf)+1)&1;
         /* ----==== escape to LIPS ====---- */
         fprintf(fp, "\x80%s\x80\x80\x80\x80\x0c",Buf+i);
@@ -94,7 +94,7 @@ static int
 lbp320PrintPage(gx_device_printer *pDev, FILE *fp)
 {
         int	i;
-        byte	Buf[16];
+        char	Buf[16];
         long	DataSize;
         struct	bounding	Box;
 
@@ -110,7 +110,7 @@ lbp320PrintPage(gx_device_printer *pDev, FILE *fp)
         DataSize = CompressImage(pDev, &Box, fp, "\x1b[1;%d;%d;11;%d;.&r");
 
         /* ----==== Set size ====---- */
-        gs_sprintf((char *)Buf, "000%ld", DataSize);
+        gs_sprintf(Buf, "000%ld", DataSize);
         i = (DataSize+strlen(Buf)+1)&3;
         /* ----==== escape to LIPS ====---- */
         fprintf(fp, "\x80%s\x80\x80\x80\x80\x0c",Buf+i);
diff --git a/contrib/japanese/gdevmag.c b/contrib/japanese/gdevmag.c
index b61888c68..455edcde5 100644
--- a/contrib/japanese/gdevmag.c
+++ b/contrib/japanese/gdevmag.c
@@ -99,7 +99,7 @@ mag_print_page(gx_device_printer *pdev, int depth, FILE *file)
 {
     int code = 0;			/* return code */
     const char *magic = "MAKI02  gs   ";
-    char *user = getenv("USER");
+    const char *user = getenv("USER");
     char check[256];
     byte header[32] = "\000\000\000\000"
                       "\000\000\000\000"
diff --git a/contrib/japanese/gdevml6.c b/contrib/japanese/gdevml6.c
index 3562a3ba2..79943be26 100644
--- a/contrib/japanese/gdevml6.c
+++ b/contrib/japanese/gdevml6.c
@@ -158,9 +158,7 @@ ml600_print_page(
         rmask = (byte)(0xff << (-pdev->width & 7));	/* right edge */
 
         for (lnum = 0; lnum < pdev->height; lnum++) {
-                int	s;
-
-                s = gdev_prn_copy_scan_lines(pdev, lnum, data[current],
+                (void)gdev_prn_copy_scan_lines(pdev, lnum, data[current],
                                                                 line_size);
                 /* Mask right edge bits */
                 *(data[current] + line_size - 1) &= rmask;