[librsvg/librsvg-2.40] Remove unnecessary argument



commit 8dc0136326e8d9514473ee382c969c915edc94b3
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Oct 3 18:54:38 2017 -0500

    Remove unnecessary argument

 rsvg-base.c |    4 ++--
 rsvg-xml.c  |    3 +--
 rsvg-xml.h  |    1 -
 3 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/rsvg-base.c b/rsvg-base.c
index 7282521..b948f86 100644
--- a/rsvg-base.c
+++ b/rsvg-base.c
@@ -642,7 +642,7 @@ rsvg_start_xinclude (RsvgHandle * ctx, RsvgPropertyBag * atts)
         xml_parser = xmlCreatePushParserCtxt (&rsvgSAXHandlerStruct, ctx, NULL, 0, NULL);
         rsvg_set_xml_parse_options(xml_parser, ctx);
 
-        buffer = _rsvg_xml_input_buffer_new_from_stream (stream, NULL /* cancellable */, 
XML_CHAR_ENCODING_NONE, &err);
+        buffer = _rsvg_xml_input_buffer_new_from_stream (stream, NULL /* cancellable */, &err);
         g_object_unref (stream);
 
         input = xmlNewIOInputStream (xml_parser, buffer /* adopts */, XML_CHAR_ENCODING_NONE);
@@ -1940,7 +1940,7 @@ rsvg_handle_read_stream_sync (RsvgHandle   *handle,
     priv->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
     create_xml_push_parser_ctxt (handle);
 
-    buffer = _rsvg_xml_input_buffer_new_from_stream (stream, cancellable, XML_CHAR_ENCODING_NONE, &err);
+    buffer = _rsvg_xml_input_buffer_new_from_stream (stream, cancellable, &err);
     input = xmlNewIOInputStream (priv->ctxt, buffer, XML_CHAR_ENCODING_NONE);
 
     if (xmlPushInput (priv->ctxt, input) < 0) {
diff --git a/rsvg-xml.c b/rsvg-xml.c
index 31f7ef0..452a0cb 100644
--- a/rsvg-xml.c
+++ b/rsvg-xml.c
@@ -74,7 +74,6 @@ context_close (RsvgXmlInputStreamContext *context)
 xmlParserInputBufferPtr
 _rsvg_xml_input_buffer_new_from_stream (GInputStream   *stream,
                                         GCancellable   *cancellable,
-                                        xmlCharEncoding enc,
                                         GError        **error)
 
 {
@@ -92,5 +91,5 @@ _rsvg_xml_input_buffer_new_from_stream (GInputStream   *stream,
     return xmlParserInputBufferCreateIO ((xmlInputReadCallback) context_read,
                                          (xmlInputCloseCallback) context_close,
                                          context,
-                                         enc);
+                                         XML_CHAR_ENCODING_NONE);
 }
diff --git a/rsvg-xml.h b/rsvg-xml.h
index 95158d8..c295f77 100644
--- a/rsvg-xml.h
+++ b/rsvg-xml.h
@@ -27,7 +27,6 @@ G_BEGIN_DECLS
 
 xmlParserInputBufferPtr _rsvg_xml_input_buffer_new_from_stream (GInputStream   *stream,
                                                                 GCancellable   *cancellable,
-                                                                xmlCharEncoding enc,
                                                                 GError        **error);
 
 G_END_DECLS


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]