Rename fz_close_* and fz_free_* to fz_drop_*.

Rename fz_close to fz_drop_stream.
Rename fz_close_archive to fz_drop_archive.
Rename fz_close_output to fz_drop_output.

Rename fz_free_* to fz_drop_*.
Rename pdf_free_* to pdf_drop_*.
Rename xps_free_* to xps_drop_*.

10 files changed, 61 insertions, 61 deletions

diff --git a/platform/android/jni/mupdf.c b/platform/android/jni/mupdf.c
index 1b2b6e2f..1486e75a 100644
--- a/platform/android/jni/mupdf.c
+++ b/platform/android/jni/mupdf.c
@@ -332,7 +332,7 @@ JNI_FN(MuPDFCore_openFile)(JNIEnv * env, jobject thiz, jstring jfilename)
 		LOGE("Failed: %s", ctx->error->message);
 		fz_drop_document(glo->doc);
 		glo->doc = NULL;
-		fz_free_context(ctx);
+		fz_drop_context(ctx);
 		glo->ctx = NULL;
 		free(glo);
 		glo = NULL;
@@ -479,14 +479,14 @@ JNI_FN(MuPDFCore_openBuffer)(JNIEnv * env, jobject thiz, jstring jmagic)
 	}
 	fz_always(ctx)
 	{
-		fz_close(stream);
+		fz_drop_stream(stream);
 	}
 	fz_catch(ctx)
 	{
 		LOGE("Failed: %s", ctx->error->message);
 		fz_drop_document(glo->doc);
 		glo->doc = NULL;
-		fz_free_context(ctx);
+		fz_drop_context(ctx);
 		glo->ctx = NULL;
 		free(glo);
 		glo = NULL;
@@ -730,7 +730,7 @@ JNI_FN(MuPDFCore_drawPage)(JNIEnv *env, jobject thiz, jobject bitmap,
 			pc->page_list = fz_new_display_list(ctx);
 			dev = fz_new_list_device(ctx, pc->page_list);
 			fz_run_page_contents(doc, pc->page, dev, &fz_identity, cookie);
-			fz_free_device(dev);
+			fz_drop_device(dev);
 			dev = NULL;
 			if (cookie != NULL && cookie->abort)
 			{
@@ -746,7 +746,7 @@ JNI_FN(MuPDFCore_drawPage)(JNIEnv *env, jobject thiz, jobject bitmap,
 			dev = fz_new_list_device(ctx, pc->annot_list);
 			for (annot = fz_first_annot(doc, pc->page); annot; annot = fz_next_annot(doc, annot))
 				fz_run_annot(doc, pc->page, annot, dev, &fz_identity, cookie);
-			fz_free_device(dev);
+			fz_drop_device(dev);
 			dev = NULL;
 			if (cookie != NULL && cookie->abort)
 			{
@@ -808,14 +808,14 @@ JNI_FN(MuPDFCore_drawPage)(JNIEnv *env, jobject thiz, jobject bitmap,
 			LOGI("100 renders in %d (%d per sec)", time, CLOCKS_PER_SEC);
 		}
 #endif
-		fz_free_device(dev);
+		fz_drop_device(dev);
 		dev = NULL;
 		fz_drop_pixmap(ctx, pix);
 		LOGI("Rendered");
 	}
 	fz_always(ctx)
 	{
-		fz_free_device(dev);
+		fz_drop_device(dev);
 		dev = NULL;
 	}
 	fz_catch(ctx)
@@ -928,7 +928,7 @@ JNI_FN(MuPDFCore_updatePageInternal)(JNIEnv *env, jobject thiz, jobject bitmap,
 			pc->page_list = fz_new_display_list(ctx);
 			dev = fz_new_list_device(ctx, pc->page_list);
 			fz_run_page_contents(doc, pc->page, dev, &fz_identity, cookie);
-			fz_free_device(dev);
+			fz_drop_device(dev);
 			dev = NULL;
 			if (cookie != NULL && cookie->abort)
 			{
@@ -943,7 +943,7 @@ JNI_FN(MuPDFCore_updatePageInternal)(JNIEnv *env, jobject thiz, jobject bitmap,
 			dev = fz_new_list_device(ctx, pc->annot_list);
 			for (annot = fz_first_annot(doc, pc->page); annot; annot = fz_next_annot(doc, annot))
 				fz_run_annot(doc, pc->page, annot, dev, &fz_identity, cookie);
-			fz_free_device(dev);
+			fz_drop_device(dev);
 			dev = NULL;
 			if (cookie != NULL && cookie->abort)
 			{
@@ -999,7 +999,7 @@ JNI_FN(MuPDFCore_updatePageInternal)(JNIEnv *env, jobject thiz, jobject bitmap,
 				if (cookie != NULL && cookie->abort)
 					fz_throw(ctx, FZ_ERROR_GENERIC, "Render aborted");
 
-				fz_free_device(dev);
+				fz_drop_device(dev);
 				dev = NULL;
 			}
 		}
@@ -1012,7 +1012,7 @@ JNI_FN(MuPDFCore_updatePageInternal)(JNIEnv *env, jobject thiz, jobject bitmap,
 	}
 	fz_always(ctx)
 	{
-		fz_free_device(dev);
+		fz_drop_device(dev);
 		dev = NULL;
 	}
 	fz_catch(ctx)
@@ -1146,7 +1146,7 @@ JNI_FN(MuPDFCore_hasOutlineInternal)(JNIEnv * env, jobject thiz)
 	globals *glo = get_globals(env, thiz);
 	fz_outline *outline = fz_load_outline(glo->doc);
 
-	fz_free_outline(glo->ctx, outline);
+	fz_drop_outline(glo->ctx, outline);
 	return (outline == NULL) ? JNI_FALSE : JNI_TRUE;
 }
 
@@ -1179,7 +1179,7 @@ JNI_FN(MuPDFCore_getOutlineInternal)(JNIEnv * env, jobject thiz)
 	ret = fillInOutlineItems(env, olClass, ctor, arr, 0, outline, 0) > 0
 			? arr
 			:NULL;
-	fz_free_outline(glo->ctx, outline);
+	fz_drop_outline(glo->ctx, outline);
 	return ret;
 }
 
@@ -1227,16 +1227,16 @@ JNI_FN(MuPDFCore_searchPage)(JNIEnv * env, jobject thiz, jstring jtext)
 		text = fz_new_text_page(ctx);
 		dev = fz_new_text_device(ctx, sheet, text);
 		fz_run_page(doc, pc->page, dev, &ctm, NULL);
-		fz_free_device(dev);
+		fz_drop_device(dev);
 		dev = NULL;
 
 		hit_count = fz_search_text_page(ctx, text, str, glo->hit_bbox, MAX_SEARCH_HITS);
 	}
 	fz_always(ctx)
 	{
-		fz_free_text_page(ctx, text);
-		fz_free_text_sheet(ctx, sheet);
-		fz_free_device(dev);
+		fz_drop_text_page(ctx, text);
+		fz_drop_text_sheet(ctx, sheet);
+		fz_drop_device(dev);
 	}
 	fz_catch(ctx)
 	{
@@ -1317,7 +1317,7 @@ JNI_FN(MuPDFCore_text)(JNIEnv * env, jobject thiz)
 		text = fz_new_text_page(ctx);
 		dev = fz_new_text_device(ctx, sheet, text);
 		fz_run_page(doc, pc->page, dev, &ctm, NULL);
-		fz_free_device(dev);
+		fz_drop_device(dev);
 		dev = NULL;
 
 		barr = (*env)->NewObjectArray(env, text->len, textBlockClass, NULL);
@@ -1378,9 +1378,9 @@ JNI_FN(MuPDFCore_text)(JNIEnv * env, jobject thiz)
 	}
 	fz_always(ctx)
 	{
-		fz_free_text_page(ctx, text);
-		fz_free_text_sheet(ctx, sheet);
-		fz_free_device(dev);
+		fz_drop_text_page(ctx, text);
+		fz_drop_text_sheet(ctx, sheet);
+		fz_drop_device(dev);
 	}
 	fz_catch(ctx)
 	{
@@ -1425,7 +1425,7 @@ JNI_FN(MuPDFCore_textAsHtml)(JNIEnv * env, jobject thiz)
 		text = fz_new_text_page(ctx);
 		dev = fz_new_text_device(ctx, sheet, text);
 		fz_run_page(doc, pc->page, dev, &ctm, NULL);
-		fz_free_device(dev);
+		fz_drop_device(dev);
 		dev = NULL;
 
 		fz_analyze_text(ctx, sheet, text);
@@ -1448,7 +1448,7 @@ JNI_FN(MuPDFCore_textAsHtml)(JNIEnv * env, jobject thiz)
 		fz_printf(out, "<style>\n");
 		fz_print_text_sheet(ctx, out, sheet);
 		fz_printf(out, "</style>\n</html>\n");
-		fz_close_output(out);
+		fz_drop_output(out);
 		out = NULL;
 
 		bArray = (*env)->NewByteArray(env, buf->len);
@@ -1459,10 +1459,10 @@ JNI_FN(MuPDFCore_textAsHtml)(JNIEnv * env, jobject thiz)
 	}
 	fz_always(ctx)
 	{
-		fz_free_text_page(ctx, text);
-		fz_free_text_sheet(ctx, sheet);
-		fz_free_device(dev);
-		fz_close_output(out);
+		fz_drop_text_page(ctx, text);
+		fz_drop_text_sheet(ctx, sheet);
+		fz_drop_device(dev);
+		fz_drop_output(out);
 		fz_drop_buffer(ctx, buf);
 	}
 	fz_catch(ctx)
@@ -1733,7 +1733,7 @@ JNI_FN(MuPDFCore_destroying)(JNIEnv * env, jobject thiz)
 	fz_free(glo->ctx, glo->current_path);
 	glo->current_path = NULL;
 	close_doc(glo);
-	fz_free_context(glo->ctx);
+	fz_drop_context(glo->ctx);
 	glo->ctx = NULL;
 	free(glo);
 #ifdef MEMENTO
diff --git a/platform/ios/Classes/MuDocumentController.m b/platform/ios/Classes/MuDocumentController.m
index 3c0391a8..01d8221c 100644
--- a/platform/ios/Classes/MuDocumentController.m
+++ b/platform/ios/Classes/MuDocumentController.m
@@ -183,7 +183,7 @@ static void saveDoc(char *current_path, fz_document *doc)
 			outline = [[MuOutlineController alloc] initWithTarget: self titles: titles pages: pages];
 		[titles release];
 		[pages release];
-		fz_free_outline(ctx, root);
+		fz_drop_outline(ctx, root);
 	}
 
 	return self;
diff --git a/platform/ios/Classes/MuPageViewNormal.m b/platform/ios/Classes/MuPageViewNormal.m
index 3c461a00..5e115ea0 100644
--- a/platform/ios/Classes/MuPageViewNormal.m
+++ b/platform/ios/Classes/MuPageViewNormal.m
@@ -78,7 +78,7 @@ static NSArray *enumerateWords(fz_document *doc, fz_page *page)
 		text = fz_new_text_page(ctx);
 		dev = fz_new_text_device(ctx, sheet, text);
 		fz_run_page(doc, page, dev, &fz_identity, NULL);
-		fz_free_device(dev);
+		fz_drop_device(dev);
 		dev = NULL;
 
 		for (b = 0; b < text->len; b++)
@@ -138,9 +138,9 @@ static NSArray *enumerateWords(fz_document *doc, fz_page *page)
 	}
 	fz_always(ctx);
 	{
-		fz_free_text_page(ctx, text);
-		fz_free_text_sheet(ctx, sheet);
-		fz_free_device(dev);
+		fz_drop_text_page(ctx, text);
+		fz_drop_text_sheet(ctx, sheet);
+		fz_drop_device(dev);
 	}
 	fz_catch(ctx)
 	{
@@ -383,7 +383,7 @@ static fz_display_list *create_page_list(fz_document *doc, fz_page *page)
 	}
 	fz_always(ctx)
 	{
-		fz_free_device(dev);
+		fz_drop_device(dev);
 	}
 	fz_catch(ctx)
 	{
@@ -413,7 +413,7 @@ static fz_display_list *create_annot_list(fz_document *doc, fz_page *page)
 	}
 	fz_always(ctx)
 	{
-		fz_free_device(dev);
+		fz_drop_device(dev);
 	}
 	fz_catch(ctx)
 	{
@@ -461,7 +461,7 @@ static fz_pixmap *renderPixmap(fz_document *doc, fz_display_list *page_list, fz_
 	}
 	fz_always(ctx)
 	{
-		fz_free_device(dev);
+		fz_drop_device(dev);
 	}
 	fz_catch(ctx)
 	{
@@ -563,7 +563,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
 				dev = fz_new_draw_device_with_bbox(ctx, pixmap, &abox);
 				fz_run_display_list(page_list, dev, &ctm, &arect, NULL);
 				fz_run_display_list(annot_list, dev, &ctm, &arect, NULL);
-				fz_free_device(dev);
+				fz_drop_device(dev);
 				dev = NULL;
 			}
 			rlist = rlist->next;
@@ -571,7 +571,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa
 	}
 	fz_always(ctx)
 	{
-		fz_free_device(dev);
+		fz_drop_device(dev);
 	}
 	fz_catch(ctx)
 	{
diff --git a/platform/ios/Classes/MuPageViewReflow.m b/platform/ios/Classes/MuPageViewReflow.m
index bc0e2c79..a9716df5 100644
--- a/platform/ios/Classes/MuPageViewReflow.m
+++ b/platform/ios/Classes/MuPageViewReflow.m
@@ -27,7 +27,7 @@ NSString *textAsHtml(fz_document *doc, int pageNum)
 		dev = fz_new_text_device(ctx, sheet, text);
 		page = fz_load_page(doc, pageNum);
 		fz_run_page(doc, page, dev, &ctm, NULL);
-		fz_free_device(dev);
+		fz_drop_device(dev);
 		dev = NULL;
 
 		fz_analyze_text(ctx, sheet, text);
@@ -57,9 +57,9 @@ NSString *textAsHtml(fz_document *doc, int pageNum)
 	}
 	fz_always(ctx)
 	{
-		fz_free_text_page(ctx, text);
-		fz_free_text_sheet(ctx, sheet);
-		fz_free_device(dev);
+		fz_drop_text_page(ctx, text);
+		fz_drop_text_sheet(ctx, sheet);
+		fz_drop_device(dev);
 		fz_close_output(out);
 		fz_drop_buffer(ctx, buf);
 		fz_free_page(doc, page);
diff --git a/platform/ios/Classes/MuPrintPageRenderer.m b/platform/ios/Classes/MuPrintPageRenderer.m
index 36f66ee9..9408a6e3 100644
--- a/platform/ios/Classes/MuPrintPageRenderer.m
+++ b/platform/ios/Classes/MuPrintPageRenderer.m
@@ -114,7 +114,7 @@ static void renderPage(fz_document *doc, fz_page *page, fz_pixmap *pix, fz_matri
 		}
 		fz_always(ctx)
 		{
-			fz_free_device(dev);
+			fz_drop_device(dev);
 		}
 		fz_catch(ctx)
 		{
diff --git a/platform/ios/common.m b/platform/ios/common.m
index f4a1676d..6ca320e9 100644
--- a/platform/ios/common.m
+++ b/platform/ios/common.m
@@ -25,12 +25,12 @@ int search_page(fz_document *doc, int number, char *needle, fz_cookie *cookie)
 	fz_text_page *text = fz_new_text_page(ctx);
 	fz_device *dev = fz_new_text_device(ctx, sheet, text);
 	fz_run_page(doc, page, dev, &fz_identity, cookie);
-	fz_free_device(dev);
+	fz_drop_device(dev);
 
 	hit_count = fz_search_text_page(ctx, text, needle, hit_bbox, nelem(hit_bbox));
 
-	fz_free_text_page(ctx, text);
-	fz_free_text_sheet(ctx, sheet);
+	fz_drop_text_page(ctx, text);
+	fz_drop_text_sheet(ctx, sheet);
 	fz_free_page(doc, page);
 
 	return hit_count;
diff --git a/platform/x11/jstest_main.c b/platform/x11/jstest_main.c
index 2188855d..98fec194 100644
--- a/platform/x11/jstest_main.c
+++ b/platform/x11/jstest_main.c
@@ -426,7 +426,7 @@ main(int argc, char *argv[])
 	if (file_open)
 		pdfapp_close(&gapp);
 
-	fz_free_context(ctx);
+	fz_drop_context(ctx);
 
 	return 0;
 }
diff --git a/platform/x11/pdfapp.c b/platform/x11/pdfapp.c
index 7ce52e9e..b950fec5 100644
--- a/platform/x11/pdfapp.c
+++ b/platform/x11/pdfapp.c
@@ -371,10 +371,10 @@ void pdfapp_close(pdfapp_t *app)
 	fz_drop_display_list(app->ctx, app->annotations_list);
 	app->annotations_list = NULL;
 
-	fz_free_text_page(app->ctx, app->page_text);
+	fz_drop_text_page(app->ctx, app->page_text);
 	app->page_text = NULL;
 
-	fz_free_text_sheet(app->ctx, app->page_sheet);
+	fz_drop_text_sheet(app->ctx, app->page_sheet);
 	app->page_sheet = NULL;
 
 	fz_drop_link(app->ctx, app->page_links);
@@ -395,7 +395,7 @@ void pdfapp_close(pdfapp_t *app)
 	fz_drop_pixmap(app->ctx, app->old_image);
 	app->old_image = NULL;
 
-	fz_free_outline(app->ctx, app->outline);
+	fz_drop_outline(app->ctx, app->outline);
 	app->outline = NULL;
 
 	fz_free_page(app->doc, app->page);
@@ -405,7 +405,7 @@ void pdfapp_close(pdfapp_t *app)
 	app->doc = NULL;
 
 #ifdef HAVE_CURL
-	fz_close(app->stream);
+	fz_drop_stream(app->stream);
 #endif
 
 	fz_flush_warnings(app->ctx);
@@ -552,8 +552,8 @@ static void pdfapp_loadpage(pdfapp_t *app, int no_cache)
 
 	fz_drop_display_list(app->ctx, app->page_list);
 	fz_drop_display_list(app->ctx, app->annotations_list);
-	fz_free_text_page(app->ctx, app->page_text);
-	fz_free_text_sheet(app->ctx, app->page_sheet);
+	fz_drop_text_page(app->ctx, app->page_text);
+	fz_drop_text_sheet(app->ctx, app->page_sheet);
 	fz_drop_link(app->ctx, app->page_links);
 	fz_free_page(app->doc, app->page);
 
@@ -595,7 +595,7 @@ static void pdfapp_loadpage(pdfapp_t *app, int no_cache)
 			fz_enable_device_hints(mdev, FZ_NO_CACHE);
 		cookie.incomplete_ok = 1;
 		fz_run_page_contents(app->doc, app->page, mdev, &fz_identity, &cookie);
-		fz_free_device(mdev);
+		fz_drop_device(mdev);
 		mdev = NULL;
 		app->annotations_list = fz_new_display_list(app->ctx);
 		mdev = fz_new_list_device(app->ctx, app->annotations_list);
@@ -614,7 +614,7 @@ static void pdfapp_loadpage(pdfapp_t *app, int no_cache)
 	}
 	fz_always(app->ctx)
 	{
-		fz_free_device(mdev);
+		fz_drop_device(mdev);
 	}
 	fz_catch(app->ctx)
 	{
@@ -674,7 +674,7 @@ static void pdfapp_recreate_annotationslist(pdfapp_t *app)
 	}
 	fz_always(app->ctx)
 	{
-		fz_free_device(mdev);
+		fz_drop_device(mdev);
 	}
 	fz_catch(app->ctx)
 	{
@@ -717,7 +717,7 @@ static void pdfapp_updatepage(pdfapp_t *app)
 		fz_clear_pixmap_rect_with_value(app->ctx, app->image, 255, &ibounds);
 		idev = fz_new_draw_device_with_bbox(app->ctx, app->image, &ibounds);
 		pdfapp_runpage(app, idev, &ctm, &bounds, NULL);
-		fz_free_device(idev);
+		fz_drop_device(idev);
 	}
 
 	pdfapp_showpage(app, 0, 0, 1, 0, 0);
@@ -778,7 +778,7 @@ static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage, int repai
 		{
 			tdev = fz_new_text_device(app->ctx, app->page_sheet, app->page_text);
 			pdfapp_runpage(app, tdev, &fz_identity, &fz_infinite_rect, &cookie);
-			fz_free_device(tdev);
+			fz_drop_device(tdev);
 		}
 	}
 
@@ -819,7 +819,7 @@ static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage, int repai
 		{
 			idev = fz_new_draw_device(app->ctx, app->image);
 			pdfapp_runpage(app, idev, &ctm, &bounds, &cookie);
-			fz_free_device(idev);
+			fz_drop_device(idev);
 		}
 		if (app->invert)
 			fz_invert_pixmap(app->ctx, app->image);
diff --git a/platform/x11/win_main.c b/platform/x11/win_main.c
index 50cc7285..3017be3b 100644
--- a/platform/x11/win_main.c
+++ b/platform/x11/win_main.c
@@ -1220,7 +1220,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShow
 	}
 
 	do_close(&gapp);
-	fz_free_context(ctx);
+	fz_drop_context(ctx);
 
 	return 0;
 }
diff --git a/platform/x11/x11_main.c b/platform/x11/x11_main.c
index b2413777..cb067ecc 100644
--- a/platform/x11/x11_main.c
+++ b/platform/x11/x11_main.c
@@ -344,7 +344,7 @@ void cleanup(pdfapp_t *app)
 
 	XCloseDisplay(xdpy);
 
-	fz_free_context(ctx);
+	fz_drop_context(ctx);
 }
 
 static int winresolution()