diff options
38 files changed, 110 insertions, 110 deletions
diff --git a/contrib/gdevcd8.c b/contrib/gdevcd8.c index 471663c68..bfb34d325 100644 --- a/contrib/gdevcd8.c +++ b/contrib/gdevcd8.c @@ -3415,7 +3415,7 @@ cdj_set_bpp(gx_device * pdev, int bpp, int ccomps) if (cprn_device->cmyk) { switch (ccomps) { default: - return gs_error_rangecheck; + return_error(gs_error_rangecheck); /*NOTREACHED */ break; @@ -3514,7 +3514,7 @@ cdj_set_bpp(gx_device * pdev, int bpp, int ccomps) break; } default: - bppe:return gs_error_rangecheck; + bppe:return_error(gs_error_rangecheck); } if (cprn_device->cmyk == -1) { @@ -3546,7 +3546,7 @@ cdj_set_bpp(gx_device * pdev, int bpp, int ccomps) break; } cce: default: - return gs_error_rangecheck; + return_error(gs_error_rangecheck); } if (cprn_device->cmyk) { diff --git a/contrib/gdevdj9.c b/contrib/gdevdj9.c index 3c7368874..c659f1886 100644 --- a/contrib/gdevdj9.c +++ b/contrib/gdevdj9.c @@ -2057,7 +2057,7 @@ static int cdj_set_bpp(gx_device * pdev, int bpp, int ccomps) switch (ccomps) { default: - return gs_error_rangecheck; + return_error(gs_error_rangecheck); /*NOTREACHED */ break; @@ -2154,7 +2154,7 @@ static int cdj_set_bpp(gx_device * pdev, int bpp, int ccomps) break; } default: - bppe:return gs_error_rangecheck; + bppe:return_error(gs_error_rangecheck); } if (cprn_device->cmyk == -1) { @@ -2189,7 +2189,7 @@ static int cdj_set_bpp(gx_device * pdev, int bpp, int ccomps) cce: default: - return gs_error_rangecheck; + return_error(gs_error_rangecheck); } if (cprn_device->cmyk) { diff --git a/contrib/gomni.c b/contrib/gomni.c index ab7b5ef3d..c9058cb88 100644 --- a/contrib/gomni.c +++ b/contrib/gomni.c @@ -415,7 +415,7 @@ OpenDevice (gx_device *pdev /* Driver instance to open */) eprintf ("Error: No pDev in OpenDevice.\n"); if (fDebugOutput) lprintf ("error was here.\n"); - return gs_error_Fatal; + return_error(gs_error_Fatal); } if (!pDev->hmodOmni) @@ -424,7 +424,7 @@ OpenDevice (gx_device *pdev /* Driver instance to open */) eprintf ("Error: Could not load libomni.so\n"); if (fDebugOutput) lprintf ("error was here.\n"); - return gs_error_Fatal; + return_error(gs_error_Fatal); } if (!pDev->pcoreOmni->cDeviceName[0]) @@ -433,7 +433,7 @@ OpenDevice (gx_device *pdev /* Driver instance to open */) eprintf ("Error: -sDeviceName=XXX was not defined\n"); if (fDebugOutput) lprintf ("error was here.\n"); - return gs_error_Fatal; + return_error(gs_error_Fatal); } pDev->iUseServer = 0; diff --git a/contrib/japanese/gdevdmpr.c b/contrib/japanese/gdevdmpr.c index 1908d7b57..852bd8a8f 100644 --- a/contrib/japanese/gdevdmpr.c +++ b/contrib/japanese/gdevdmpr.c @@ -435,7 +435,7 @@ gdev_dmprt_put_dmprt_params(gx_device *pdev, gs_param_list *plist) code = param_read_int_array(plist, "MaxSize", &vaint); if (code < 0) return code; if (code == 0) { - if (vaint.size != 2) return gs_error_typecheck; + if (vaint.size != 2) return_error(gs_error_typecheck); pddev->dmprt.max_width = vaint.data[0]; pddev->dmprt.max_height = vaint.data[1]; } @@ -443,7 +443,7 @@ gdev_dmprt_put_dmprt_params(gx_device *pdev, gs_param_list *plist) code = param_read_int_array(plist, "Offsets", &vaint); if (code < 0) return code; if (code == 0) { - if (vaint.size != 2) return gs_error_typecheck; + if (vaint.size != 2) return_error(gs_error_typecheck); pddev->dmprt.x_offset = vaint.data[0]; pddev->dmprt.y_offset = vaint.data[1]; } @@ -452,7 +452,7 @@ gdev_dmprt_put_dmprt_params(gx_device *pdev, gs_param_list *plist) if (code < 0) return code; if (code == 0) { int i; - if (vaint.size != 4) return gs_error_typecheck; + if (vaint.size != 4) return_error(gs_error_typecheck); for (i=0;i<4;i++) pddev->dmprt.dev_margin[i] = vaint.data[i]; } @@ -475,7 +475,7 @@ gdev_dmprt_put_dviprt_params(gx_device *pdev, gs_param_list *plist) char *filename = gs_malloc(pdev->memory->non_gc_memory, vstr.size + 1, 1, "gdev_dmprt_put_props(filename)"); int ccode; - if (filename == 0) return gs_error_VMerror; + if (filename == 0) return_error(gs_error_VMerror); strncpy(filename, (const char*)vstr.data, vstr.size); filename[vstr.size] = '\0'; ccode = gdev_dmprt_get_printer_props(pddev,filename); @@ -566,7 +566,7 @@ gdev_dmprt_put_dviprt_params(gx_device *pdev, gs_param_list *plist) } } if (gdev_dmprt_encode_list[i].name == 0) - return gs_error_rangecheck; + return_error(gs_error_rangecheck); } return code; @@ -582,9 +582,9 @@ gdev_dmprt_put_prt_code_param(gs_param_list *plist, if (code == 0) { int ccode = gdev_dmprt_check_code_props(vstr.data, vstr.size); byte *pbyte; - if (ccode < 0) return gs_error_rangecheck; + if (ccode < 0) return_error(gs_error_rangecheck); pbyte = (byte *)malloc(vstr.size+1); - if (pbyte == 0) return gs_error_VMerror; + if (pbyte == 0) return_error(gs_error_VMerror); memcpy(pbyte, vstr.data, vstr.size); pbyte[vstr.size] = 0; pprt->prtcode[idx] = pbyte; @@ -604,7 +604,7 @@ gdev_dmprt_put_prt_string_param(gs_param_list *plist, if (code == 0) { byte *pbyte; pbyte = (byte *)malloc(vstr.size+1); - if (pbyte == 0) return gs_error_VMerror; + if (pbyte == 0) return_error(gs_error_VMerror); memcpy(pbyte, vstr.data, vstr.size); pbyte[vstr.size] = 0; pprt->strings[idx] = pbyte; @@ -686,7 +686,7 @@ gdev_dmprt_print_page(gx_device_printer *pdev, FILE *prn_stream) /* get work buffer */ in = (byte *)gs_malloc(pdev->memory->non_gc_memory, 1, i_buf_size ,"gdev_dmprt_print_page(in)"); if ( in == 0 ) - return gs_error_VMerror; + return_error(gs_error_VMerror); /* Initialize this printer driver */ if (pdev->file_is_new) { @@ -760,16 +760,16 @@ gdev_dmprt_check_code_props(byte *str,int len) if (fmt & CFG_FMT_BIT) { int s = *str++; str += s; - if (str > end) return gs_error_rangecheck; + if (str > end) return_error(gs_error_rangecheck); if ((fmt & CFG_FMT_FORMAT_BIT) == CFG_FMT_STRINGS) { s = *str++; str += s; - if (str > end) return gs_error_rangecheck; + if (str > end) return_error(gs_error_rangecheck); } } else { str += fmt; - if (str > end) return gs_error_rangecheck; + if (str > end) return_error(gs_error_rangecheck); } } return str == end ? 0 : gs_error_rangecheck; @@ -803,14 +803,14 @@ gdev_dmprt_get_printer_props(gx_device_dmprt *pdev,char *fnamebase) char *fname; fname = gs_malloc(pdev->memory->non_gc_memory, 256,1,"dviprt_lib_fname"); - if (fname == NULL) return gs_error_VMerror; + if (fname == NULL) return_error(gs_error_VMerror); fp = gdev_dmprt_dviprt_lib_fopen(fnamebase,fname); if (fp == NULL) { - return gs_error_undefinedfilename; + return_error(gs_error_undefinedfilename); } if (fseek(fp,18,0) < 0) - return gs_error_ioerror; + return_error(gs_error_ioerror); code = fgetc(fp); fclose(fp); @@ -865,7 +865,7 @@ gdev_dmprt_error_no_dviprt_to_gs(int code) { switch (code) { case CFG_ERROR_MEMORY: - return gs_error_VMerror; + return_error(gs_error_VMerror); case CFG_ERROR_FILE_OPEN: case CFG_ERROR_OUTPUT: return gs_errpr_ioerror; diff --git a/devices/gdevcdj.c b/devices/gdevcdj.c index ab3bb4f7a..62f2567b2 100644 --- a/devices/gdevcdj.c +++ b/devices/gdevcdj.c @@ -3217,7 +3217,7 @@ cdj_set_bpp(gx_device *pdev, int bpp, int ccomps) if (cprn_device->cmyk) { switch (ccomps) { default: - return gs_error_rangecheck; + return_error(gs_error_rangecheck); /*NOTREACHED*/ break; @@ -3317,7 +3317,7 @@ cdj_set_bpp(gx_device *pdev, int bpp, int ccomps) } default: -bppe: return gs_error_rangecheck; + bppe: return_error(gs_error_rangecheck); } if (cprn_device->cmyk == -1) { @@ -3360,7 +3360,7 @@ bppe: return gs_error_rangecheck; break; } -cce: default: return gs_error_rangecheck; + cce: default: return_error(gs_error_rangecheck); } if (cprn_device->cmyk) { diff --git a/devices/gdevcmykog.c b/devices/gdevcmykog.c index 04d172c77..d2f68ba06 100644 --- a/devices/gdevcmykog.c +++ b/devices/gdevcmykog.c @@ -310,7 +310,7 @@ cmykog_init_buffer(void *arg_, gx_device *dev_, gs_memory_t *memory, int w, int *bufferp = NULL; buffer = (cmykog_process_buffer_t *)gs_alloc_bytes(memory, sizeof(*buffer), "cmykog_init_buffer"); if (buffer == NULL) - return gs_error_VMerror; + return_error(gs_error_VMerror); memset(buffer, 0, sizeof(*buffer)); *bufferp = buffer; diff --git a/devices/gdevfpng.c b/devices/gdevfpng.c index 451e4b489..b897669c5 100644 --- a/devices/gdevfpng.c +++ b/devices/gdevfpng.c @@ -212,7 +212,7 @@ static int fpng_init_buffer(void *arg, gx_device *dev, gs_memory_t *mem, int w, buffer = (fpng_buffer_t *)gs_alloc_bytes(mem, sizeof(fpng_buffer_t) + size, "fpng_init_buffer"); *pbuffer = (void *)buffer; if (buffer == NULL) - return gs_error_VMerror; + return_error(gs_error_VMerror); buffer->size = size; buffer->compressed = 0; return 0; @@ -359,7 +359,7 @@ static int fpng_process(void *arg, gx_device *dev, gx_device *bdev, const gs_int stream.opaque = bdev->memory; err = deflateInit(&stream, Z_DEFAULT_COMPRESSION); if (err != Z_OK) - return gs_error_VMerror; + return_error(gs_error_VMerror); p = params.data[0]; stream.next_out = &buffer->data[0]; stream.avail_out = buffer->size; diff --git a/devices/gdevmac.c b/devices/gdevmac.c index 04ee6b75f..7056ca844 100644 --- a/devices/gdevmac.c +++ b/devices/gdevmac.c @@ -117,7 +117,7 @@ mac_open(register gx_device *dev) mdev->pic = (PicHandle) NewHandle(500000); if (mdev->pic == 0) // error, not enough memory - return gs_error_VMerror; + return_error(gs_error_VMerror); HLockHi((Handle) mdev->pic); // move handle high and lock it @@ -358,7 +358,7 @@ mac_copy_alpha(gx_device *dev, const unsigned char *base, int data_x, colorTable = (ColorSpec*) malloc(sizeof(ColorSpec) * (maxShade+1)); if (colorTable == NULL) - return gs_error_VMerror; + return_error(gs_error_VMerror); (*dev_proc(dev, map_color_rgb))(dev, color, rgb); colRGB.red = rgb[0]; @@ -507,7 +507,7 @@ mac_set_colordepth(gx_device *dev, int depth) gx_device_color_info * ci = &mdev->color_info; if (depth != 1 && depth != 4 && depth != 7 && depth != 8 && depth != 24) - return gs_error_rangecheck; + return_error(gs_error_rangecheck); mdev->color_info.depth = depth; switch (depth) @@ -594,11 +594,11 @@ mac_put_params(gx_device *dev, gs_param_list *plist) bytes_compare(outputFile.data, outputFile.size, (const byte *)mdev->outputFileName, strlen(mdev->outputFileName))) { param_signal_error(plist, "OutputFile", gs_error_invalidaccess); - return gs_error_invalidaccess; + return_error(gs_error_invalidaccess); } if (outputFile.size > (gp_file_name_sizeof - 1)) { param_signal_error(plist, "OutputFile", gs_error_limitcheck); - return gs_error_limitcheck; + return_error(gs_error_limitcheck); } /* If filename changed, close file. */ diff --git a/devices/gdevmac.h b/devices/gdevmac.h index c39a3c3bf..7b49729d3 100644 --- a/devices/gdevmac.h +++ b/devices/gdevmac.h @@ -108,7 +108,7 @@ struct mac_xfont_s { if (len - offset < a) { \ HUnlock((Handle) mdev->pic); \ SetHandleSize((Handle) mdev->pic, len + b); \ - if (MemError() != noErr) return gs_error_VMerror; \ + if (MemError() != noErr) return_error(gs_error_VMerror); \ HLockHi((Handle) mdev->pic); \ mdev->currPicPos = (short*) ((long) *mdev->pic + offset); \ } \ diff --git a/devices/gdevmswn.c b/devices/gdevmswn.c index 0aed741cf..2ce69d400 100644 --- a/devices/gdevmswn.c +++ b/devices/gdevmswn.c @@ -367,7 +367,7 @@ int win_nomemory(void) { MessageBox((HWND) NULL, (LPSTR) "Not enough memory", (LPSTR) szAppName, MB_ICONSTOP); - return gs_error_limitcheck; + return_error(gs_error_limitcheck); } LPLOGPALETTE diff --git a/devices/gdevmsxf.c b/devices/gdevmsxf.c index 4dc76ef8a..7346cac83 100644 --- a/devices/gdevmsxf.c +++ b/devices/gdevmsxf.c @@ -291,10 +291,10 @@ win_char_metrics(gx_xfont * xf, gx_xglyph xg, int wmode, char chr = (char)xg; if (wmode != 0) - return gs_error_undefined; + return_error(gs_error_undefined); hdc = win_get_dc(wxf->dev); if (hdc == NULL) - return gs_error_limitcheck; + return_error(gs_error_limitcheck); if ((code = win_select_font(hdc, wxf)) < 0) { win_release_dc(wxf->dev, hdc); return code; @@ -370,7 +370,7 @@ win_render_char(gx_xfont * xf, gx_xglyph xg, gx_device * dev, raster = wbm >> 3; bits = gs_malloc(dev->memory, h, raster, "win_render_char"); if (bits == 0) - return gs_error_limitcheck; + return_error(gs_error_limitcheck); hbm = CreateBitmap(wbm, h, 1, 1, NULL); if (hbm == NULL) { code = gs_error_limitcheck; @@ -458,7 +458,7 @@ win_select_font(HDC hdc, win_xfont * wxf) /* Re-acquire it now. */ wxf->hFont = CreateFontIndirect(&wxf->lf); if (wxf->hFont == NULL) - return gs_error_limitcheck; + return_error(gs_error_limitcheck); } SelectObject(hdc, wxf->hFont); return 0; diff --git a/devices/gdevos2p.c b/devices/gdevos2p.c index 106f8857e..9d77ee03b 100644 --- a/devices/gdevos2p.c +++ b/devices/gdevos2p.c @@ -145,18 +145,18 @@ os2prn_open(gx_device * dev) if (DosGetInfoBlocks(&pptib, &pppib)) { errprintf(dev->memory, "\nos2prn_open: Couldn't get pid\n"); - return gs_error_limitcheck; + return_error(gs_error_limitcheck); } if (pppib->pib_ultype != 3) { /* if caller is not PM app */ errprintf(dev->memory, "os2prn device can only be used from a PM application\n"); - return gs_error_limitcheck; + return_error(gs_error_limitcheck); } opdev->hab = WinQueryAnchorBlock(hwndtext); opdev->newframe = 0; if (os2prn_get_queue_list(dev->memory, &opdev->ql)) - return gs_error_limitcheck; + return_error(gs_error_limitcheck); if (opdev->queue_name[0] == '\0') { /* obtain printer name from filename */ @@ -190,7 +190,7 @@ os2prn_open(gx_device * dev) for (i = 0; i < opdev->ql.nqueues; i++) { errprintf(opdev->memory, " -sOS2QUEUE=\042%s\042\n", opdev->ql.prq[i].pszName); } - return gs_error_rangecheck; + return_error(gs_error_rangecheck); } /* open printer device */ memset(&dop, 0, sizeof(dop)); @@ -206,7 +206,7 @@ os2prn_open(gx_device * dev) ERRORID eid = WinGetLastError(opdev->hab); errprintf(opdev->memory, "DevOpenDC for printer error 0x%x\n", eid); - return gs_error_limitcheck; + return_error(gs_error_limitcheck); } os2prn_free_queue_list(dev->memory, &opdev->ql); @@ -264,7 +264,7 @@ os2prn_open(gx_device * dev) ERRORID eid = WinGetLastError(opdev->hab); errprintf(opdev->memory, "DevOpenDC for memory error 0x%x\n", eid); - return gs_error_limitcheck; + return_error(gs_error_limitcheck); } sizlPage.cx = dev->width; sizlPage.cy = dev->height; @@ -274,14 +274,14 @@ os2prn_open(gx_device * dev) ERRORID eid = WinGetLastError(opdev->hab); errprintf(opdev->memory, "GpiCreatePS for memory error 0x%x\n", eid); - return gs_error_limitcheck; + return_error(gs_error_limitcheck); } if (DevEscape(opdev->hdc, DEVESC_STARTDOC, (LONG) strlen(gs_product), (char *)gs_product, NULL, NULL) == DEVESC_ERROR) { ERRORID eid = WinGetLastError(opdev->hab); errprintf(opdev->memory, "DEVESC_STARTDOC error 0x%x\n", eid); - return gs_error_limitcheck; + return_error(gs_error_limitcheck); } /* gdev_prn_open opens a temporary file which we don't want */ /* so we specify the name now so we can delete it later */ diff --git a/devices/gdevpng.c b/devices/gdevpng.c index f24f8bcd2..de08d4203 100644 --- a/devices/gdevpng.c +++ b/devices/gdevpng.c @@ -949,7 +949,7 @@ pngalpha_copy_alpha(gx_device * dev, const byte * data, int data_x, alpha = row[sx]; break; default: - return gs_error_rangecheck; + return_error(gs_error_rangecheck); } if (alpha == 255) { /* Just write the new color. */ composite = color; diff --git a/devices/gdevsvga.c b/devices/gdevsvga.c index 696057a1e..a1d5d6f2c 100644 --- a/devices/gdevsvga.c +++ b/devices/gdevsvga.c @@ -472,7 +472,7 @@ svga_get_bits(gx_device * dev, int y, byte * data, byte ** actual_data) fb_ptr src; if (y < 0 || y >= dev->height) - return gs_error_rangecheck; + return_error(gs_error_rangecheck); set_pixel_read_ptr(src, fb_dev, 0, y); /* The logic here is similar to fill_rectangle. */ if (PTR_OFF(src) <= limit) diff --git a/devices/gdevtifs.c b/devices/gdevtifs.c index 5abe4d5e4..10487aa33 100644 --- a/devices/gdevtifs.c +++ b/devices/gdevtifs.c @@ -189,7 +189,7 @@ tiff_put_some_params(gx_device * dev, gs_param_list * plist, int which) errprintf(tfdev->memory, "Invalid compression setting for this bitdepth\n"); param_signal_error(plist, param_name, gs_error_rangecheck); - return gs_error_rangecheck; + return_error(gs_error_rangecheck); } break; case 1: @@ -518,7 +518,7 @@ tiff_compression_param_string(gs_param_string *param, uint16 id) param_string_from_string(*param, c->str); return 0; } - return gs_error_undefined; + return_error(gs_error_undefined); } int @@ -532,7 +532,7 @@ tiff_compression_id(uint16 *id, gs_param_string *param) *id = c->id; return 0; } - return gs_error_undefined; + return_error(gs_error_undefined); } int tiff_compression_allowed(uint16 compression, byte depth) diff --git a/devices/gdevtsep.c b/devices/gdevtsep.c index 52ff599cf..458fcda01 100644 --- a/devices/gdevtsep.c +++ b/devices/gdevtsep.c @@ -1028,7 +1028,7 @@ tiffsep_put_params(gx_device * pdev, gs_param_list * plist) errprintf(pdevn->memory, "Invalid compression setting for this bitdepth\n"); param_signal_error(plist, param_name, gs_error_rangecheck); - return gs_error_rangecheck; + return_error(gs_error_rangecheck); } break; case 1: diff --git a/devices/gdevupd.c b/devices/gdevupd.c index f50f4e769..0c9bec504 100644 --- a/devices/gdevupd.c +++ b/devices/gdevupd.c @@ -1051,7 +1051,7 @@ upd_print_page(gx_device_printer *pdev, FILE *out) errprintf(pdev->memory, "CALL-REJECTED upd_print_page(0x%05lx,0x%05lx)\n", (long) udev,(long) out); #endif - return gs_error_undefined; + return_error(gs_error_undefined); } #if UPD_MESSAGES & UPD_M_TOPCALLS diff --git a/devices/gdevwddb.c b/devices/gdevwddb.c index 8ebd5d049..9d62e63be 100644 --- a/devices/gdevwddb.c +++ b/devices/gdevwddb.c @@ -135,7 +135,7 @@ win_ddb_open(gx_device * dev) return code; if (wdev->BitsPerPixel > 8) - return gs_error_limitcheck; /* don't support 24 bit/pixel */ + return_error(gs_error_limitcheck); /* don't support 24 bit/pixel */ /* Create the backing bitmap. */ code = win_ddb_alloc_bitmap((gx_device_win *) dev, dev); diff --git a/devices/gdevwdib.c b/devices/gdevwdib.c index 30131c993..d57b3cdc6 100644 --- a/devices/gdevwdib.c +++ b/devices/gdevwdib.c @@ -129,7 +129,7 @@ win_dib_open(gx_device * dev) #endif if (gdev_mem_device_for_bits(dev->color_info.depth) == 0) { win_close(dev); - return gs_error_rangecheck; + return_error(gs_error_rangecheck); } code = win_dib_alloc_bitmap((gx_device_win *) dev, dev); if (code < 0) { diff --git a/devices/gdevwpr2.c b/devices/gdevwpr2.c index 4e918c353..45690af30 100644 --- a/devices/gdevwpr2.c +++ b/devices/gdevwpr2.c @@ -281,7 +281,7 @@ win_pr2_open(gx_device * dev) GlobalUnlock(wdev->win32_hdevnames); if (wdev->hdcprn == NULL) { - return gs_error_Fatal; + return_error(gs_error_Fatal); } } else if (!win_pr2_getdc(wdev)) { @@ -302,7 +302,7 @@ win_pr2_open(gx_device * dev) if (!PrintDlg(&pd)) { /* device not opened - exit ghostscript */ - return gs_error_Fatal; /* exit Ghostscript cleanly */ + return_error(gs_error_Fatal); /* exit Ghostscript cleanly */ } devmode = GlobalLock(pd.hDevMode); @@ -324,7 +324,7 @@ win_pr2_open(gx_device * dev) if (!(GetDeviceCaps(wdev->hdcprn, RASTERCAPS) != RC_DIBTODEV)) { errprintf(dev->memory, "Windows printer does not have RC_DIBTODEV\n"); DeleteDC(wdev->hdcprn); - return gs_error_limitcheck; + return_error(gs_error_limitcheck); } /* initialise printer, install abort proc */ wdev->lpfnAbortProc = (DLGPROC) AbortProc2; @@ -350,7 +350,7 @@ win_pr2_open(gx_device * dev) errprintf(dev->memory, "Printer StartDoc failed (error %08x)\n", GetLastError()); DeleteDC(wdev->hdcprn); - return gs_error_limitcheck; + return_error(gs_error_limitcheck); } dev->x_pixels_per_inch = (float)GetDeviceCaps(wdev->hdcprn, LOGPIXELSX); diff --git a/devices/gdevwprn.c b/devices/gdevwprn.c index 3c7346669..c28b41748 100644 --- a/devices/gdevwprn.c +++ b/devices/gdevwprn.c @@ -145,7 +145,7 @@ win_prn_open(gx_device * dev) pd.Flags = PD_PRINTSETUP | PD_RETURNDC; if (!PrintDlg(&pd)) { /* device not opened - exit ghostscript */ - return gs_error_limitcheck; + return_error(gs_error_limitcheck); } GlobalFree(pd.hDevMode); GlobalFree(pd.hDevNames); @@ -153,13 +153,13 @@ win_prn_open(gx_device * dev) wdev->hdcprn = pd.hDC; if (!(GetDeviceCaps(wdev->hdcprn, RASTERCAPS) != RC_BITBLT)) { DeleteDC(wdev->hdcprn); - return gs_error_limitcheck; + return_error(gs_error_limitcheck); } wdev->lpfnAbortProc = (DLGPROC) AbortProc; Escape(wdev->hdcprn, SETABORTPROC, 0, (LPSTR) wdev->lpfnAbortProc, NULL); if (Escape(wdev->hdcprn, STARTDOC, strlen(szAppName), szAppName, NULL) <= 0) { DeleteDC(wdev->hdcprn); - return gs_error_limitcheck; + return_error(gs_error_limitcheck); } f = gp_open_scratch_file(dev->memory, gp_scratch_file_name_prefix, @@ -167,7 +167,7 @@ win_prn_open(gx_device * dev) if (f == (FILE *) NULL) { Escape(wdev->hdcprn, ENDDOC, 0, NULL, NULL); DeleteDC(wdev->hdcprn); - return gs_error_limitcheck; + return_error(gs_error_limitcheck); } unlink(wdev->mfname); wdev->hdcmf = CreateMetaFile(wdev->mfname); diff --git a/devices/gxfcopy.c b/devices/gxfcopy.c index ea09d5d8f..b46d933f5 100644 --- a/devices/gxfcopy.c +++ b/devices/gxfcopy.c @@ -442,7 +442,7 @@ named_glyph_slot_hashed(gs_copied_font_data_t *cfdata, gs_glyph glyph, while (names[hash].str.data != 0 && names[hash].glyph != glyph) { hash = (hash + hash2) % gsize; if (!tries) - return gs_error_undefined; + return_error(gs_error_undefined); tries--; } *pslot = &cfdata->glyphs[hash]; diff --git a/devices/vector/gdevpdf.c b/devices/vector/gdevpdf.c index cb7f2d4c7..ed9d34e22 100644 --- a/devices/vector/gdevpdf.c +++ b/devices/vector/gdevpdf.c @@ -1218,7 +1218,7 @@ pdf_write_page(gx_device_pdf *pdev, int page_num) case 2: emprintf(pdev->memory, "TrimBox does not fit inside BleedBox, not permitted in PDF/X-3, aborting conversion\n"); - return gs_error_unknownerror; + return_error(gs_error_unknownerror); break; default: emprintf(pdev->memory, @@ -1283,7 +1283,7 @@ pdf_write_page(gx_device_pdf *pdev, int page_num) case 2: emprintf(pdev->memory, "TrimBox does not fit inside CropBox, not permitted in PDF/X-3, aborting conversion\n"); - return gs_error_unknownerror; + return_error(gs_error_unknownerror); break; default: emprintf(pdev->memory, @@ -1553,13 +1553,13 @@ rewrite_object(gx_device_pdf *const pdev, pdf_linearisation_t *linear_params, in if (Size > ScratchSize) { code = fread(Scratch, ScratchSize, 1, linear_params->sfile); if (code != 1) - return gs_error_ioerror; + return_error(gs_error_ioerror); fwrite(Scratch, ScratchSize, 1, linear_params->Lin_File.file); Size -= 16384; } else { code = fread(Scratch, Size, 1, linear_params->sfile); if (code != 1) - return gs_error_ioerror; + return_error(gs_error_ioerror); fwrite(Scratch, Size, 1, linear_params->Lin_File.file); Size = 0; } @@ -2471,7 +2471,7 @@ pdf_close(gx_device * dev) pdf_linearisation_t linear_params; if (!dev->is_open) - return gs_error_undefined; + return_error(gs_error_undefined); dev->is_open = false; Catalog_id = pdev->Catalog->id; diff --git a/devices/vector/gdevpdfg.c b/devices/vector/gdevpdfg.c index 2807bf23e..7e290340a 100644 --- a/devices/vector/gdevpdfg.c +++ b/devices/vector/gdevpdfg.c @@ -401,7 +401,7 @@ static int write_color_as_process(gx_device_pdf * pdev, const gs_imager_state * break; default: /* Can't happen since we already check the colour space */ - return gs_error_rangecheck; + return_error(gs_error_rangecheck); } pprintg1(pdev->strm, "%g", psdf_round(frac2float(conc[0]), 255, 8)); for (i = 1; i < pdev->color_info.num_components; i++) { @@ -483,7 +483,7 @@ static int write_color_as_process(gx_device_pdf * pdev, const gs_imager_state * return code; *used_process_color = true; return 0;*/ - return gs_error_unknownerror; + return_error(gs_error_unknownerror); } static int write_color_unchanged(gx_device_pdf * pdev, const gs_imager_state * pis, @@ -1238,7 +1238,7 @@ static int new_pdf_reset_color(gx_device_pdf * pdev, const gs_imager_state * pis * unlike shading patterns we have no fallback. */ if (pdev->CompatibilityLevel < 1.2) { - return gs_error_undefined; + return_error(gs_error_undefined); } code = pdf_put_colored_pattern(pdev, pdc, pcs, ppscc, pis, &pres); @@ -2672,7 +2672,7 @@ pdf_open_gstate(gx_device_pdf *pdev, pdf_resource_t **ppres) */ if (pdev->context != PDF_IN_STREAM) { /* We apparently use gs_error_interrupt as a request to change context. */ - return gs_error_interrupt; + return_error(gs_error_interrupt); } code = pdf_alloc_resource(pdev, resourceExtGState, gs_no_id, ppres, -1L); if (code < 0) diff --git a/devices/vector/gdevpdfi.c b/devices/vector/gdevpdfi.c index 8ed4ffd3a..a4384a311 100644 --- a/devices/vector/gdevpdfi.c +++ b/devices/vector/gdevpdfi.c @@ -2902,7 +2902,7 @@ gdev_pdf_dev_spec_op(gx_device *pdev1, int dev_spec_op, void *data, int size) case gxdso_pattern_load: pres = pdf_find_resource_by_gs_id(pdev, resourcePattern, id); if (pres == 0) - return gs_error_undefined; + return_error(gs_error_undefined); pres = pdf_substitute_pattern(pres); pres->where_used |= pdev->used_mask; code = pdf_add_resource(pdev, pdev->substream_Resources, "/Pattern", pres); diff --git a/devices/vector/gdevpdfm.c b/devices/vector/gdevpdfm.c index b92a28bd1..d3effc58c 100644 --- a/devices/vector/gdevpdfm.c +++ b/devices/vector/gdevpdfm.c @@ -967,7 +967,7 @@ pdfmark_annot(gx_device_pdf * pdev, gs_param_string * pairs, uint count, case 2: emprintf(pdev->memory, "Annotation set to non-printing,\n not permitted in PDF/A, aborting conversion\n"); - return gs_error_invalidfont; + return_error(gs_error_invalidfont); break; default: emprintf(pdev->memory, @@ -1111,7 +1111,7 @@ pdfmark_annot(gx_device_pdf * pdev, gs_param_string * pairs, uint count, case 2: emprintf(pdev->memory, "Annotation (not TrapNet or PrinterMark) on page,\n not permitted in PDF/X, aborting conversion\n"); - return gs_error_invalidfont; + return_error(gs_error_invalidfont); break; default: emprintf(pdev->memory, @@ -1145,7 +1145,7 @@ pdfmark_annot(gx_device_pdf * pdev, gs_param_string * pairs, uint count, case 2: emprintf(pdev->memory, "Annotation (not TrapNet or PrinterMark) potentially on page (no /Rect in dict),\n not permitted in PDF/X, aborting conversion\n"); - return gs_error_invalidfont; + return_error(gs_error_invalidfont); break; default: emprintf(pdev->memory, diff --git a/devices/vector/gdevpdfo.c b/devices/vector/gdevpdfo.c index f17498efb..ff33490dd 100644 --- a/devices/vector/gdevpdfo.c +++ b/devices/vector/gdevpdfo.c @@ -558,7 +558,7 @@ cos_array_write(const cos_object_t *pco, gx_device_pdf *pdev, gs_id object_id) /* Careful here, only certain errors will bubble up * through the text processing. */ - return gs_error_limitcheck; + return_error(gs_error_limitcheck); break; default: emprintf(pdev->memory, @@ -891,7 +891,7 @@ cos_elements_write(stream *s, const cos_dict_element_t *pcde, /* Careful here, only certain errors will bubble up * through the text processing. */ - return gs_error_limitcheck; + return_error(gs_error_limitcheck); break; default: emprintf(pdev->memory, @@ -1710,7 +1710,7 @@ static int hash_cos_stream(const cos_object_t *pco0, gs_md5_state_t *md5, gs_md5 return result; } if (gp_fseek_64(sfile, pcsp->position, SEEK_SET) != 0) - return gs_error_ioerror; + return_error(gs_error_ioerror); if (fread(ptr, 1, pcsp->size, sfile) != pcsp->size) { gs_free(pdev->memory, ptr, sizeof (byte), pcsp->size, "hash_cos_stream"); @@ -1723,7 +1723,7 @@ static int hash_cos_stream(const cos_object_t *pco0, gs_md5_state_t *md5, gs_md5 } gs_md5_finish(md5, (gs_md5_byte_t *)hash); if (gp_fseek_64(sfile, position_save, SEEK_SET) != 0) - return gs_error_ioerror; + return_error(gs_error_ioerror); return 0; } @@ -1831,12 +1831,12 @@ cos_stream_contents_write(const cos_stream_t *pcs, gx_device_pdf *pdev) } else { end_pos = gp_ftell_64(sfile); if (gp_fseek_64(sfile, pcsp->position, SEEK_SET) != 0) - return gs_error_ioerror; + return_error(gs_error_ioerror); code = pdf_copy_data(s, sfile, pcsp->size, ss); if (code < 0) return code; if (gp_fseek_64(sfile, end_pos, SEEK_SET) != 0) - return gs_error_ioerror; + return_error(gs_error_ioerror); } } /* Reverse the elements back. */ diff --git a/devices/vector/gdevpdfr.c b/devices/vector/gdevpdfr.c index c0b0e3ff8..466ebf214 100644 --- a/devices/vector/gdevpdfr.c +++ b/devices/vector/gdevpdfr.c @@ -38,7 +38,7 @@ pdf_objname_is_valid(const byte *data, uint size) } /* - * Look up a named object. Return gs_error_rangecheck if the syntax is invalid. + * Look up a named object. Return_error(gs_error_rangecheck if the syntax is invalid. * If the object is missing, return gs_error_undefined. */ int diff --git a/devices/vector/gdevpdfu.c b/devices/vector/gdevpdfu.c index 531198abe..6aa8e7e62 100644 --- a/devices/vector/gdevpdfu.c +++ b/devices/vector/gdevpdfu.c @@ -650,10 +650,10 @@ pdf_obj_mark_unused(gx_device_pdf *pdev, long id) if (gp_fseek_64 (tfile, ((int64_t)(id - pdev->FirstObjectNumber)) * sizeof(pos), SEEK_SET) != 0) - return gs_error_ioerror; + return_error(gs_error_ioerror); fwrite(&pos, sizeof(pos), 1, tfile); if (gp_fseek_64(tfile, tpos, SEEK_SET) != 0) - return gs_error_ioerror; + return_error(gs_error_ioerror); return 0; } @@ -672,10 +672,10 @@ pdf_open_obj(gx_device_pdf * pdev, long id, pdf_resource_type_t type) if (gp_fseek_64 (tfile, ((int64_t)(id - pdev->FirstObjectNumber)) * sizeof(pos), SEEK_SET) != 0) - return gs_error_ioerror; + return_error(gs_error_ioerror); fwrite(&pos, sizeof(pos), 1, tfile); if (gp_fseek_64(tfile, tpos, SEEK_SET) != 0) - return gs_error_ioerror; + return_error(gs_error_ioerror); } if (pdev->ForOPDFRead && pdev->ProduceDSC) { switch(type) { diff --git a/devices/vector/gdevpdfx.h b/devices/vector/gdevpdfx.h index a304b6d6f..3a99a6cdb 100644 --- a/devices/vector/gdevpdfx.h +++ b/devices/vector/gdevpdfx.h @@ -1349,7 +1349,7 @@ int pdfmark_write_article(gx_device_pdf * pdev, const pdf_article_t * part); bool pdf_objname_is_valid(const byte *data, uint size); /* - * Look up a named object. Return gs_error_rangecheck if the syntax is invalid, + * Look up a named object. Return_error(gs_error_rangecheck if the syntax is invalid, * gs_error_undefined if no object by that name exists. */ int pdf_find_named(gx_device_pdf * pdev, const gs_param_string * pname, @@ -1375,7 +1375,7 @@ int pdf_refer_named(gx_device_pdf *pdev, const gs_param_string *pname, /* * Look up a named object as for pdf_refer_named. If the object already - * exists and is not simply a forward reference, return gs_error_rangecheck; + * exists and is not simply a forward reference, return_error(gs_error_rangecheck); * if it exists as a forward reference, set its type and return 0; * otherwise, create the object with the given type and return 1. * pname = 0 is allowed: in this case, simply create the object. diff --git a/devices/vector/gdevpdtc.c b/devices/vector/gdevpdtc.c index 7b5618fc8..6c0467ba7 100644 --- a/devices/vector/gdevpdtc.c +++ b/devices/vector/gdevpdtc.c @@ -143,7 +143,7 @@ process_composite_text(gs_text_enum_t *pte, void *vbuf, uint bsize) if (code < 0) { if (code == gs_error_undefined && new_font && new_font->FontType == ft_encrypted2) /* Caused by trying to make a CFF font resource for ps2write, which doesn't support CFF, abort now! */ - return gs_error_invalidfont; + return_error(gs_error_invalidfont); return code; } curr.xy_index = out.xy_index; /* pdf_encode_process_string advanced it. */ @@ -521,7 +521,7 @@ scan_cmap_text(pdf_text_enum_t *pte, void *vbuf) */ pdev->type3charpath = 1; pte->current_font = subfont; - return gs_error_undefined; + return_error(gs_error_undefined); } if (subfont->FontType == ft_encrypted || subfont->FontType == ft_encrypted2) { font_change = (subfont != subfont0 && subfont0 != NULL); @@ -628,7 +628,7 @@ scan_cmap_text(pdf_text_enum_t *pte, void *vbuf) case 2: emprintf(pdev->memory, "All used glyphs mst be present in fonts for PDF/A, aborting conversion.\n"); - return gs_error_invalidfont; + return_error(gs_error_invalidfont); break; default: emprintf(pdev->memory, diff --git a/devices/vector/gdevpdte.c b/devices/vector/gdevpdte.c index fde5a69ad..64e75756f 100644 --- a/devices/vector/gdevpdte.c +++ b/devices/vector/gdevpdte.c @@ -267,7 +267,7 @@ pdf_encode_string_element(gx_device_pdf *pdev, gs_font *font, pdf_font_resource_ * as a glyph in a font. This will eliminate the problem * and the fiel should appear the same as the original. */ - return gs_error_unknownerror; + return_error(gs_error_unknownerror); break; case 2: emprintf(pdev->memory, @@ -275,7 +275,7 @@ pdf_encode_string_element(gx_device_pdf *pdev, gs_font *font, pdf_font_resource_ /* Careful here, only certain errors will bubble up * through the text processing. */ - return gs_error_invalidfont; + return_error(gs_error_invalidfont); break; default: emprintf(pdev->memory, @@ -830,12 +830,12 @@ pdf_char_widths(gx_device_pdf *const pdev, font->FontType == ft_MicroType || font->FontType == ft_GL2_stick_user_defined || font->FontType == ft_GL2_531) { if (!(pdfont->used[ch >> 3] & 0x80 >> (ch & 7))) - return gs_error_undefined; /* The charproc was not accumulated. */ + return_error(gs_error_undefined); /* The charproc was not accumulated. */ if (!pdev->charproc_just_accumulated && !(pdfont->u.simple.s.type3.cached[ch >> 3] & 0x80 >> (ch & 7))) { /* The charproc uses setcharwidth. Need to accumulate again to check for a glyph variation. */ - return gs_error_undefined; + return_error(gs_error_undefined); } } if (pdev->charproc_just_accumulated && font->FontType == ft_user_defined) { diff --git a/devices/vector/gdevpdtt.c b/devices/vector/gdevpdtt.c index ec643bdbc..5d21ff58c 100644 --- a/devices/vector/gdevpdtt.c +++ b/devices/vector/gdevpdtt.c @@ -335,7 +335,7 @@ static const gs_text_enum_procs_t pdf_text_procs = { * aren't set up to accept this, and just throw an error. Trying to rework the * interpreter routines began turning into a gigantic task, so I chose instead * to 'set' the colours here, which is called from text_begin, where the code - * allows us to return gs_error_RemapColor. Attempting to write the colour to the PDF file + * allows us to return_error(gs_error_RemapColor. Attempting to write the colour to the PDF file * in this routine as well caused trouble keeping the graphics states synchronised, * so this functionality was left in pdf_prepare_text_drawing. */ @@ -2948,7 +2948,7 @@ static int complete_charproc(gx_device_pdf *pdev, gs_text_enum_t *pte, int code; if (pte_default->returned.current_glyph == GS_NO_GLYPH) - return gs_error_undefined; + return_error(gs_error_undefined); code = pdf_choose_output_glyph_hame(pdev, penum, &gnstr, pte_default->returned.current_glyph); if (code < 0) { return code; diff --git a/devices/vector/gdevpsdi.c b/devices/vector/gdevpsdi.c index dd1bbfee5..df42adbd5 100644 --- a/devices/vector/gdevpsdi.c +++ b/devices/vector/gdevpsdi.c @@ -271,7 +271,7 @@ setup_image_compression(psdf_binary_writer *pbw, const psdf_image_params *pdip, } dict = pdip->ACSDict; } else if (!lossless) - return gs_error_rangecheck; /* Reject the alternative stream. */ + return_error(gs_error_rangecheck); /* Reject the alternative stream. */ if (pdev->version < psdf_version_ll3 && templat == &s_zlibE_template) templat = lossless_template; if (dict != NULL) /* Some interpreters don't supply filter parameters. */ diff --git a/devices/vector/gdevpsdp.c b/devices/vector/gdevpsdp.c index b0b611937..a24889a72 100644 --- a/devices/vector/gdevpsdp.c +++ b/devices/vector/gdevpsdp.c @@ -421,7 +421,7 @@ int gdev_psdf_get_image_param(gx_device_psdf *pdev, const psdf_image_param_names (params->AutoFilterStrategy == 0 ? "JPEG2000" : params->AutoFilterStrategy)); #endif - return gs_error_undefined; + return_error(gs_error_undefined); } int gdev_psdf_get_param(gx_device *dev, char *Param, void *list) @@ -526,7 +526,7 @@ gdev_psdf_get_param(gx_device *dev, char *Param, void *list) return(psdf_write_name(plist, "CannotEmbedFontPolicy", CannotEmbedFontPolicy_names[(int)pdev->params.CannotEmbedFontPolicy])); } - return gs_error_undefined; + return_error(gs_error_undefined); } int diff --git a/devices/vector/gdevpsf1.c b/devices/vector/gdevpsf1.c index ff1f5ee74..df44c834b 100644 --- a/devices/vector/gdevpsf1.c +++ b/devices/vector/gdevpsf1.c @@ -250,7 +250,7 @@ static int CheckSubrForMM (gs_glyph_data_t *gdata, gs_font_type1 *pfont) case 12: if (*(source + 1) == 16) { if (CurrentNumberIndex < 1) - return gs_error_rangecheck; + return_error(gs_error_rangecheck); switch(Stack[CurrentNumberIndex-1]) { case 18: code = 6; diff --git a/devices/vector/gdevpsf2.c b/devices/vector/gdevpsf2.c index 7e76ee1a5..5a426b822 100644 --- a/devices/vector/gdevpsf2.c +++ b/devices/vector/gdevpsf2.c @@ -1494,7 +1494,7 @@ static int offset_error(const char *msg) { if_debug1('l', "[l]%s offset error\n", msg); - return gs_error_rangecheck; + return_error(gs_error_rangecheck); } #else # define offset_error(msg) gs_error_rangecheck diff --git a/devices/vector/gdevtxtw.c b/devices/vector/gdevtxtw.c index 438825713..2e98a19fd 100644 --- a/devices/vector/gdevtxtw.c +++ b/devices/vector/gdevtxtw.c @@ -994,7 +994,7 @@ static int txtwrite_get_param(gx_device *dev, char *Param, void *list) if (strcmp(Param, "HighLevelDevice") == 0) { return param_write_bool(plist, "HighLevelDevice", &bool_T); } - return gs_error_undefined; + return_error(gs_error_undefined); } static int @@ -2208,7 +2208,7 @@ textw_text_process(gs_text_enum_t *pte) code = txtwrite_process_plain_text(pte); break; default: - return gs_error_rangecheck; + return_error(gs_error_rangecheck); break; } if (code == 0) { |