libxml-ruby 4.1.1-x64-mingw-ucrt → 5.0.0-x64-mingw-ucrt

data/ext/libxml/ruby_xml_relaxng.c

@@ -1,112 +1,113 @@
-#include "ruby_libxml.h"
-#include "ruby_xml_relaxng.h"
-
-#include <libxml/relaxng.h>
-
-/*
- * Document-class: LibXML::XML::RelaxNG
- *
- * The XML::RelaxNG class is used to prepare RelaxNG schemas for validation
- * of xml documents.
- *
- * Schemas can be created from XML documents, strings or URIs using the
- * corresponding methods (new for URIs).
- *
- * Once a schema is prepared, an XML document can be validated by the
- * XML::Document#validate_relaxng method providing the XML::RelaxNG object
- * as parameter. The method will raise an exception if the document is
- * not valid.
- *
- * Basic Usage:
- *
- *  # parse schema as xml document
- *  relaxng_document = XML::Document.file('schema.rng')
- *
- *  # prepare schema for validation
- *  relaxng_schema = XML::RelaxNG.document(relaxng_document)
- *
- *  # parse xml document to be validated
- *  instance = XML::Document.file('instance.xml')
- *
- *  # validate
- *  instance.validate_relaxng(relaxng_schema)
- */
-
-VALUE cXMLRelaxNG;
-
-static void rxml_relaxng_free(xmlRelaxNGPtr xrelaxng)
-{
-  xmlRelaxNGFree(xrelaxng);
-}
-
-/*
- * call-seq:
- *    XML::Relaxng.new(relaxng_uri) -> relaxng
- *
- * Create a new relaxng from the specified URI.
- */
-static VALUE rxml_relaxng_init_from_uri(VALUE class, VALUE uri)
-{
-  xmlRelaxNGParserCtxtPtr xparser;
-  xmlRelaxNGPtr xrelaxng;
-
-  Check_Type(uri, T_STRING);
-
-  xparser = xmlRelaxNGNewParserCtxt(StringValuePtr(uri));
-  xrelaxng = xmlRelaxNGParse(xparser);
-  xmlRelaxNGFreeParserCtxt(xparser);
-
-  return Data_Wrap_Struct(cXMLRelaxNG, NULL, rxml_relaxng_free, xrelaxng);
-}
-
-/*
- * call-seq:
- *    XML::RelaxNG.document(document) -> relaxng
- *
- * Create a new relaxng from the specified document.
- */
-static VALUE rxml_relaxng_init_from_document(VALUE class, VALUE document)
-{
-  xmlDocPtr xdoc;
-  xmlRelaxNGPtr xrelaxng;
-  xmlRelaxNGParserCtxtPtr xparser;
-
-  Data_Get_Struct(document, xmlDoc, xdoc);
-
-  xparser = xmlRelaxNGNewDocParserCtxt(xdoc);
-  xrelaxng = xmlRelaxNGParse(xparser);
-  xmlRelaxNGFreeParserCtxt(xparser);
-
-  return Data_Wrap_Struct(cXMLRelaxNG, NULL, rxml_relaxng_free, xrelaxng);
-}
-
-/*
- * call-seq:
- *    XML::RelaxNG.string("relaxng_data") -> "value"
- *
- * Create a new relaxng using the specified string.
- */
-static VALUE rxml_relaxng_init_from_string(VALUE self, VALUE relaxng_str)
-{
-  xmlRelaxNGParserCtxtPtr xparser;
-  xmlRelaxNGPtr xrelaxng;
-
-  Check_Type(relaxng_str, T_STRING);
-
-  xparser = xmlRelaxNGNewMemParserCtxt(StringValuePtr(relaxng_str), (int)strlen(StringValuePtr(relaxng_str)));
-  xrelaxng = xmlRelaxNGParse(xparser);
-  xmlRelaxNGFreeParserCtxt(xparser);
-
-  return Data_Wrap_Struct(cXMLRelaxNG, NULL, rxml_relaxng_free, xrelaxng);
-}
-
-void rxml_init_relaxng(void)
-{
-  cXMLRelaxNG = rb_define_class_under(mXML, "RelaxNG", rb_cObject);
-  rb_define_singleton_method(cXMLRelaxNG, "new", rxml_relaxng_init_from_uri, 1);
-  rb_define_singleton_method(cXMLRelaxNG, "from_string",
-      rxml_relaxng_init_from_string, 1);
-  rb_define_singleton_method(cXMLRelaxNG, "document",
-      rxml_relaxng_init_from_document, 1);
-}
-
+#include "ruby_libxml.h"
+#include "ruby_xml_relaxng.h"
+
+#include <libxml/relaxng.h>
+
+/*
+ * Document-class: LibXML::XML::RelaxNG
+ *
+ * The XML::RelaxNG class is used to prepare RelaxNG schemas for validation
+ * of xml documents.
+ *
+ * Schemas can be created from XML documents, strings or URIs using the
+ * corresponding methods (new for URIs).
+ *
+ * Once a schema is prepared, an XML document can be validated by the
+ * XML::Document#validate_relaxng method providing the XML::RelaxNG object
+ * as parameter. The method will raise an exception if the document is
+ * not valid.
+ *
+ * Basic Usage:
+ *
+ *  # parse schema as xml document
+ *  relaxng_document = XML::Document.file('schema.rng')
+ *
+ *  # prepare schema for validation
+ *  relaxng_schema = XML::RelaxNG.document(relaxng_document)
+ *
+ *  # parse xml document to be validated
+ *  instance = XML::Document.file('instance.xml')
+ *
+ *  # validate
+ *  instance.validate_relaxng(relaxng_schema)
+ */
+
+VALUE cXMLRelaxNG;
+
+static void rxml_relaxng_free(xmlRelaxNGPtr xrelaxng)
+{
+  xmlRelaxNGFree(xrelaxng);
+}
+
+/*
+ * call-seq:
+ *    XML::Relaxng.new(relaxng_uri) -> relaxng
+ *
+ * Create a new relaxng from the specified URI.
+ */
+static VALUE rxml_relaxng_init_from_uri(VALUE class, VALUE uri)
+{
+  xmlRelaxNGParserCtxtPtr xparser;
+  xmlRelaxNGPtr xrelaxng;
+
+  Check_Type(uri, T_STRING);
+
+  xparser = xmlRelaxNGNewParserCtxt(StringValuePtr(uri));
+  xrelaxng = xmlRelaxNGParse(xparser);
+  xmlRelaxNGFreeParserCtxt(xparser);
+
+  return Data_Wrap_Struct(cXMLRelaxNG, NULL, rxml_relaxng_free, xrelaxng);
+}
+
+/*
+ * call-seq:
+ *    XML::RelaxNG.document(document) -> relaxng
+ *
+ * Create a new relaxng from the specified document.
+ */
+static VALUE rxml_relaxng_init_from_document(VALUE class, VALUE document)
+{
+  xmlDocPtr xdoc;
+  xmlRelaxNGPtr xrelaxng;
+  xmlRelaxNGParserCtxtPtr xparser;
+
+  Data_Get_Struct(document, xmlDoc, xdoc);
+
+  xparser = xmlRelaxNGNewDocParserCtxt(xdoc);
+  xrelaxng = xmlRelaxNGParse(xparser);
+  xmlRelaxNGFreeParserCtxt(xparser);
+
+  return Data_Wrap_Struct(cXMLRelaxNG, NULL, rxml_relaxng_free, xrelaxng);
+}
+
+/*
+ * call-seq:
+ *    XML::RelaxNG.string("relaxng_data") -> "value"
+ *
+ * Create a new relaxng using the specified string.
+ */
+static VALUE rxml_relaxng_init_from_string(VALUE self, VALUE relaxng_str)
+{
+  xmlRelaxNGParserCtxtPtr xparser;
+  xmlRelaxNGPtr xrelaxng;
+
+  Check_Type(relaxng_str, T_STRING);
+
+  xparser = xmlRelaxNGNewMemParserCtxt(StringValuePtr(relaxng_str), (int)strlen(StringValuePtr(relaxng_str)));
+  xrelaxng = xmlRelaxNGParse(xparser);
+  xmlRelaxNGFreeParserCtxt(xparser);
+
+  return Data_Wrap_Struct(cXMLRelaxNG, NULL, rxml_relaxng_free, xrelaxng);
+}
+
+void rxml_init_relaxng(void)
+{
+  cXMLRelaxNG = rb_define_class_under(mXML, "RelaxNG", rb_cObject);
+  rb_undef_alloc_func(cXMLRelaxNG);
+  rb_define_singleton_method(cXMLRelaxNG, "new", rxml_relaxng_init_from_uri, 1);
+  rb_define_singleton_method(cXMLRelaxNG, "from_string",
+      rxml_relaxng_init_from_string, 1);
+  rb_define_singleton_method(cXMLRelaxNG, "document",
+      rxml_relaxng_init_from_document, 1);
+}
+

