diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/common/pdfapp.c | 10 | ||||
-rw-r--r-- | apps/mozilla/moz_main.c | 8 | ||||
-rw-r--r-- | apps/pdfapp.h | 2 | ||||
-rw-r--r-- | apps/pdfclean.c | 24 | ||||
-rw-r--r-- | apps/pdfdraw.c | 12 | ||||
-rw-r--r-- | apps/pdfinfo.c | 34 | ||||
-rw-r--r-- | apps/pdfshow.c | 8 | ||||
-rw-r--r-- | apps/unix/x11pdf.c | 2 | ||||
-rw-r--r-- | apps/windows/winmain.c | 4 |
9 files changed, 52 insertions, 52 deletions
diff --git a/apps/common/pdfapp.c b/apps/common/pdfapp.c index b3507097..e94e096b 100644 --- a/apps/common/pdfapp.c +++ b/apps/common/pdfapp.c @@ -21,7 +21,7 @@ void pdfapp_warn(pdfapp_t *app, const char *fmt, ...) winwarn(app, buf); } -void pdfapp_error(pdfapp_t *app, fz_error *error) +void pdfapp_error(pdfapp_t *app, fz_error error) { winerror(app, error); } @@ -52,7 +52,7 @@ char *pdfapp_usage(pdfapp_t *app) void pdfapp_init(pdfapp_t *app) { - fz_error *error; + fz_error error; memset(app, 0, sizeof(pdfapp_t)); @@ -66,7 +66,7 @@ void pdfapp_init(pdfapp_t *app) void pdfapp_open(pdfapp_t *app, char *filename) { - fz_error *error; + fz_error error; fz_obj *obj; char *password = ""; @@ -244,7 +244,7 @@ void pdfapp_panview(pdfapp_t *app, int newx, int newy) void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage) { char buf[256]; - fz_error *error; + fz_error error; fz_matrix ctm; fz_rect bbox; fz_obj *obj; @@ -632,7 +632,7 @@ void pdfapp_oncopy(pdfapp_t *app, unsigned short *ucsbuf, int ucslen) { ucsbuf[0] = 0; #if 0 /* pdf_loadtextfromtree needs rewriting, so removing this temporarily */ - fz_error *error; + fz_error error; pdf_textline *line, *ln; int y, c; int i, p; diff --git a/apps/mozilla/moz_main.c b/apps/mozilla/moz_main.c index 4e78596f..bf393353 100644 --- a/apps/mozilla/moz_main.c +++ b/apps/mozilla/moz_main.c @@ -61,7 +61,7 @@ void pdfmoz_warn(pdfmoz_t *moz, const char *fmt, ...) NPN_Status(moz->inst, moz->error); } -void pdfmoz_error(pdfmoz_t *moz, fz_error *error) +void pdfmoz_error(pdfmoz_t *moz, fz_error error) { strcpy(moz->error, error->msg); InvalidateRect(moz->hwnd, NULL, FALSE); @@ -71,7 +71,7 @@ void pdfmoz_error(pdfmoz_t *moz, fz_error *error) void pdfmoz_open(pdfmoz_t *moz, char *filename) { SCROLLINFO si; - fz_error *error; + fz_error error; fz_obj *obj; char *password = ""; pdf_pagetree *pages; @@ -256,7 +256,7 @@ fz_matrix pdfmoz_pagectm(pdfmoz_t *moz, int pagenum) void pdfmoz_loadpage(pdfmoz_t *moz, int pagenum) { page_t *page = moz->pages + pagenum; - fz_error *error; + fz_error error; if (page->page) return; @@ -269,7 +269,7 @@ void pdfmoz_loadpage(pdfmoz_t *moz, int pagenum) void pdfmoz_drawpage(pdfmoz_t *moz, int pagenum) { page_t *page = moz->pages + pagenum; - fz_error *error; + fz_error error; fz_matrix ctm; fz_rect bbox; diff --git a/apps/pdfapp.h b/apps/pdfapp.h index 9f03505e..0acccc2b 100644 --- a/apps/pdfapp.h +++ b/apps/pdfapp.h @@ -9,7 +9,7 @@ typedef struct pdfapp_s pdfapp_t; enum { ARROW, HAND, WAIT }; extern void winwarn(pdfapp_t*, char *s); -extern void winerror(pdfapp_t*, fz_error *error); +extern void winerror(pdfapp_t*, fz_error error); extern void wintitle(pdfapp_t*, char *title); extern void winresize(pdfapp_t*, int w, int h); extern void winconvert(pdfapp_t*, fz_pixmap *image); diff --git a/apps/pdfclean.c b/apps/pdfclean.c index 58fc9b68..208d2786 100644 --- a/apps/pdfclean.c +++ b/apps/pdfclean.c @@ -24,7 +24,7 @@ int doencrypt = 0; int dogarbage = 0; int doexpand = 0; -void die(fz_error *eo) +void die(fz_error eo) { fz_catch(eo, "aborting"); exit(1); @@ -32,7 +32,7 @@ void die(fz_error *eo) void openxref(char *filename, char *password) { - fz_error *error; + fz_error error; fz_obj *obj; error = pdf_newxref(&xref); @@ -81,11 +81,11 @@ void openxref(char *filename, char *password) * Garbage collect objects not reachable from the trailer. */ -static fz_error *sweepref(pdf_xref *xref, fz_obj *ref); +static fz_error sweepref(pdf_xref *xref, fz_obj *ref); -static fz_error *sweepobj(pdf_xref *xref, fz_obj *obj) +static fz_error sweepobj(pdf_xref *xref, fz_obj *obj) { - fz_error *error; + fz_error error; int i; if (fz_isdict(obj)) @@ -114,9 +114,9 @@ static fz_error *sweepobj(pdf_xref *xref, fz_obj *obj) return fz_okay; } -static fz_error *sweepref(pdf_xref *xref, fz_obj *ref) +static fz_error sweepref(pdf_xref *xref, fz_obj *ref) { - fz_error *error; + fz_error error; fz_obj *obj; fz_obj *len; int oid, gen; @@ -160,7 +160,7 @@ static fz_error *sweepref(pdf_xref *xref, fz_obj *ref) void preloadobjstms(void) { - fz_error *error; + fz_error error; fz_obj *obj; int oid; @@ -178,7 +178,7 @@ void preloadobjstms(void) void copystream(fz_obj *obj, int oid, int gen) { - fz_error *error; + fz_error error; fz_buffer *buf; error = pdf_loadrawstream(&buf, xref, oid, gen); @@ -203,7 +203,7 @@ void copystream(fz_obj *obj, int oid, int gen) void expandstream(fz_obj *obj, int oid, int gen) { - fz_error *error; + fz_error error; fz_buffer *buf; fz_obj *newdict, *newlen; @@ -239,7 +239,7 @@ void expandstream(fz_obj *obj, int oid, int gen) void saveobject(int oid, int gen) { - fz_error *error; + fz_error error; fz_obj *obj; fz_obj *type; @@ -361,7 +361,7 @@ int main(int argc, char **argv) unsigned perms = 0xfffff0c0; /* nothing allowed */ int keylen = 40; char *password = ""; - fz_error *error; + fz_error error; int c, oid; int lastfree; diff --git a/apps/pdfdraw.c b/apps/pdfdraw.c index cc7ce53e..a095cc29 100644 --- a/apps/pdfdraw.c +++ b/apps/pdfdraw.c @@ -21,7 +21,7 @@ char *basename; pdf_xref *xref = nil; pdf_pagetree *pagetree = nil; -void die(fz_error *eo) +void die(fz_error eo) { fz_catch(eo, "aborting"); if (drawgc) @@ -31,7 +31,7 @@ void die(fz_error *eo) void openxref(char *filename, char *password) { - fz_error *error; + fz_error error; fz_obj *obj; basename = strrchr(filename, '/'); @@ -138,7 +138,7 @@ void gettime(long *time_) void drawloadpage(int pagenum, struct benchmark *loadtimes) { - fz_error *error; + fz_error error; fz_obj *pageobj; long start; long end; @@ -197,7 +197,7 @@ void drawfreepage(void) void drawpnm(int pagenum, struct benchmark *loadtimes, struct benchmark *drawtimes) { - fz_error *error; + fz_error error; fz_matrix ctm; fz_irect bbox; fz_pixmap *pix; @@ -323,7 +323,7 @@ void drawpnm(int pagenum, struct benchmark *loadtimes, struct benchmark *drawtim void drawtxt(int pagenum) { #if 0 /* removed temporarily pending rewrite of pdf_loadtextfromtree */ - fz_error *error; + fz_error error; pdf_textline *line; fz_matrix ctm; @@ -429,7 +429,7 @@ void drawpages(char *pagelist) int main(int argc, char **argv) { - fz_error *error; + fz_error error; char *password = ""; int c; enum { NO_FILE_OPENED, NO_PAGES_DRAWN, DREW_PAGES } state; diff --git a/apps/pdfinfo.c b/apps/pdfinfo.c index c785391d..46bf11f0 100644 --- a/apps/pdfinfo.c +++ b/apps/pdfinfo.c @@ -28,7 +28,7 @@ pdf_xref *src = nil; pdf_outline *srcoutline = nil; pdf_pagetree *srcpages = nil; -void die(fz_error *eo) +void die(fz_error eo) { fz_catch(eo, "aborting"); if (drawgc) @@ -61,7 +61,7 @@ void closesrc(void) void opensrc(char *filename, char *password, int loadpages) { - fz_error *error; + fz_error error; fz_obj *obj; closesrc(); @@ -230,10 +230,10 @@ gatherglobalinfo() info->u.info.obj = src->info; } -fz_error * +fz_error gatherdimensions(int page, fz_obj *pageref, fz_obj *pageobj) { - fz_error *error; + fz_error error; fz_obj *ref; fz_rect bbox; fz_obj *obj; @@ -280,10 +280,10 @@ gatherdimensions(int page, fz_obj *pageref, fz_obj *pageobj) return fz_okay; } -fz_error * +fz_error gatherfonts(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) { - fz_error *error; + fz_error error; int i; for (i = 0; i < fz_dictlen(dict); i++) @@ -365,10 +365,10 @@ gatherfonts(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) return fz_okay; } -fz_error * +fz_error gatherimages(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) { - fz_error *error; + fz_error error; int i; for (i = 0; i < fz_dictlen(dict); i++) @@ -557,10 +557,10 @@ gatherimages(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) return fz_okay; } -fz_error * +fz_error gatherforms(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) { - fz_error *error; + fz_error error; int i; for (i = 0; i < fz_dictlen(dict); i++) @@ -655,10 +655,10 @@ gatherforms(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) return fz_okay; } -fz_error * +fz_error gatherpsobjs(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) { - fz_error *error; + fz_error error; int i; for (i = 0; i < fz_dictlen(dict); i++) @@ -730,10 +730,10 @@ gatherpsobjs(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) return fz_okay; } -fz_error * +fz_error gathershadings(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) { - fz_error *error; + fz_error error; int i; for (i = 0; i < fz_dictlen(dict); i++) @@ -790,10 +790,10 @@ gathershadings(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) return fz_okay; } -fz_error * +fz_error gatherpatterns(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) { - fz_error *error; + fz_error error; int i; for (i = 0; i < fz_dictlen(dict); i++) @@ -889,7 +889,7 @@ gatherpatterns(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) void gatherinfo(int show, int page) { - fz_error *error; + fz_error error; fz_obj *pageref; fz_obj *pageobj; fz_obj *rsrc; diff --git a/apps/pdfshow.c b/apps/pdfshow.c index f9026938..22c6c247 100644 --- a/apps/pdfshow.c +++ b/apps/pdfshow.c @@ -7,7 +7,7 @@ pdf_xref *xref = NULL; -void die(fz_error *eo) +void die(fz_error eo) { fz_catch(eo, "aborting"); exit(1); @@ -15,7 +15,7 @@ void die(fz_error *eo) void openxref(char *filename, char *password) { - fz_error *error; + fz_error error; fz_obj *obj; error = pdf_newxref(&xref); @@ -115,7 +115,7 @@ void showsafe(unsigned char *buf, int n) void showstream(int num, int gen) { - fz_error *error; + fz_error error; fz_stream *stm; unsigned char buf[2048]; int n; @@ -147,7 +147,7 @@ void showstream(int num, int gen) void showobject(int num, int gen) { - fz_error *error; + fz_error error; fz_obj *obj; if (!xref) diff --git a/apps/unix/x11pdf.c b/apps/unix/x11pdf.c index 18507f62..42fd6a98 100644 --- a/apps/unix/x11pdf.c +++ b/apps/unix/x11pdf.c @@ -82,7 +82,7 @@ void winwarn(pdfapp_t *app, char *msg) fprintf(stderr, "mupdf: %s\n", msg); } -void winerror(pdfapp_t *app, fz_error *error) +void winerror(pdfapp_t *app, fz_error error) { fz_catch(error, "aborting"); exit(1); diff --git a/apps/windows/winmain.c b/apps/windows/winmain.c index 678736f1..3a6aea87 100644 --- a/apps/windows/winmain.c +++ b/apps/windows/winmain.c @@ -107,7 +107,7 @@ void winwarn(pdfapp_t *app, char *msg) MessageBoxA(hwndframe, msg, "MuPDF: Warning", MB_ICONWARNING); } -void winerror(pdfapp_t *app, fz_error *error) +void winerror(pdfapp_t *app, fz_error error) { char msg[4096]; char buf[200]; @@ -233,7 +233,7 @@ dloginfoproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) #define SETUCS(ID) \ { \ - fz_error *error; \ + fz_error error; \ unsigned short *ucs; \ error = pdf_toucs2(&ucs, obj); \ if (!error) \ |