libxml-ruby 4.1.1 → 5.0.0

data/ext/libxml/ruby_xml_xpath.c

@@ -89,7 +89,7 @@ VALUE rxml_xpath_to_value(xmlXPathContextPtr xctxt, xmlXPathObjectPtr xobject)
     /* xmlLastError is different than xctxt->lastError.  Use
      xmlLastError since it has the message set while xctxt->lastError
      does not. */
-    xmlErrorPtr xerror = xmlGetLastError();
+    const xmlError *xerror = xmlGetLastError();
     rxml_raise(xerror);
   }
 

data/ext/libxml/ruby_xml_xpath_context.c

@@ -320,7 +320,7 @@ rxml_xpath_context_enable_cache(int argc,  VALUE *argv, VALUE self)
   }
 
   if (xmlXPathContextSetCache(xctxt, 1, value, 0) == -1)
-    rxml_raise(&xmlLastError);
+    rxml_raise(xmlGetLastError());
 
   return self;
 }
@@ -338,7 +338,7 @@ rxml_xpath_context_disable_cache(VALUE self)
   Data_Get_Struct(self, xmlXPathContext, xctxt);
 
   if (xmlXPathContextSetCache(xctxt, 0, 0, 0) == -1)
-    rxml_raise(&xmlLastError);
+    rxml_raise(xmlGetLastError());
 
   return self;
 }

data/ext/libxml/ruby_xml_xpath_expression.c

@@ -1,81 +1,81 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_xpath.h"
-#include "ruby_xml_xpath_expression.h"
-
-/*
- * Document-class: LibXML::XML::XPath::Expression
- *
- * The XML::XPath::Expression class is used to compile
- * XPath expressions so they can be parsed only once
- * but reused multiple times.
- *
- *  doc = XML::Document.string(IO.read('some xml file'))
- *  expr = XPath::Expression.new('//first')
- *  doc.root.each do |node|
- *   result = node.find(expr) # many, many, many times
- *   # ...
- *  end
- */
-
-VALUE cXMLXPathExpression;
-
-static void rxml_xpath_expression_free(xmlXPathCompExprPtr expr)
-{
-  xmlXPathFreeCompExpr(expr);
-}
-
-static VALUE rxml_xpath_expression_alloc(VALUE klass)
-{
-  return Data_Wrap_Struct(cXMLXPathExpression, NULL,
-      rxml_xpath_expression_free, NULL);
-}
-
-/* call-seq:
- *    XPath::Expression.compile(expression) -> XPath::Expression
- *
- * Compiles an XPatch expression. This improves performance
- * when an XPath expression is called multiple times.
- *
- *  doc = XML::Document.string('<header><first>hi</first></header>')
- *  expr = XPath::Expression.new('//first')
- *  nodes = doc.find(expr)
- */
-static VALUE rxml_xpath_expression_compile(VALUE klass, VALUE expression)
-{
-  VALUE args[] = {expression};
-  return rb_class_new_instance(1, args, cXMLXPathExpression);
-}
-
-/* call-seq:
- *    XPath::Expression.new(expression) -> XPath::Expression
- *
- * Compiles an XPatch expression. This improves performance
- * when an XPath expression is called multiple times.
- *
- *  doc = XML::Document.string('<header><first>hi</first></header>')
- *  expr = XPath::Expression.new('//first')
- *  nodes = doc.find(expr)
- */
-static VALUE rxml_xpath_expression_initialize(VALUE self, VALUE expression)
-{
-  xmlXPathCompExprPtr compexpr = xmlXPathCompile((const xmlChar*)StringValueCStr(expression));
-
-  if (compexpr == NULL)
-  {
-    xmlErrorPtr xerror = xmlGetLastError();
-    rxml_raise(xerror);
-  }
-
-  DATA_PTR( self) = compexpr;
-  return self;
-}
-
-void rxml_init_xpath_expression(void)
-{
-  cXMLXPathExpression = rb_define_class_under(mXPath, "Expression", rb_cObject);
-  rb_define_alloc_func(cXMLXPathExpression, rxml_xpath_expression_alloc);
-  rb_define_singleton_method(cXMLXPathExpression, "compile", rxml_xpath_expression_compile, 1);
-  rb_define_method(cXMLXPathExpression, "initialize", rxml_xpath_expression_initialize, 1);
-}
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_xpath.h"
+#include "ruby_xml_xpath_expression.h"
+
+/*
+ * Document-class: LibXML::XML::XPath::Expression
+ *
+ * The XML::XPath::Expression class is used to compile
+ * XPath expressions so they can be parsed only once
+ * but reused multiple times.
+ *
+ *  doc = XML::Document.string(IO.read('some xml file'))
+ *  expr = XPath::Expression.new('//first')
+ *  doc.root.each do |node|
+ *   result = node.find(expr) # many, many, many times
+ *   # ...
+ *  end
+ */
+
+VALUE cXMLXPathExpression;
+
+static void rxml_xpath_expression_free(xmlXPathCompExprPtr expr)
+{
+  xmlXPathFreeCompExpr(expr);
+}
+
+static VALUE rxml_xpath_expression_alloc(VALUE klass)
+{
+  return Data_Wrap_Struct(cXMLXPathExpression, NULL,
+      rxml_xpath_expression_free, NULL);
+}
+
+/* call-seq:
+ *    XPath::Expression.compile(expression) -> XPath::Expression
+ *
+ * Compiles an XPath expression. This improves performance
+ * when an XPath expression is called multiple times.
+ *
+ *  doc = XML::Document.string('<header><first>hi</first></header>')
+ *  expr = XPath::Expression.new('//first')
+ *  nodes = doc.find(expr)
+ */
+static VALUE rxml_xpath_expression_compile(VALUE klass, VALUE expression)
+{
+  VALUE args[] = {expression};
+  return rb_class_new_instance(1, args, cXMLXPathExpression);
+}
+
+/* call-seq:
+ *    XPath::Expression.new(expression) -> XPath::Expression
+ *
+ * Compiles an XPath expression. This improves performance
+ * when an XPath expression is called multiple times.
+ *
+ *  doc = XML::Document.string('<header><first>hi</first></header>')
+ *  expr = XPath::Expression.new('//first')
+ *  nodes = doc.find(expr)
+ */
+static VALUE rxml_xpath_expression_initialize(VALUE self, VALUE expression)
+{
+  xmlXPathCompExprPtr compexpr = xmlXPathCompile((const xmlChar*)StringValueCStr(expression));
+
+  if (compexpr == NULL)
+  {
+    const xmlError *xerror = xmlGetLastError();
+    rxml_raise(xerror);
+  }
+
+  DATA_PTR( self) = compexpr;
+  return self;
+}
+
+void rxml_init_xpath_expression(void)
+{
+  cXMLXPathExpression = rb_define_class_under(mXPath, "Expression", rb_cObject);
+  rb_define_alloc_func(cXMLXPathExpression, rxml_xpath_expression_alloc);
+  rb_define_singleton_method(cXMLXPathExpression, "compile", rxml_xpath_expression_compile, 1);
+  rb_define_method(cXMLXPathExpression, "initialize", rxml_xpath_expression_initialize, 1);
+}