data/ext/libxml/ruby_xml_sax2_handler.c

@@ -243,7 +243,7 @@ static void start_element_ns_callback(void *ctx,
              namespaces);
 }
 
-static void structured_error_callback(void *ctx, xmlErrorPtr xerror)
+static void structured_error_callback(void *ctx, const xmlError *xerror)
 {
   /* Older versions of Libxml will pass a NULL context from the sax parser.  Fixed on
      Feb 23, 2011.  See:

data/ext/libxml/ruby_xml_sax_parser.c

@@ -74,23 +74,15 @@ static VALUE rxml_sax_parser_initialize(int argc, VALUE *argv, VALUE self)
  */
 static VALUE rxml_sax_parser_parse(VALUE self)
 {
-  int status;
   VALUE context = rb_ivar_get(self, CONTEXT_ATTR);
   xmlParserCtxtPtr ctxt;
   Data_Get_Struct(context, xmlParserCtxt, ctxt);
 
   ctxt->sax2 = 1;
 	ctxt->userData = (void*)rb_ivar_get(self, CALLBACKS_ATTR);
-
-  if (ctxt->sax != (xmlSAXHandlerPtr) &xmlDefaultSAXHandler)
-    xmlFree(ctxt->sax);
-    
-  ctxt->sax = (xmlSAXHandlerPtr) xmlMalloc(sizeof(rxml_sax_handler));
-  if (ctxt->sax == NULL)
-    rb_fatal("Not enough memory.");
   memcpy(ctxt->sax, &rxml_sax_handler, sizeof(rxml_sax_handler));
     
-  status = xmlParseDocument(ctxt);
+  int status = xmlParseDocument(ctxt);
 
   /* Now check the parsing result*/
   if (status == -1 || !ctxt->wellFormed)