summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorRobin Watts <robin.watts@artifex.com>2016-01-04 14:10:04 +0000
committerRobin Watts <robin.watts@artifex.com>2016-01-04 14:11:35 +0000
commit998c8bf7a2e409b6c4c29b8e535028a24404e7c5 (patch)
treed1c213bbf092ca94d78eb1bb4e37ae600a961d69 /contrib
parent39cdb5df0e2f8e3e4410e008b2a7fb72dcdff805 (diff)
downloadghostpdl-998c8bf7a2e409b6c4c29b8e535028a24404e7c5.tar.gz
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).
Diffstat (limited to 'contrib')
-rw-r--r--contrib/eplaser/gdevescv.c184
-rw-r--r--contrib/gdevmd2k.c4
-rw-r--r--contrib/japanese/gdev10v.c4
-rw-r--r--contrib/japanese/gdevalps.c2
-rw-r--r--contrib/japanese/gdevespg.c2
-rw-r--r--contrib/japanese/gdevfmpr.c6
-rw-r--r--contrib/japanese/gdevlbp3.c8
-rw-r--r--contrib/japanese/gdevmag.c2
-rw-r--r--contrib/japanese/gdevml6.c4
-rw-r--r--contrib/lips4/gdevl4r.c10
-rw-r--r--contrib/lips4/gdevl4v.c14
-rw-r--r--contrib/opvp/gdevopvp.c3
-rw-r--r--contrib/pcl3/eprn/eprnparm.c6
-rw-r--r--contrib/pcl3/src/gdevpcl3.c12
14 files changed, 133 insertions, 128 deletions
diff --git a/contrib/eplaser/gdevescv.c b/contrib/eplaser/gdevescv.c
index a6a303801..189e778bb 100644
--- a/contrib/eplaser/gdevescv.c
+++ b/contrib/eplaser/gdevescv.c
@@ -433,7 +433,7 @@ static const gx_device_vector_procs escv_vector_procs =
};
static void escv_write_begin(gx_device *dev, int bits, int x, int y, int sw, int sh, int dw, int dh, int roll);
-static void escv_write_data(gx_device *dev, int bits, char *buf, int bsize, int w, int ras);
+static void escv_write_data(gx_device *dev, int bits, byte *buf, int bsize, int w, int ras);
static void escv_write_end(gx_device *dev, int bits);
/* ---------------- Utilities ---------------- */
@@ -513,7 +513,7 @@ escv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath,
bool do_close = (type & gx_path_type_stroke) != 0;
gs_fixed_rect rect;
gs_point scale;
- double x_start = 0, y_start = 0, x_prev = 0, y_prev = 0;
+ double x_start = 0, y_start = 0;
bool first = true;
gs_path_enum cenum;
int code;
@@ -535,88 +535,88 @@ escv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath,
pe_op = gx_path_enum_next(&cenum, (gs_fixed_point *) vs);
- sw:switch (pe_op) {
- case 0: /* done */
- return (*vdev_proc(vdev, endpath)) (vdev, type);
+ sw:
+ switch (pe_op) {
+ case 0: /* done */
+ return (*vdev_proc(vdev, endpath)) (vdev, type);
- case gs_pe_moveto:
- x = fixed2float(vs[0]) / scale.x;
- y = fixed2float(vs[1]) / scale.y;
+ case gs_pe_moveto:
+ x = fixed2float(vs[0]) / scale.x;
+ y = fixed2float(vs[1]) / scale.y;
- /* サブパス開始命令 p1 */
- (void)gs_sprintf(obuf, ESC_GS "0;%d;%dmvpG", (int)x, (int)y);
- lputs(s, obuf);
-
- if (first)
- x_start = x, y_start = y, first = false;
- break;
+ /* サブパス開始命令 p1 */
+ (void)gs_sprintf(obuf, ESC_GS "0;%d;%dmvpG", (int)x, (int)y);
+ lputs(s, obuf);
- case gs_pe_lineto:
- cnt = 1;
- for (pseg = cenum.pseg; pseg != 0 && pseg->type == s_line; cnt++, pseg = pseg->next);
+ if (first)
+ x_start = x, y_start = y, first = false;
+ break;
- (void)gs_sprintf(obuf, ESC_GS "0;%d", cnt);
- lputs(s, obuf);
+ case gs_pe_lineto:
+ cnt = 1;
+ for (pseg = cenum.pseg; pseg != 0 && pseg->type == s_line; cnt++, pseg = pseg->next);
- do {
- (void)gs_sprintf(obuf, ";%d;%d",
- (int)(fixed2float(vs[0]) / scale.x),
- (int)(fixed2float(vs[1]) / scale.y));
+ (void)gs_sprintf(obuf, ESC_GS "0;%d", cnt);
lputs(s, obuf);
- pe_op = gx_path_enum_next(&cenum, (gs_fixed_point *) vs);
- } while (pe_op == gs_pe_lineto);
+ do {
+ (void)gs_sprintf(obuf, ";%d;%d",
+ (int)(fixed2float(vs[0]) / scale.x),
+ (int)(fixed2float(vs[1]) / scale.y));
+ lputs(s, obuf);
- /* パス・ポリライン命令 */
- lputs(s, "lnpG");
- pdev->ispath = 1;
+ pe_op = gx_path_enum_next(&cenum, (gs_fixed_point *) vs);
+ } while (pe_op == gs_pe_lineto);
- goto sw;
+ /* パス・ポリライン命令 */
+ lputs(s, "lnpG");
+ pdev->ispath = 1;
- case gs_pe_curveto:
- cnt = 1;
- for (pseg = cenum.pseg; pseg != 0 && pseg->type == s_curve; cnt++, pseg = pseg->next);
- (void)gs_sprintf(obuf, ESC_GS "0;%d", cnt * 3);
- lputs(s, obuf);
+ goto sw;
- do {
- (void)gs_sprintf(obuf, ";%d;%d;%d;%d;%d;%d",
+ case gs_pe_curveto:
+ cnt = 1;
+ for (pseg = cenum.pseg; pseg != 0 && pseg->type == s_curve; cnt++, pseg = pseg->next);
+ (void)gs_sprintf(obuf, ESC_GS "0;%d", cnt * 3);
+ lputs(s, obuf);
+
+ do {
+ (void)gs_sprintf(obuf, ";%d;%d;%d;%d;%d;%d",
(int)(fixed2float(vs[0]) / scale.x), (int)(fixed2float(vs[1]) / scale.y),
(int)(fixed2float(vs[2]) / scale.x), (int)(fixed2float(vs[3]) / scale.y),
(int)(fixed2float(vs[4]) / scale.x), (int)(fixed2float(vs[5]) / scale.y));
- lputs(s, obuf);
+ lputs(s, obuf);
- pe_op = gx_path_enum_next(&cenum, (gs_fixed_point *) vs);
- } while (pe_op == gs_pe_curveto);
+ pe_op = gx_path_enum_next(&cenum, (gs_fixed_point *) vs);
+ } while (pe_op == gs_pe_curveto);
- /* ベジェ曲線 */
- lputs(s, "bzpG");
- pdev->ispath = 1;
+ /* ベジェ曲線 */
+ lputs(s, "bzpG");
+ pdev->ispath = 1;
- goto sw;
+ goto sw;
- case gs_pe_closepath:
- x = x_start, y = y_start;
- if (do_close) {
- lputs(s, ESC_GS "clpG");
- break;
- }
+ case gs_pe_closepath:
+ x = x_start, y = y_start;
+ if (do_close) {
+ lputs(s, ESC_GS "clpG");
+ break;
+ }
- pe_op = gx_path_enum_next(&cenum, (gs_fixed_point *) vs);
- if (pe_op != 0) {
- lputs(s, ESC_GS "clpG");
+ pe_op = gx_path_enum_next(&cenum, (gs_fixed_point *) vs);
+ if (pe_op != 0) {
+ lputs(s, ESC_GS "clpG");
- if (code < 0)
- return code;
- goto sw;
+ if (code < 0)
+ return code;
+ goto sw;
+ }
+ return (*vdev_proc(vdev, endpath)) (vdev, type);
+ default: /* can't happen */
+ return_error(gs_error_unknownerror);
}
- return (*vdev_proc(vdev, endpath)) (vdev, type);
- default: /* can't happen */
- return_error(gs_error_unknownerror);
- }
if (code < 0)
return code;
- x_prev = x, y_prev = y;
}
}
@@ -1260,7 +1260,7 @@ escv_beginpage(gx_device_vector * vdev)
lputs(s, LP8200_CODE);
}
- put_bytes(s, ESC_GS "7;0;2;0cam{E\012\000\000\000\000\000\000", 20);
+ put_bytes(s, (const byte *)ESC_GS "7;0;2;0cam{E\012\000\000\000\000\000\000", 20);
lputs(s, ESC_GS "0;0cmmE");
if (vdev->x_pixels_per_inch == 1200) {
@@ -1282,7 +1282,7 @@ escv_beginpage(gx_device_vector * vdev)
lputs(s, COLOR_START_CODE1);
lputs(s, ESC_GS "8;1;2;2;2plr{E");
- put_bytes(s, "\377\377\377\377\000\000\000\000", 8);
+ put_bytes(s, (const byte *)"\377\377\377\377\000\000\000\000", 8);
lputs(s, ESC_GS "0sarG"); /* 絶対座標指定 */
lputs(s, ESC_GS "2;204wfE"); /* rop 指定 */
@@ -1879,7 +1879,7 @@ escv_set_str_param( gs_param_list * plist, const char * key, char *strvalue, int
switch (code = param_read_string(plist, (param_name = key), &gsstr)) {
case 0:
writesize = ( bufmax < gsstr.size )? bufmax : gsstr.size ;
- strncpy( strvalue, gsstr.data, writesize );
+ strncpy( strvalue, (const char *)gsstr.data, writesize );
strvalue[ writesize ] = '\0';
break;
default:
@@ -2003,27 +2003,27 @@ escv_put_params(gx_device * dev, gs_param_list * plist)
goto pmediae;
} else { /* Check the validity of ``MediaType'' characters */
- if (strcmp(pmedia.data, "NM") == 0) {
+ if (strcmp((const char *)pmedia.data, "NM") == 0) {
pdev->MediaType = 0;
- } else if ((strcmp(pmedia.data, "THICK") == 0) ||
- (strcmp(pmedia.data, "TH") == 0)) {
+ } else if ((strcmp((const char *)pmedia.data, "THICK") == 0) ||
+ (strcmp((const char *)pmedia.data, "TH") == 0)) {
pdev->MediaType = 1;
- } else if ((strcmp(pmedia.data, "TRANS") == 0) ||
- (strcmp(pmedia.data, "TR") == 0)) {
+ } else if ((strcmp((const char *)pmedia.data, "TRANS") == 0) ||
+ (strcmp((const char *)pmedia.data, "TR") == 0)) {
pdev->MediaType = 2;
- } else if (strcmp(pmedia.data, "TN") == 0) {
+ } else if (strcmp((const char *)pmedia.data, "TN") == 0) {
pdev->MediaType = 3;
- } else if (strcmp(pmedia.data, "LH") == 0) {
+ } else if (strcmp((const char *)pmedia.data, "LH") == 0) {
pdev->MediaType = 4;
- } else if (strcmp(pmedia.data, "CT") == 0) {
+ } else if (strcmp((const char *)pmedia.data, "CT") == 0) {
pdev->MediaType = 5;
- } else if (strcmp(pmedia.data, "ET") == 0) {
+ } else if (strcmp((const char *)pmedia.data, "ET") == 0) {
pdev->MediaType = 6;
- } else if (strcmp(pmedia.data, "HQ") == 0) {
+ } else if (strcmp((const char *)pmedia.data, "HQ") == 0) {
pdev->MediaType = 7;
- } else if (strcmp(pmedia.data, "UT") == 0) {
+ } else if (strcmp((const char *)pmedia.data, "UT") == 0) {
pdev->MediaType = 8;
- } else if (strcmp(pmedia.data, "UM") == 0) {
+ } else if (strcmp((const char *)pmedia.data, "UM") == 0) {
pdev->MediaType = 9;
} else {
ecode = gs_error_rangecheck;
@@ -2494,7 +2494,7 @@ escv_begin_image(gx_device * dev,
gs_matrix imat;
int code;
- int ty, bx, by, cx, cy, dx, dy, sx, sy;
+ int ty, bx, by, cy, sx, sy;
gx_color_index color = gx_dc_pure_color(pdcolor);
char obuf[128];
@@ -2543,7 +2543,7 @@ escv_begin_image(gx_device * dev,
if( 0 == pdev->colormode ) { /* ESC/Page (Monochrome) */
} else { /* ESC/Page-Color */
lputs(s, ESC_GS "8;1;2;2;2plr{E");
- put_bytes(s, "\000\000\000\000\377\377\377\377", 8);
+ put_bytes(s, (const byte *)"\000\000\000\000\377\377\377\377", 8);
} /* ESC/Page-Color */
pdev->MaskReverse = 0;
}
@@ -2556,10 +2556,7 @@ escv_begin_image(gx_device * dev,
ty = imat.ty;
bx = imat.xx * pim->Width + imat.yx * pim->Height + imat.tx;
by = imat.xy * pim->Width + imat.yy * pim->Height + imat.ty;
- cx = imat.yx * pim->Height + imat.tx;
cy = imat.yy * pim->Height + imat.ty;
- dx = imat.xx * pim->Width + imat.tx;
- dy = imat.xy * pim->Width + imat.ty;
sx = bx - (int)imat.tx;
sy = by - (int)imat.ty;
@@ -2888,7 +2885,7 @@ escv_image_end_image(gx_image_enum_common_t * info, bool draw_last)
stream *s = gdev_vector_stream((gx_device_vector *)pdev);
lputs(s, ESC_GS "8;1;2;2;2plr{E");
- put_bytes(s, "\377\377\377\377\000\000\000\000", 8);
+ put_bytes(s, (const byte *)"\377\377\377\377\000\000\000\000", 8);
} /* ESC/Page-Color */
}
pdev->MaskReverse = -1;
@@ -2902,7 +2899,8 @@ static void escv_write_begin(gx_device *dev, int bits, int x, int y, int sw, int
gx_device_vector *const vdev = (gx_device_vector *) dev;
gx_device_escv *const pdev = (gx_device_escv *)dev;
stream *s = gdev_vector_stream((gx_device_vector *)dev);
- char obuf[128], *tmp, *p;
+ char obuf[128];
+ byte *tmp, *p;
int i, comp;
if( 0 == pdev->colormode ) { /* ESC/Page (Monochrome) */
@@ -2987,17 +2985,17 @@ static void escv_write_begin(gx_device *dev, int bits, int x, int y, int sw, int
return;
}
-static void escv_write_data(gx_device *dev, int bits, char *buf, int bsize, int w, int ras)
+static void escv_write_data(gx_device *dev, int bits, byte *buf, int bsize, int w, int ras)
{
- gx_device_vector *const vdev = (gx_device_vector *) dev;
- gx_device_escv *const pdev = (gx_device_escv *) dev;
- stream *s = gdev_vector_stream((gx_device_vector *)pdev);
- char obuf[128];
- int size;
- char *tmps, *p;
- unsigned char *rgbbuf;
- unsigned char *ucp;
- double gray8;
+ gx_device_vector *const vdev = (gx_device_vector *) dev;
+ gx_device_escv *const pdev = (gx_device_escv *) dev;
+ stream *s = gdev_vector_stream((gx_device_vector *)pdev);
+ char obuf[128];
+ int size;
+ byte *tmps, *p;
+ unsigned char *rgbbuf;
+ unsigned char *ucp;
+ double gray8;
if( 0 == pdev->colormode ) { /* ESC/Page (Monochrome) */
diff --git a/contrib/gdevmd2k.c b/contrib/gdevmd2k.c
index 3f50a5e41..f217e9061 100644
--- a/contrib/gdevmd2k.c
+++ b/contrib/gdevmd2k.c
@@ -140,7 +140,7 @@ alps_open(gx_device *pdev)
static int
alps_get_params(gx_device *pdev, gs_param_list *plist)
{
- gs_param_string mediaType = { "", 1, false };
+ gs_param_string mediaType = { (unsigned char *)"", 1, false };
int code = gdev_prn_get_params(pdev, plist);
if (code < 0 ||
(code = param_write_bool(plist, "Color", &dev_alps->color)) < 0 ||
@@ -223,7 +223,7 @@ alps_put_params(gx_device *pdev, gs_param_list *plist)
code = alps_put_param_int (plist, "Yellow", &yellow, 0, 2048, code);
code = alps_put_param_int (plist, "Black", &black, 0, 2048, code);
-#define mediaTypeCmp(mname) strncmp(mediaType.data, mname, mediaType.size)
+#define mediaTypeCmp(mname) strncmp((const char *)mediaType.data, mname, mediaType.size)
if (param_read_string(plist, "MediaType", &mediaType) == 0) {
dev_alps->mediaType
= (! mediaTypeCmp("PlainPaper" ) ? 0
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;
diff --git a/contrib/lips4/gdevl4r.c b/contrib/lips4/gdevl4r.c
index af0703986..352056d15 100644
--- a/contrib/lips4/gdevl4r.c
+++ b/contrib/lips4/gdevl4r.c
@@ -505,11 +505,11 @@ lips4_put_params(gx_device * pdev, gs_param_list * plist)
ecode = gs_error_limitcheck;
goto pmediae;
} else { /* Check the validity of ``MediaType'' characters */
- if (strcmp(pmedia.data, "PlainPaper") != 0 &&
- strcmp(pmedia.data, "OHP") != 0 &&
- strcmp(pmedia.data, "TransparencyFilm") != 0 && /* same as OHP */
- strcmp(pmedia.data, "GlossyFilm") != 0 &&
- strcmp(pmedia.data, "CardBoard") != 0
+ if (strcmp((const char *)pmedia.data, "PlainPaper") != 0 &&
+ strcmp((const char *)pmedia.data, "OHP") != 0 &&
+ strcmp((const char *)pmedia.data, "TransparencyFilm") != 0 && /* same as OHP */
+ strcmp((const char *)pmedia.data, "GlossyFilm") != 0 &&
+ strcmp((const char *)pmedia.data, "CardBoard") != 0
) {
ecode = gs_error_rangecheck;
goto pmediae;
diff --git a/contrib/lips4/gdevl4v.c b/contrib/lips4/gdevl4v.c
index 75116a28d..fe556a377 100644
--- a/contrib/lips4/gdevl4v.c
+++ b/contrib/lips4/gdevl4v.c
@@ -997,6 +997,7 @@ lips4v_setlinecap(gx_device_vector * vdev, gs_line_cap cap)
pdev->TextMode = FALSE;
}
switch (cap) {
+ default:
case 0:
case 3:
line_cap = 0; /* butt */
@@ -1034,6 +1035,7 @@ lips4v_setlinejoin(gx_device_vector * vdev, gs_line_join join)
}
switch (join) {
+ default:
case 0:
lips_join = 2; /* miter */
break;
@@ -1194,7 +1196,9 @@ lips4v_setdash(gx_device_vector * vdev, const float *pattern, uint count,
stream *s = gdev_vector_stream(vdev);
gx_device_lips4v *const pdev = (gx_device_lips4v *) vdev;
int i;
+#if 0
float scale, xscale, yscale;
+#endif
if (pdev->TextMode) {
sputc(s, LIPS_CSI);
@@ -1648,11 +1652,11 @@ lips4v_put_params(gx_device * dev, gs_param_list * plist)
ecode = gs_error_limitcheck;
goto pmediae;
} else { /* Check the validity of ``MediaType'' characters */
- if (strcmp(pmedia.data, "PlainPaper") != 0 &&
- strcmp(pmedia.data, "OHP") != 0 &&
- strcmp(pmedia.data, "TransparencyFilm") != 0 && /* same as OHP */
- strcmp(pmedia.data, "GlossyFilm") != 0 &&
- strcmp(pmedia.data, "CardBoard") != 0) {
+ if (strcmp((const char *)pmedia.data, "PlainPaper") != 0 &&
+ strcmp((const char *)pmedia.data, "OHP") != 0 &&
+ strcmp((const char *)pmedia.data, "TransparencyFilm") != 0 && /* same as OHP */
+ strcmp((const char *)pmedia.data, "GlossyFilm") != 0 &&
+ strcmp((const char *)pmedia.data, "CardBoard") != 0) {
ecode = gs_error_rangecheck;
goto pmediae;
}
diff --git a/contrib/opvp/gdevopvp.c b/contrib/opvp/gdevopvp.c
index c32e435d5..aca3e6acb 100644
--- a/contrib/opvp/gdevopvp.c
+++ b/contrib/opvp/gdevopvp.c
@@ -1831,7 +1831,6 @@ prepare_open(gx_device *dev)
{
int ecode = 0;
int code;
- opvp_result_t r = -1;
opvp_api_procs_t *api_entry;
int dumFD = -1;
opvp_dc_t dumContext = -1;
@@ -1901,7 +1900,7 @@ prepare_open(gx_device *dev)
}
/* call GetColorSpace */
if (apiEntry->opvpGetColorSpace) {
- r = apiEntry->opvpGetColorSpace(dumContext, &cspace);
+ (void)apiEntry->opvpGetColorSpace(dumContext, &cspace);
}
if (cspace == OPVP_CSPACE_BW) {
/* mono-color */
diff --git a/contrib/pcl3/eprn/eprnparm.c b/contrib/pcl3/eprn/eprnparm.c
index c43e30d8a..041c24ae8 100644
--- a/contrib/pcl3/eprn/eprnparm.c
+++ b/contrib/pcl3/eprn/eprnparm.c
@@ -221,7 +221,7 @@ eprn_fillpage(gx_device *dev, gs_imager_state * pis, gx_device_color *pdevc)
}
-void eprn_replace_fillpage(gx_device *dev)
+static void eprn_replace_fillpage(gx_device *dev)
{
eprn_Eprn *eprn = &((eprn_Device *)dev)->eprn;
@@ -963,7 +963,7 @@ int eprn_put_params(gx_device *dev, gs_param_list *plist)
if (rc != 0) { \
if (rc != gs_error_VMerror) { \
eprintf1("%s" ERRPREF "Unknown colour model: `", epref); \
- errwrite(dev->memory, string_value.data, sizeof(char)*string_value.size); \
+ errwrite(dev->memory, (const char *)string_value.data, sizeof(char)*string_value.size); \
eprintf("'.\n"); \
} \
last_error = rc; \
@@ -1078,7 +1078,7 @@ int eprn_put_params(gx_device *dev, gs_param_list *plist)
else {
eprintf1("%s" ERRPREF "Invalid method for IntensityRendering: `",
epref);
- errwrite(dev->memory, string_value.data, sizeof(char)*string_value.size);
+ errwrite(dev->memory, (const char *)string_value.data, sizeof(char)*string_value.size);
eprintf("'.\n");
last_error = gs_error_rangecheck;
param_signal_error(plist, pname, last_error);
diff --git a/contrib/pcl3/src/gdevpcl3.c b/contrib/pcl3/src/gdevpcl3.c
index 2b9eb1c1e..7f1fcc68b 100644
--- a/contrib/pcl3/src/gdevpcl3.c
+++ b/contrib/pcl3/src/gdevpcl3.c
@@ -908,7 +908,8 @@ static int pcl3_put_params(gx_device *device, gs_param_list *plist)
else {
eprintf1("%s" ERRPREF "Unknown subdevice name: `", epref);
errwrite(dev->memory,
- string_value.data, sizeof(char)*string_value.size);
+ (const char *)string_value.data,
+ sizeof(char)*string_value.size);
eprintf("'.\n");
last_error = gs_error_rangecheck;
param_signal_error(plist, pname, last_error);
@@ -1018,7 +1019,8 @@ static int pcl3_put_params(gx_device *device, gs_param_list *plist)
else {
eprintf1("%s" ERRPREF "Invalid duplex capability: `", epref);
errwrite(dev->memory,
- string_value.data, sizeof(char)*string_value.size);
+ (const char *)string_value.data,
+ sizeof(char)*string_value.size);
eprintf("'.\n");
last_error = gs_error_rangecheck;
param_signal_error(plist, pname, last_error);
@@ -1074,7 +1076,8 @@ static int pcl3_put_params(gx_device *device, gs_param_list *plist)
if (rc != gs_error_VMerror) {
eprintf1("%s" ERRPREF "Unknown medium: `", epref);
errwrite(dev->memory,
- string_value.data, sizeof(char)*string_value.size);
+ (const char *)string_value.data,
+ sizeof(char)*string_value.size);
eprintf("'.\n");
}
last_error = rc;
@@ -1144,7 +1147,8 @@ static int pcl3_put_params(gx_device *device, gs_param_list *plist)
if (rc != gs_error_VMerror) {
eprintf1("%s" ERRPREF "Unknown print quality: `", epref);
errwrite(dev->memory,
- string_value.data, sizeof(char)*string_value.size);
+ (const char *)string_value.data,
+ sizeof(char)*string_value.size);
eprintf("'.\n");
}
last_error = rc;