libxml-ruby 2.7.0 → 2.9.0

data/ext/libxml/ruby_xml_input_cbg.c

@@ -1,191 +1,191 @@
-/* Author: Martin Povolny (xpovolny@fi.muni.cz) */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_input_cbg.h"
-
-/* Document-class: LibXML::XML::InputCallbacks
- *
- * Support for adding custom scheme handlers. */
-
-static ic_scheme *first_scheme = 0;
-
-int ic_match(char const *filename)
-{
-  ic_scheme *scheme;
-
-  //fprintf( stderr, "ic_match: %s\n", filename );
-
-  scheme = first_scheme;
-  while (0 != scheme)
-  {
-    if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST scheme->scheme_name, scheme->name_len))
-    {
-      return 1;
-    }
-    scheme = scheme->next_scheme;
-  }
-  return 0;
-}
-
-void* ic_open(char const *filename)
-{
-  ic_doc_context *ic_doc;
-  ic_scheme *scheme;
-  VALUE res;
-
-  scheme = first_scheme;
-  while (0 != scheme)
-  {
-    if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST scheme->scheme_name, scheme->name_len))
-    {
-      ic_doc = (ic_doc_context*) malloc(sizeof(ic_doc_context));
-
-      res = rb_funcall(scheme->class, rb_intern("document_query"), 1,
-          rb_str_new2(filename));
-
-      ic_doc->buffer = strdup(StringValuePtr(res));
-
-      ic_doc->bpos = ic_doc->buffer;
-      ic_doc->remaining = strlen(ic_doc->buffer);
-      return ic_doc;
-    }
-    scheme = scheme->next_scheme;
-  }
-  return 0;
-}
-
-int ic_read(void *context, char *buffer, int len)
-{
-  ic_doc_context *ic_doc;
-  int ret_len;
-  ic_doc = (ic_doc_context*) context;
-
-  if (len >= ic_doc->remaining)
-  {
-    ret_len = ic_doc->remaining;
-  }
-  else
-  {
-    ret_len = len;
-  }
-  ic_doc->remaining -= ret_len;
-  strncpy(buffer, ic_doc->bpos, ret_len);
-  ic_doc->bpos += ret_len;
-
-  return ret_len;
-}
-
-int ic_close(void *context)
-{
-  ruby_xfree(((ic_doc_context*) context)->buffer);
-  ruby_xfree(context);
-  return 1;
-}
-
-/*
- * call-seq:
- *    register
- *
- * Register a new set of I/O callback for handling parser input.
- */
-static VALUE input_callbacks_register_input_callbacks()
-{
-  xmlRegisterInputCallbacks(ic_match, ic_open, ic_read, ic_close);
-  return (Qtrue);
-}
-
-/*
- * call-seq:
- *    add_scheme
- *
- * No documentation available.
- */
-static VALUE input_callbacks_add_scheme(VALUE self, VALUE scheme_name,
-    VALUE class)
-{
-  ic_scheme *scheme;
-
-  Check_Type(scheme_name, T_STRING);
-
-  scheme = (ic_scheme*) malloc(sizeof(ic_scheme));
-  scheme->next_scheme = 0;
-  scheme->scheme_name = strdup(StringValuePtr(scheme_name)); /* TODO alloc, dealloc */
-  scheme->name_len = strlen(scheme->scheme_name);
-  scheme->class = class; /* TODO alloc, dealloc */
-
-  //fprintf( stderr, "registered: %s, %d, %s\n", scheme->scheme_name, scheme->name_len, scheme->class );
-
-  if (0 == first_scheme)
-    first_scheme = scheme;
-  else
-  {
-    ic_scheme *pos;
-    pos = first_scheme;
-    while (0 != pos->next_scheme)
-      pos = pos->next_scheme;
-    pos->next_scheme = scheme;
-  }
-
-  return (Qtrue);
-}
-
-/*
- * call-seq:
- *    remove_scheme
- *
- * No documentation available.
- */
-static VALUE input_callbacks_remove_scheme(VALUE self, VALUE scheme_name)
-{
-  char *name;
-  ic_scheme *save_scheme, *scheme;
-
-  Check_Type(scheme_name, T_STRING);
-  name = StringValuePtr(scheme_name);
-
-  if (0 == first_scheme)
-    return Qfalse;
-
-  if (!strncmp(name, first_scheme->scheme_name, first_scheme->name_len))
-  {
-    save_scheme = first_scheme->next_scheme;
-
-    ruby_xfree(first_scheme->scheme_name);
-    ruby_xfree(first_scheme);
-
-    first_scheme = save_scheme;
-    return Qtrue;
-  }
-
-  scheme = first_scheme;
-  while (0 != scheme->next_scheme)
-  {
-    if (!strncmp(name, scheme->next_scheme->scheme_name,
-        scheme->next_scheme->name_len))
-    {
-      save_scheme = scheme->next_scheme->next_scheme;
-
-      ruby_xfree(scheme->next_scheme->scheme_name);
-      ruby_xfree(scheme->next_scheme);
-
-      scheme->next_scheme = save_scheme;
-      return Qtrue;
-    }
-    scheme = scheme->next_scheme;
-  }
-  return Qfalse;
-}
-
-void rxml_init_input_callbacks(void)
-{
-  VALUE cInputCallbacks;
-  cInputCallbacks = rb_define_class_under(mXML, "InputCallbacks", rb_cObject);
-
-  /* Class Methods */
-  rb_define_singleton_method(cInputCallbacks, "register",
-      input_callbacks_register_input_callbacks, 0);
-  rb_define_singleton_method(cInputCallbacks, "add_scheme",
-      input_callbacks_add_scheme, 2);
-  rb_define_singleton_method(cInputCallbacks, "remove_scheme",
-      input_callbacks_remove_scheme, 1);
-}
+/* Author: Martin Povolny (xpovolny@fi.muni.cz) */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_input_cbg.h"
+
+/* Document-class: LibXML::XML::InputCallbacks
+ *
+ * Support for adding custom scheme handlers. */
+
+static ic_scheme *first_scheme = 0;
+
+int ic_match(char const *filename)
+{
+  ic_scheme *scheme;
+
+  //fprintf( stderr, "ic_match: %s\n", filename );
+
+  scheme = first_scheme;
+  while (0 != scheme)
+  {
+    if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST scheme->scheme_name, scheme->name_len))
+    {
+      return 1;
+    }
+    scheme = scheme->next_scheme;
+  }
+  return 0;
+}
+
+void* ic_open(char const *filename)
+{
+  ic_doc_context *ic_doc;
+  ic_scheme *scheme;
+  VALUE res;
+
+  scheme = first_scheme;
+  while (0 != scheme)
+  {
+    if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST scheme->scheme_name, scheme->name_len))
+    {
+      ic_doc = (ic_doc_context*) malloc(sizeof(ic_doc_context));
+
+      res = rb_funcall(scheme->class, rb_intern("document_query"), 1,
+          rb_str_new2(filename));
+
+      ic_doc->buffer = strdup(StringValuePtr(res));
+
+      ic_doc->bpos = ic_doc->buffer;
+      ic_doc->remaining = (int)strlen(ic_doc->buffer);
+      return ic_doc;
+    }
+    scheme = scheme->next_scheme;
+  }
+  return 0;
+}
+
+int ic_read(void *context, char *buffer, int len)
+{
+  ic_doc_context *ic_doc;
+  int ret_len;
+  ic_doc = (ic_doc_context*) context;
+
+  if (len >= ic_doc->remaining)
+  {
+    ret_len = ic_doc->remaining;
+  }
+  else
+  {
+    ret_len = len;
+  }
+  ic_doc->remaining -= ret_len;
+  strncpy(buffer, ic_doc->bpos, ret_len);
+  ic_doc->bpos += ret_len;
+
+  return ret_len;
+}
+
+int ic_close(void *context)
+{
+  ruby_xfree(((ic_doc_context*) context)->buffer);
+  ruby_xfree(context);
+  return 1;
+}
+
+/*
+ * call-seq:
+ *    register
+ *
+ * Register a new set of I/O callback for handling parser input.
+ */
+static VALUE input_callbacks_register_input_callbacks()
+{
+  xmlRegisterInputCallbacks(ic_match, ic_open, ic_read, ic_close);
+  return (Qtrue);
+}
+
+/*
+ * call-seq:
+ *    add_scheme
+ *
+ * No documentation available.
+ */
+static VALUE input_callbacks_add_scheme(VALUE self, VALUE scheme_name,
+    VALUE class)
+{
+  ic_scheme *scheme;
+
+  Check_Type(scheme_name, T_STRING);
+
+  scheme = (ic_scheme*) malloc(sizeof(ic_scheme));
+  scheme->next_scheme = 0;
+  scheme->scheme_name = strdup(StringValuePtr(scheme_name)); /* TODO alloc, dealloc */
+  scheme->name_len = (int)strlen(scheme->scheme_name);
+  scheme->class = class; /* TODO alloc, dealloc */
+
+  //fprintf( stderr, "registered: %s, %d, %s\n", scheme->scheme_name, scheme->name_len, scheme->class );
+
+  if (0 == first_scheme)
+    first_scheme = scheme;
+  else
+  {
+    ic_scheme *pos;
+    pos = first_scheme;
+    while (0 != pos->next_scheme)
+      pos = pos->next_scheme;
+    pos->next_scheme = scheme;
+  }
+
+  return (Qtrue);
+}
+
+/*
+ * call-seq:
+ *    remove_scheme
+ *
+ * No documentation available.
+ */
+static VALUE input_callbacks_remove_scheme(VALUE self, VALUE scheme_name)
+{
+  char *name;
+  ic_scheme *save_scheme, *scheme;
+
+  Check_Type(scheme_name, T_STRING);
+  name = StringValuePtr(scheme_name);
+
+  if (0 == first_scheme)
+    return Qfalse;
+
+  if (!strncmp(name, first_scheme->scheme_name, first_scheme->name_len))
+  {
+    save_scheme = first_scheme->next_scheme;
+
+    ruby_xfree(first_scheme->scheme_name);
+    ruby_xfree(first_scheme);
+
+    first_scheme = save_scheme;
+    return Qtrue;
+  }
+
+  scheme = first_scheme;
+  while (0 != scheme->next_scheme)
+  {
+    if (!strncmp(name, scheme->next_scheme->scheme_name,
+        scheme->next_scheme->name_len))
+    {
+      save_scheme = scheme->next_scheme->next_scheme;
+
+      ruby_xfree(scheme->next_scheme->scheme_name);
+      ruby_xfree(scheme->next_scheme);
+
+      scheme->next_scheme = save_scheme;
+      return Qtrue;
+    }
+    scheme = scheme->next_scheme;
+  }
+  return Qfalse;
+}
+
+void rxml_init_input_callbacks(void)
+{
+  VALUE cInputCallbacks;
+  cInputCallbacks = rb_define_class_under(mXML, "InputCallbacks", rb_cObject);
+
+  /* Class Methods */
+  rb_define_singleton_method(cInputCallbacks, "register",
+      input_callbacks_register_input_callbacks, 0);
+  rb_define_singleton_method(cInputCallbacks, "add_scheme",
+      input_callbacks_add_scheme, 2);
+  rb_define_singleton_method(cInputCallbacks, "remove_scheme",
+      input_callbacks_remove_scheme, 1);
+}

