[librsvg] Limit the "const xmlChar *ch, int len" madness to libxml callbacks

[Federico Mena Quintero <federico src gnome org>]

commit 2c29b87d2a4b77da8a2dff9541dd1ccb3320b673
Author: Federico Mena Quintero <federico gnome org>
Date:   Wed Dec 6 07:13:00 2017 -0600

    Limit the "const xmlChar *ch, int len" madness to libxml callbacks
    
    Things that plug to libxml use its weird types; things on our side use
    "const char *foo, gssize len" per glib's conventions.

 rsvg-base.c    |   20 ++++++++++----------
 rsvg-private.h |    2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/rsvg-base.c b/rsvg-base.c
index 33cb42e..f122d19 100644
--- a/rsvg-base.c
+++ b/rsvg-base.c
@@ -139,7 +139,7 @@ rsvg_style_handler_free (RsvgSaxHandler * self)
 }
 
 static void
-rsvg_style_handler_characters (RsvgSaxHandler * self, const char *ch, int len)
+rsvg_style_handler_characters (RsvgSaxHandler * self, const char *ch, gssize len)
 {
     RsvgSaxHandlerStyle *z = (RsvgSaxHandlerStyle *) self;
     g_string_append_len (z->style, ch, len);
@@ -465,7 +465,7 @@ rsvg_extra_handler_free (RsvgSaxHandler * self)
 }
 
 static void
-rsvg_extra_handler_characters (RsvgSaxHandler * self, const char *ch, int len)
+rsvg_extra_handler_characters (RsvgSaxHandler * self, const char *ch, gssize len)
 {
     RsvgSaxHandlerExtra *z = (RsvgSaxHandlerExtra *) self;
 
@@ -616,8 +616,8 @@ typedef struct _RsvgSaxHandlerXinclude {
     gboolean in_fallback;
 } RsvgSaxHandlerXinclude;
 
-static void rsvg_start_xinclude (RsvgHandle * ctx, RsvgPropertyBag * atts);
-static void rsvg_characters_impl (RsvgHandle * ctx, const xmlChar * ch, gssize len);
+static void rsvg_start_xinclude (RsvgHandle *ctx, RsvgPropertyBag *atts);
+static void rsvg_characters_impl (RsvgHandle *ctx, const char *ch, gssize len);
 
 static void
 rsvg_xinclude_handler_free (RsvgSaxHandler * self)
@@ -626,12 +626,12 @@ rsvg_xinclude_handler_free (RsvgSaxHandler * self)
 }
 
 static void
-rsvg_xinclude_handler_characters (RsvgSaxHandler * self, const char *ch, int len)
+rsvg_xinclude_handler_characters (RsvgSaxHandler * self, const char *ch, gssize len)
 {
     RsvgSaxHandlerXinclude *z = (RsvgSaxHandlerXinclude *) self;
 
     if (z->in_fallback) {
-        rsvg_characters_impl (z->ctx, (const xmlChar *) ch, len);
+        rsvg_characters_impl (z->ctx, ch, len);
     }
 }
 
@@ -760,7 +760,7 @@ rsvg_start_xinclude (RsvgHandle * ctx, RsvgPropertyBag * atts)
             data_len = text_data_len;
         }
 
-        rsvg_characters_impl (ctx, (xmlChar *) data, data_len);
+        rsvg_characters_impl (ctx, data, data_len);
 
         g_free (data);
     } else {
@@ -905,7 +905,7 @@ find_last_chars_node (RsvgNode *node, gpointer data)
 }
 
 static void
-rsvg_characters_impl (RsvgHandle * ctx, const xmlChar * ch, gssize len)
+rsvg_characters_impl (RsvgHandle *ctx, const char *ch, gssize len)
 {
     RsvgNode *node = NULL;
 
@@ -933,7 +933,7 @@ rsvg_characters_impl (RsvgHandle * ctx, const xmlChar * ch, gssize len)
         g_assert (rsvg_node_get_type (node) == RSVG_NODE_TYPE_CHARS);
     }
 
-    rsvg_node_chars_append (node, (const char *) ch, len);
+    rsvg_node_chars_append (node, ch, len);
 
     node = rsvg_node_unref (node);
 }
@@ -948,7 +948,7 @@ rsvg_characters (void *data, const xmlChar * ch, int len)
         return;
     }
 
-    rsvg_characters_impl (ctx, ch, len);
+    rsvg_characters_impl (ctx, (const char *) ch, len);
 }
 
 static xmlEntityPtr
diff --git a/rsvg-private.h b/rsvg-private.h
index d4afa7b..97b553f 100644
--- a/rsvg-private.h
+++ b/rsvg-private.h
@@ -119,7 +119,7 @@ struct RsvgSaxHandler {
     void (*free) (RsvgSaxHandler * self);
     void (*start_element) (RsvgSaxHandler * self, const char *name, RsvgPropertyBag * atts);
     void (*end_element) (RsvgSaxHandler * self, const char *name);
-    void (*characters) (RsvgSaxHandler * self, const char *ch, int len);
+    void (*characters) (RsvgSaxHandler * self, const char *ch, gssize len);
 };
 
 /* Reading state for an RsvgHandle */