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_*.

8 files changed, 35 insertions, 35 deletions

diff --git a/source/xps/xps-doc.c b/source/xps/xps-doc.c
index 4bcf92cb..2b8cee8e 100644
--- a/source/xps/xps-doc.c
+++ b/source/xps/xps-doc.c
@@ -218,7 +218,7 @@ xps_lookup_link_target(xps_document *doc, char *target_uri)
 }
 
 static void
-xps_free_link_targets(xps_document *doc)
+xps_drop_link_targets(xps_document *doc)
 {
 	xps_target *target = doc->target, *next;
 	while (target)
@@ -231,13 +231,13 @@ xps_free_link_targets(xps_document *doc)
 }
 
 static void
-xps_free_fixed_pages(xps_document *doc)
+xps_drop_fixed_pages(xps_document *doc)
 {
 	xps_page *page = doc->first_page;
 	while (page)
 	{
 		xps_page *next = page->next;
-		xps_free_page(doc, page);
+		xps_drop_page(doc, page);
 		fz_drop_link(doc->ctx, page->links);
 		fz_free(doc->ctx, page->name);
 		fz_free(doc->ctx, page);
@@ -248,7 +248,7 @@ xps_free_fixed_pages(xps_document *doc)
 }
 
 static void
-xps_free_fixed_documents(xps_document *doc)
+xps_drop_fixed_documents(xps_document *doc)
 {
 	xps_fixdoc *fixdoc = doc->first_fixdoc;
 	while (fixdoc)
@@ -264,11 +264,11 @@ xps_free_fixed_documents(xps_document *doc)
 }
 
 void
-xps_free_page_list(xps_document *doc)
+xps_drop_page_list(xps_document *doc)
 {
-	xps_free_fixed_documents(doc);
-	xps_free_fixed_pages(doc);
-	xps_free_link_targets(doc);
+	xps_drop_fixed_documents(doc);
+	xps_drop_fixed_pages(doc);
+	xps_drop_link_targets(doc);
 }
 
 /*
@@ -362,7 +362,7 @@ xps_parse_metadata(xps_document *doc, xps_part *part, xps_fixdoc *fixdoc)
 
 	root = fz_parse_xml(doc->ctx, part->data, part->size, 0);
 	xps_parse_metadata_imp(doc, root, fixdoc);
-	fz_free_xml(doc->ctx, root);
+	fz_drop_xml(doc->ctx, root);
 
 	doc->base_uri = NULL;
 	doc->part_uri = NULL;
@@ -384,7 +384,7 @@ xps_read_and_process_metadata_part(xps_document *doc, char *name, xps_fixdoc *fi
 	}
 	fz_always(ctx)
 	{
-		xps_free_part(doc, part);
+		xps_drop_part(doc, part);
 	}
 	fz_catch(ctx)
 	{
@@ -443,7 +443,7 @@ xps_load_fixed_page(xps_document *doc, xps_page *page)
 	}
 	fz_always(ctx)
 	{
-		xps_free_part(doc, part);
+		xps_drop_part(doc, part);
 	}
 	fz_catch(ctx)
 	{
@@ -458,31 +458,31 @@ xps_load_fixed_page(xps_document *doc, xps_page *page)
 		fz_xml *node = xps_lookup_alternate_content(root);
 		if (!node)
 		{
-			fz_free_xml(doc->ctx, root);
+			fz_drop_xml(doc->ctx, root);
 			fz_throw(doc->ctx, FZ_ERROR_GENERIC, "FixedPage missing alternate root element");
 		}
 		fz_detach_xml(node);
-		fz_free_xml(doc->ctx, root);
+		fz_drop_xml(doc->ctx, root);
 		root = node;
 	}
 
 	if (strcmp(fz_xml_tag(root), "FixedPage"))
 	{
-		fz_free_xml(doc->ctx, root);
+		fz_drop_xml(doc->ctx, root);
 		fz_throw(doc->ctx, FZ_ERROR_GENERIC, "expected FixedPage element");
 	}
 
 	width_att = fz_xml_att(root, "Width");
 	if (!width_att)
 	{
-		fz_free_xml(doc->ctx, root);
+		fz_drop_xml(doc->ctx, root);
 		fz_throw(doc->ctx, FZ_ERROR_GENERIC, "FixedPage missing required attribute: Width");
 	}
 
 	height_att = fz_xml_att(root, "Height");
 	if (!height_att)
 	{
-		fz_free_xml(doc->ctx, root);
+		fz_drop_xml(doc->ctx, root);
 		fz_throw(doc->ctx, FZ_ERROR_GENERIC, "FixedPage missing required attribute: Height");
 	}
 
@@ -522,13 +522,13 @@ xps_bound_page(xps_document *doc, xps_page *page, fz_rect *bounds)
 }
 
 void
-xps_free_page(xps_document *doc, xps_page *page)
+xps_drop_page(xps_document *doc, xps_page *page)
 {
 	if (page == NULL)
 		return;
 	/* only free the XML contents */
 	if (page->root)
-		fz_free_xml(doc->ctx, page->root);
+		fz_drop_xml(doc->ctx, page->root);
 	page->root = NULL;
 }
 
