From 549dbe8e5563f9a228c8de35f07d0108e3adf74c Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ghostscript.com>
Date: Fri, 20 Nov 2009 02:47:10 +0100
Subject: As a new code policy in MuPDF, malloc cannot return NULL. As a result
 we can get rid of large chunks of untested error handling code. This patch
 cleans up the handling of fz_obj.

---
 apps/common/pdfapp.c  | 21 +++++----------------
 apps/common/pdftool.c |  7 +------
 2 files changed, 6 insertions(+), 22 deletions(-)

(limited to 'apps/common')

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)
-- 
cgit v1.2.3