6 files changed, 15 insertions, 39 deletions

diff --git a/apps/common/pdfapp.c b/apps/common/pdfapp.c
index 5aeb699c..7af22d04 100644
--- a/apps/common/pdfapp.c
+++ b/apps/common/pdfapp.c
@@ -131,9 +131,7 @@ void pdfapp_open(pdfapp_t *app, char *filename)
 	if (app->xref->info)
 		fz_keepobj(app->xref->info);
 
-	error = pdf_loadoutline(&app->outline, app->xref);
-	if (error)
-		pdfapp_error(app, error);
+	app->outline = pdf_loadoutline(app->xref);
 
 	app->doctitle = filename;
 	if (strrchr(app->doctitle, '\\'))
@@ -145,9 +143,7 @@ void pdfapp_open(pdfapp_t *app, char *filename)
 		obj = fz_dictgets(app->xref->info, "Title");
 		if (obj)
 		{
-			error = pdf_toutf8(&app->doctitle, obj);
-			if (error)
-				pdfapp_error(app, error);
+			app->doctitle = pdf_toutf8(obj);
 		}
 	}
 
@@ -155,9 +151,7 @@ void pdfapp_open(pdfapp_t *app, char *filename)
 	 * Start at first page
 	 */
 
-	error = pdf_getpagecount(app->xref, &app->pagecount);
-	if (error)
-		pdfapp_error(app, error);
+	app->pagecount = pdf_getpagecount(app->xref);
 
 	app->shrinkwrap = 1;
 	if (app->pageno < 1)
@@ -245,10 +239,7 @@ static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage)
 			pdf_droppage(app->page);
 		app->page = nil;
 
-		error = pdf_getpageobject(app->xref, app->pageno, &obj);
-		if (error)
-			pdfapp_error(app, error);
-
+		obj = pdf_getpageobject(app->xref, app->pageno);
 		error = pdf_loadpage(&app->page, app->xref, obj);
 		if (error)
 			pdfapp_error(app, error);
@@ -314,9 +305,7 @@ static void pdfapp_gotopage(pdfapp_t *app, fz_obj *obj)
 	fz_error error;
 	int page;
 
-	error = pdf_findpageobject(app->xref, obj, &page);
-	if (error)
-		pdfapp_error(app, error);
+	page = pdf_findpageobject(app->xref, obj);
 
 	if (app->histlen + 1 == 256)
 	{
diff --git a/apps/common/pdftool.c b/apps/common/pdftool.c
index 5961e3fb..772fc9a0 100644
--- a/apps/common/pdftool.c
+++ b/apps/common/pdftool.c
@@ -69,12 +69,7 @@ void openxref(char *filename, char *password, int dieonbadpass)
 	if (xref->info)
 		fz_keepobj(xref->info);
 
-	error = pdf_getpagecount(xref, &pagecount);
-	if (error)
-	{
-		fz_catch(error, "cannot determine page count, attempting to continue.");
-		pagecount = 0;
-	}
+	pagecount = pdf_getpagecount(xref);
 }
 
 void closexref(void)
diff --git a/apps/pdfclean.c b/apps/pdfclean.c
index 7db29e0c..a558d17d 100644
--- a/apps/pdfclean.c
+++ b/apps/pdfclean.c
@@ -142,11 +142,11 @@ static void expandstream(fz_obj *obj, int oid, int gen)
     if (error)
 	die(error);
 
-    fz_copydict(&newdict, obj);
+    newdict = fz_copydict(obj);
     fz_dictdels(newdict, "Filter");
     fz_dictdels(newdict, "DecodeParms");
 
-    fz_newint(&newlen, buf->wp - buf->rp);
+    newlen = fz_newint(buf->wp - buf->rp);
     fz_dictputs(newdict, "Length", newlen);
     fz_dropobj(newlen);
 
@@ -227,9 +227,9 @@ static void savexref(void)
     }
     fprintf(out, "\n");
 
-    fz_newdict(&trailer, 5);
+    trailer = fz_newdict(5);
 
-    fz_newint(&obj, xref->len);
+    obj = fz_newint(xref->len);
     fz_dictputs(trailer, "Size", obj);
     fz_dropobj(obj);
 
diff --git a/apps/pdfdraw.c b/apps/pdfdraw.c
index 4cc3bd51..22122e73 100644
--- a/apps/pdfdraw.c
+++ b/apps/pdfdraw.c
@@ -93,9 +93,7 @@ static void drawloadpage(int pagenum, struct benchmark *loadtimes)
 	gettime(&start);
     }
 
-    error = pdf_getpageobject(xref, pagenum, &pageobj);
-    if (error)
-	die(error);
+    pageobj = pdf_getpageobject(xref, pagenum);
     error = pdf_loadpage(&drawpage, xref, pageobj);
     if (error)
 	die(error);
diff --git a/apps/pdfextract.c b/apps/pdfextract.c
index 2bead4c5..4f4fb24a 100644
--- a/apps/pdfextract.c
+++ b/apps/pdfextract.c
@@ -38,14 +38,10 @@ static void saveimage(fz_obj *obj, int num, int gen)
     int x;
     int y;
 
-    error = fz_newindirect(&ref, num, gen, xref);
-    if (error)
-        die(error);
-
-    error = pdf_newstore(&xref->store);
-    if (error)
-        die(error);
+    ref = fz_newindirect(num, gen, xref);
 
+    xref->store = pdf_newstore();
+ 
     error = pdf_loadimage(&img, xref, ref);
     if (error)
         die(error);
diff --git a/apps/pdfinfo.c b/apps/pdfinfo.c
index 36325f10..5c9bd927 100644
--- a/apps/pdfinfo.c
+++ b/apps/pdfinfo.c
@@ -673,9 +673,7 @@ gatherinfo(int show, int page)
 	fz_obj *shade;
 	fz_obj *pattern;
 
-	error = pdf_getpageobject(xref, page, &pageobj);
-	if (error)
-		die(error);
+	pageobj = pdf_getpageobject(xref, page);
 
 	if (!pageobj)
 		die(fz_throw("cannot retrieve info from page %d", page));