diff --git a/source/xps/xps-glyphs.c b/source/xps/xps-glyphs.c
index d2a786fe..4f030be0 100644
--- a/source/xps/xps-glyphs.c
+++ b/source/xps/xps-glyphs.c
@@ -539,7 +539,7 @@ xps_parse_glyphs(xps_document *doc, const fz_matrix *ctm,
 		fz_always(doc->ctx)
 		{
 			fz_drop_buffer(doc->ctx, buf);
-			xps_free_part(doc, part);
+			xps_drop_part(doc, part);
 		}
 		fz_catch(doc->ctx)
 		{
diff --git a/source/xps/xps-gradient.c b/source/xps/xps-gradient.c
index 4c1d0851..d156a406 100644
--- a/source/xps/xps-gradient.c
+++ b/source/xps/xps-gradient.c
@@ -214,7 +214,7 @@ xps_draw_one_radial_gradient(xps_document *doc, const fz_matrix *ctm,
 
 	/* TODO: this (and the stuff in pdf_shade) should move to res_shade.c */
 	shade = fz_malloc_struct(doc->ctx, fz_shade);
-	FZ_INIT_STORABLE(shade, 1, fz_free_shade_imp);
+	FZ_INIT_STORABLE(shade, 1, fz_drop_shade_imp);
 	shade->colorspace = fz_device_rgb(doc->ctx);
 	shade->bbox = fz_infinite_rect;
 	shade->matrix = fz_identity;
@@ -252,7 +252,7 @@ xps_draw_one_linear_gradient(xps_document *doc, const fz_matrix *ctm,
 
 	/* TODO: this (and the stuff in pdf_shade) should move to res_shade.c */
 	shade = fz_malloc_struct(doc->ctx, fz_shade);
-	FZ_INIT_STORABLE(shade, 1, fz_free_shade_imp);
+	FZ_INIT_STORABLE(shade, 1, fz_drop_shade_imp);
 	shade->colorspace = fz_device_rgb(doc->ctx);
 	shade->bbox = fz_infinite_rect;
 	shade->matrix = fz_identity;
diff --git a/source/xps/xps-image.c b/source/xps/xps-image.c
index 9b2aefcb..d9b2ad11 100644
--- a/source/xps/xps-image.c
+++ b/source/xps/xps-image.c
@@ -114,7 +114,7 @@ xps_parse_image_brush(xps_document *doc, const fz_matrix *ctm, const fz_rect *ar
 	}
 	fz_always(doc->ctx)
 	{
-		xps_free_part(doc, part);
+		xps_drop_part(doc, part);
 	}
 	fz_catch(doc->ctx)
 	{
diff --git a/source/xps/xps-outline.c b/source/xps/xps-outline.c
index e314e83e..3b088d78 100644
--- a/source/xps/xps-outline.c
+++ b/source/xps/xps-outline.c
@@ -90,7 +90,7 @@ xps_load_document_structure(xps_document *doc, xps_fixdoc *fixdoc)
 	}
 	fz_always(doc->ctx)
 	{
-		xps_free_part(doc, part);
+		xps_drop_part(doc, part);
 	}
 	fz_catch(doc->ctx)
 	{
@@ -105,7 +105,7 @@ xps_load_document_structure(xps_document *doc, xps_fixdoc *fixdoc)
 	}
 	fz_always(doc->ctx)
 	{
-		fz_free_xml(doc->ctx, root);
+		fz_drop_xml(doc->ctx, root);
 	}
 	fz_catch(doc->ctx)
 	{
diff --git a/source/xps/xps-resource.c b/source/xps/xps-resource.c
index 85fd7c49..6600f7c6 100644
--- a/source/xps/xps-resource.c
+++ b/source/xps/xps-resource.c
@@ -71,7 +71,7 @@ xps_parse_remote_resource_dictionary(xps_document *doc, char *base_uri, char *so
 	}
 	fz_always(ctx)
 	{
-		xps_free_part(doc, part);
+		xps_drop_part(doc, part);
 	}
 	fz_catch(ctx)
 	{
@@ -84,7 +84,7 @@ xps_parse_remote_resource_dictionary(xps_document *doc, char *base_uri, char *so
 
 	if (strcmp(fz_xml_tag(xml), "ResourceDictionary"))
 	{
-		fz_free_xml(doc->ctx, xml);
+		fz_drop_xml(doc->ctx, xml);
 		fz_throw(doc->ctx, FZ_ERROR_GENERIC, "expected ResourceDictionary element");
 	}
 
@@ -138,14 +138,14 @@ xps_parse_resource_dictionary(xps_document *doc, char *base_uri, fz_xml *root)
 }
 
 void
-xps_free_resource_dictionary(xps_document *doc, xps_resource *dict)
+xps_drop_resource_dictionary(xps_document *doc, xps_resource *dict)
 {
 	xps_resource *next;
 	while (dict)
 	{
 		next = dict->next;
 		if (dict->base_xml)
-			fz_free_xml(doc->ctx, dict->base_xml);
+			fz_drop_xml(doc->ctx, dict->base_xml);
 		if (dict->base_uri)
 			fz_free(doc->ctx, dict->base_uri);
 		fz_free(doc->ctx, dict);
diff --git a/source/xps/xps-tile.c b/source/xps/xps-tile.c
index 5f966619..b7e0ec19 100644
--- a/source/xps/xps-tile.c
+++ b/source/xps/xps-tile.c
@@ -329,7 +329,7 @@ xps_parse_canvas(xps_document *doc, const fz_matrix *ctm, const fz_rect *area, c
 		fz_pop_clip(doc->dev);
 
 	if (new_dict)
-		xps_free_resource_dictionary(doc, new_dict);
+		xps_drop_resource_dictionary(doc, new_dict);
 }
 
 void
@@ -371,7 +371,7 @@ xps_parse_fixed_page(xps_document *doc, const fz_matrix *ctm, xps_page *page)
 	}
 
 	if (dict)
-		xps_free_resource_dictionary(doc, dict);
+		xps_drop_resource_dictionary(doc, dict);
 }
 
 void
diff --git a/source/xps/xps-zip.c b/source/xps/xps-zip.c
index 1dbd103c..a8f25114 100644
--- a/source/xps/xps-zip.c
+++ b/source/xps/xps-zip.c
@@ -26,7 +26,7 @@ xps_new_part(xps_document *doc, char *name, unsigned char *data, int size)
 }
 
 void
-xps_free_part(xps_document *doc, xps_part *part)
+xps_drop_part(xps_document *doc, xps_part *part)
 {
 	fz_free(doc->ctx, part->name);
 	fz_free(doc->ctx, part->data);
@@ -194,7 +194,7 @@ xps_open_document(fz_context *ctx, const char *filename)
 	}
 	fz_always(ctx)
 	{
-		fz_close(file);
+		fz_drop_stream(file);
 	}
 	fz_catch(ctx)
 	{
@@ -212,7 +212,7 @@ xps_close_document(xps_document *doc)
 		return;
 
 	if (doc->zip)
-		fz_close_archive(doc->ctx, doc->zip);
+		fz_drop_archive(doc->ctx, doc->zip);
 
 	font = doc->font_table;
 	while (font)
@@ -224,7 +224,7 @@ xps_close_document(xps_document *doc)
 		font = next;
 	}
 
-	xps_free_page_list(doc);
+	xps_drop_page_list(doc);
 
 	fz_free(doc->ctx, doc->start_part);
 	fz_free(doc->ctx, doc);
@@ -262,7 +262,7 @@ xps_init_document(xps_document *doc)
 	doc->super.load_links = (fz_document_load_links_fn *)xps_load_links;
 	doc->super.bound_page = (fz_document_bound_page_fn *)xps_bound_page;
 	doc->super.run_page_contents = (fz_document_run_page_contents_fn *)xps_run_page;
-	doc->super.free_page = (fz_document_free_page_fn *)xps_free_page;
+	doc->super.free_page = (fz_document_free_page_fn *)xps_drop_page;
 	doc->super.meta = (fz_document_meta_fn *)xps_meta;
 	doc->super.rebind = (fz_document_rebind_fn *)xps_rebind;
 }