From 681039767f2ccc72e236246178893eb0989169c9 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 20 Jan 2015 16:42:29 +0100 Subject: 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_*. --- source/xps/xps-zip.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/xps/xps-zip.c') 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; } -- cgit v1.2.3