data/ext/libxml/ruby_xml_io.c

@@ -1,50 +1,52 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "extconf.h"
-#include "ruby_libxml.h"
-
-static ID READ_METHOD;
-#ifndef HAVE_RB_IO_BUFWRITE
-static ID WRITE_METHOD;
-#endif /* !HAVE_RB_IO_BUFWRITE */
-
-/* This method is called by libxml when it wants to read
- more data from a stream. We go with the duck typing
- solution to support StringIO objects. */
-int rxml_read_callback(void *context, char *buffer, int len)
-{
-  VALUE io = (VALUE) context;
-  VALUE string = rb_funcall(io, READ_METHOD, 1, INT2NUM(len));
-  int size;
-
-  if (string == Qnil)
-    return 0;
-
-  size = RSTRING_LEN(string);
-  memcpy(buffer, StringValuePtr(string), size);
-
-  return size;
-}
-
-int rxml_write_callback(void *context, const char *buffer, int len)
-{
-#ifndef HAVE_RB_IO_BUFWRITE
-  VALUE io, written, string;
-
-  io = (VALUE) context;
-  string = rb_str_new(buffer, len);
-  written = rb_funcall(io, WRITE_METHOD, 1, string);
-
-  return NUM2INT(written);
-#else
-  return rb_io_bufwrite((VALUE) context, buffer, (size_t) len);
-#endif /* !HAVE_RB_IO_BUFWRITE */
-}
-
-void rxml_init_io(void)
-{
-  READ_METHOD = rb_intern("read");
-#ifndef HAVE_RB_IO_BUFWRITE
-  WRITE_METHOD = rb_intern("write");
-#endif /* !HAVE_RB_IO_BUFWRITE */
-}
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "extconf.h"
+#include "ruby_libxml.h"
+
+static ID READ_METHOD;
+#ifdef HAVE_RB_IO_BUFWRITE
+#include <ruby/io.h>
+#else
+static ID WRITE_METHOD;
+#endif /* !HAVE_RB_IO_BUFWRITE */
+
+/* This method is called by libxml when it wants to read
+ more data from a stream. We go with the duck typing
+ solution to support StringIO objects. */
+int rxml_read_callback(void *context, char *buffer, int len)
+{
+  VALUE io = (VALUE) context;
+  VALUE string = rb_funcall(io, READ_METHOD, 1, INT2NUM(len));
+  size_t size;
+
+  if (string == Qnil)
+    return 0;
+
+  size = RSTRING_LEN(string);
+  memcpy(buffer, StringValuePtr(string), size);
+
+  return (int)size;
+}
+
+int rxml_write_callback(void *context, const char *buffer, int len)
+{
+#ifndef HAVE_RB_IO_BUFWRITE
+  VALUE io, written, string;
+
+  io = (VALUE) context;
+  string = rb_str_new(buffer, len);
+  written = rb_funcall(io, WRITE_METHOD, 1, string);
+
+  return NUM2INT(written);
+#else
+  return (int)rb_io_bufwrite((VALUE) context, buffer, (size_t)len);
+#endif /* !HAVE_RB_IO_BUFWRITE */
+}
+
+void rxml_init_io(void)
+{
+  READ_METHOD = rb_intern("read");
+#ifndef HAVE_RB_IO_BUFWRITE
+  WRITE_METHOD = rb_intern("write");
+#endif /* !HAVE_RB_IO_BUFWRITE */
+}

data/ext/libxml/ruby_xml_namespace.c

@@ -81,7 +81,7 @@ static VALUE rxml_namespace_href_get(VALUE self)
   if (xns->href == NULL)
     return Qnil;
   else
-    return rxml_new_cstr((const char*) xns->href, NULL);
+    return rxml_new_cstr( xns->href, NULL);
 }
 
 /*
@@ -116,7 +116,7 @@ static VALUE rxml_namespace_prefix_get(VALUE self)
   if (xns->prefix == NULL)
     return Qnil;
   else
-    return rxml_new_cstr((const char*) xns->prefix, NULL);
+    return rxml_new_cstr( xns->prefix, NULL);
 }
 
 /*