From 179f7defdffb254936592a02208c338c13466253 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Thu, 7 Sep 2006 16:10:40 -0700 Subject: [PATCH] Use new return value from _cairo_output_stream_destroy This is a little simpler than the old idiom of calling _cairo_output_stream_get_status just before calling _cairo_output_stream_destroy. I had hoped this technique would apply in more cases, but many cases want to separate the two actions anyway to do conditional assignment of the status value, (in order to not overwrite an earlier error value). --- src/cairo-pdf-surface.c | 3 +-- src/cairo-svg-surface.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c index 4ae8c6a6d..6106284e2 100644 --- a/src/cairo-pdf-surface.c +++ b/src/cairo-pdf-surface.c @@ -546,8 +546,7 @@ _cairo_pdf_surface_finish (void *abstract_surface) "%%%%EOF\r\n", offset); - status = _cairo_output_stream_get_status (surface->output); - _cairo_output_stream_destroy (surface->output); + status = _cairo_output_stream_destroy (surface->output); _cairo_array_fini (&surface->objects); _cairo_array_fini (&surface->pages); diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c index 2b24bf22d..d4c60b616 100644 --- a/src/cairo-svg-surface.c +++ b/src/cairo-svg-surface.c @@ -1803,8 +1803,7 @@ _cairo_svg_document_finish (cairo_svg_document_t *document) _cairo_output_stream_destroy (document->xml_node_glyphs); _cairo_output_stream_destroy (document->xml_node_defs); - status = _cairo_output_stream_get_status (output); - _cairo_output_stream_destroy (output); + status = _cairo_output_stream_destroy (output); for (i = 0; i < document->meta_snapshots.num_elements; i++) { snapshot = _cairo_array_index (&document->meta_snapshots, i);