libxml-ruby 0.9.2 → 0.9.3

data/ext/libxml/ruby_libxml.h

@@ -1,72 +1,70 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_LIBXML_H__
-#define __RUBY_LIBXML_H__
-
-#include "version.h"
-
-#include <ruby.h>
-#include <rubyio.h>
-#include <util.h>
-#include <libxml/parser.h>
-#include <libxml/parserInternals.h>
-#include <libxml/debugXML.h>
-#include <libxml/xmlversion.h>
-#include <libxml/xmlmemory.h>
-#include <libxml/xpath.h>
-#include <libxml/valid.h>
-#include <libxml/catalog.h>
-#include <libxml/HTMLparser.h>
-#include <libxml/xmlreader.h>
-
-// Maybe not yet defined in ruby
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(x) RSTRING(x)->len
-#endif
-
-// not in Ruby 1.9
-#ifndef GetWriteFile
-#define GetWriteFile(fp) rb_io_stdio_file(fp)
-#define OpenFile rb_io_t
-#endif
-
-#ifdef LIBXML_DEBUG_ENABLED
-#include <libxml/xpathInternals.h>
-#endif
-#ifdef LIBXML_XINCLUDE_ENABLED
-#include <libxml/xinclude.h>
-#endif
-#ifdef LIBXML_XPTR_ENABLED
-#include <libxml/xpointer.h>
-#endif
-
-
-#include "ruby_xml_encoding.h"
-#include "ruby_xml_error.h"
-#include "ruby_xml_input.h"
-#include "ruby_xml_state.h"
-#include "ruby_xml_attributes.h"
-#include "ruby_xml_attr.h"
-#include "ruby_xml_document.h"
-#include "ruby_xml_node.h"
-#include "ruby_xml_ns.h"
-#include "ruby_xml_parser.h"
-#include "ruby_xml_parser_context.h"
-#include "ruby_xml_sax_parser.h"
-#include "ruby_xml_xinclude.h"
-#include "ruby_xml_xpath.h"
-#include "ruby_xml_xpath_expression.h"
-#include "ruby_xml_xpath_context.h"
-#include "ruby_xml_xpath_object.h"
-#include "ruby_xml_xpointer.h"
-#include "ruby_xml_input_cbg.h"
-#include "ruby_xml_dtd.h"
-#include "ruby_xml_schema.h"
-#include "ruby_xml_relaxng.h"
-#include "ruby_xml_html_parser.h"
-#include "ruby_xml_reader.h"
-
-extern VALUE mLibXML;
-extern VALUE mXML;
-
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_LIBXML_H__
+#define __RUBY_LIBXML_H__
+
+#include "version.h"
+
+#include <ruby.h>
+#include <rubyio.h>
+#include <util.h>
+#include <libxml/parser.h>
+#include <libxml/parserInternals.h>
+#include <libxml/debugXML.h>
+#include <libxml/xmlversion.h>
+#include <libxml/xmlmemory.h>
+#include <libxml/xpath.h>
+#include <libxml/valid.h>
+#include <libxml/catalog.h>
+#include <libxml/HTMLparser.h>
+#include <libxml/xmlreader.h>
+
+// Maybe not yet defined in ruby
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(x) RSTRING(x)->len
+#endif
+
+// not in Ruby 1.9
+#ifndef GetWriteFile
+#define GetWriteFile(fp) rb_io_stdio_file(fp)
+#define OpenFile rb_io_t
+#endif
+
+#ifdef LIBXML_DEBUG_ENABLED
+#include <libxml/xpathInternals.h>
+#endif
+#ifdef LIBXML_XINCLUDE_ENABLED
+#include <libxml/xinclude.h>
+#endif
+#ifdef LIBXML_XPTR_ENABLED
+#include <libxml/xpointer.h>
+#endif
+
+#include "ruby_xml_error.h"
+#include "ruby_xml_input.h"
+#include "ruby_xml_state.h"
+#include "ruby_xml_attributes.h"
+#include "ruby_xml_attr.h"
+#include "ruby_xml_document.h"
+#include "ruby_xml_node.h"
+#include "ruby_xml_ns.h"
+#include "ruby_xml_parser.h"
+#include "ruby_xml_parser_context.h"
+#include "ruby_xml_sax_parser.h"
+#include "ruby_xml_xinclude.h"
+#include "ruby_xml_xpath.h"
+#include "ruby_xml_xpath_expression.h"
+#include "ruby_xml_xpath_context.h"
+#include "ruby_xml_xpath_object.h"
+#include "ruby_xml_xpointer.h"
+#include "ruby_xml_input_cbg.h"
+#include "ruby_xml_dtd.h"
+#include "ruby_xml_schema.h"
+#include "ruby_xml_relaxng.h"
+#include "ruby_xml_html_parser.h"
+#include "ruby_xml_reader.h"
+
+extern VALUE mLibXML;
+extern VALUE mXML;
+
+#endif

data/ext/libxml/ruby_xml_attr.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_attr.c 553 2008-11-18 02:34:38Z cfis $ */
+/* $Id: ruby_xml_attr.c 612 2008-11-21 08:01:29Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -23,7 +23,7 @@
 
 VALUE cXMLAttr;
 
-void ruby_xml_attr_free(xmlAttrPtr xattr) {
+void rxml_attr_free(xmlAttrPtr xattr) {
   if (!xattr) return;
 
   if (xattr != NULL ) {
@@ -40,7 +40,7 @@ void ruby_xml_attr_free(xmlAttrPtr xattr) {
 }
 
 void
-ruby_xml_attr_mark(xmlAttrPtr xattr) {
+rxml_attr_mark(xmlAttrPtr xattr) {
   if (xattr == NULL) return;
 
   if (xattr->_private == NULL ) {
@@ -49,11 +49,11 @@ ruby_xml_attr_mark(xmlAttrPtr xattr) {
     return;
   }
 
-  ruby_xml_node_mark_common((xmlNodePtr)xattr);
+  rxml_node_mark_common((xmlNodePtr)xattr);
 }
 
 VALUE
-ruby_xml_attr_wrap(xmlAttrPtr xattr)
+rxml_attr_wrap(xmlAttrPtr xattr)
 {
   VALUE result;
   // This node is already wrapped
@@ -61,7 +61,7 @@ ruby_xml_attr_wrap(xmlAttrPtr xattr)
     return (VALUE)xattr->_private;
 
   result = Data_Wrap_Struct(cXMLAttr,
-                            ruby_xml_attr_mark, ruby_xml_attr_free,
+                            rxml_attr_mark, rxml_attr_free,
                             xattr);
 
   xattr->_private=(void*)result;
@@ -72,11 +72,11 @@ ruby_xml_attr_wrap(xmlAttrPtr xattr)
 }
 
 
-VALUE
-ruby_xml_attr_alloc(VALUE klass)
+static VALUE
+rxml_attr_alloc(VALUE klass)
 {
   return Data_Wrap_Struct(cXMLAttr,
-                          ruby_xml_attr_mark, ruby_xml_attr_free,
+                          rxml_attr_mark, rxml_attr_free,
                           NULL);
 }
 
@@ -92,8 +92,8 @@ ruby_xml_attr_alloc(VALUE klass)
  *
  *  attr = XML::Attr.new(doc.root, 'name', 'libxml')
  */
-VALUE
-ruby_xml_attr_initialize(int argc, VALUE *argv, VALUE self) {
+static VALUE
+rxml_attr_initialize(int argc, VALUE *argv, VALUE self) {
   VALUE node = argv[0];
   VALUE name = argv[1];
   VALUE value = argv[2];
@@ -138,14 +138,14 @@ ruby_xml_attr_initialize(int argc, VALUE *argv, VALUE self) {
  * 
  * Obtain this attribute's child attribute(s).
  */
-VALUE
-ruby_xml_attr_child_get(VALUE self) {
+static VALUE
+rxml_attr_child_get(VALUE self) {
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->children == NULL)
     return(Qnil);
   else
-    return(ruby_xml_node2_wrap(cXMLNode, (xmlNodePtr)xattr->children));
+    return(rxml_node2_wrap(cXMLNode, (xmlNodePtr)xattr->children));
 }
 
 
@@ -155,8 +155,8 @@ ruby_xml_attr_child_get(VALUE self) {
  * 
  * Returns whether this attribute has child attributes.
  */
-VALUE
-ruby_xml_attr_child_q(VALUE self) {
+static VALUE
+rxml_attr_child_q(VALUE self) {
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->children == NULL)
@@ -174,14 +174,14 @@ ruby_xml_attr_child_q(VALUE self) {
  *
  *  doc.root.attributes.get_attribute('name').doc == doc
  */
-VALUE
-ruby_xml_attr_doc_get(VALUE self) {
+static VALUE
+rxml_attr_doc_get(VALUE self) {
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->doc == NULL)
     return(Qnil);
   else
-    return(ruby_xml_document_wrap(xattr->doc));
+    return(rxml_document_wrap(xattr->doc));
 }
 
 /*
@@ -191,8 +191,8 @@ ruby_xml_attr_doc_get(VALUE self) {
  * Determine whether this attribute is associated with an
  * XML::Document.
  */
-VALUE
-ruby_xml_attr_doc_q(VALUE self) {
+static VALUE
+rxml_attr_doc_q(VALUE self) {
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->doc == NULL)
@@ -208,14 +208,14 @@ ruby_xml_attr_doc_q(VALUE self) {
  * 
  * Obtain the last attribute.
  */
-VALUE
-ruby_xml_attr_last_get(VALUE self) {
+static VALUE
+rxml_attr_last_get(VALUE self) {
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->last == NULL)
     return(Qnil);
   else
-    return(ruby_xml_node2_wrap(cXMLNode, xattr->last));
+    return(rxml_node2_wrap(cXMLNode, xattr->last));
 }
 
 
@@ -225,8 +225,8 @@ ruby_xml_attr_last_get(VALUE self) {
  * 
  * Determine whether this is the last attribute.
  */
-VALUE
-ruby_xml_attr_last_q(VALUE self) {
+static VALUE
+rxml_attr_last_q(VALUE self) {
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->last == NULL)
@@ -241,8 +241,8 @@ ruby_xml_attr_last_q(VALUE self) {
  * 
  * Obtain this attribute's name.
  */
-VALUE
-ruby_xml_attr_name_get(VALUE self) {
+static VALUE
+rxml_attr_name_get(VALUE self) {
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
 
@@ -258,14 +258,14 @@ ruby_xml_attr_name_get(VALUE self) {
  * 
  * Obtain the next attribute.
  */
-VALUE
-ruby_xml_attr_next_get(VALUE self) {
+static VALUE
+rxml_attr_next_get(VALUE self) {
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->next == NULL)
     return(Qnil);
   else
-    return(ruby_xml_attr_wrap(xattr->next));
+    return(rxml_attr_wrap(xattr->next));
 }
 
 
@@ -275,8 +275,8 @@ ruby_xml_attr_next_get(VALUE self) {
  * 
  * Determine whether there is a next attribute.
  */
-VALUE
-ruby_xml_attr_next_q(VALUE self) {
+static VALUE
+rxml_attr_next_q(VALUE self) {
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->next == NULL)
@@ -292,8 +292,8 @@ ruby_xml_attr_next_q(VALUE self) {
  * 
  * Obtain this attribute node's type name.
  */
-VALUE
-ruby_xml_attr_node_type_name(VALUE self) {
+static VALUE
+rxml_attr_node_type_name(VALUE self) {
   return(rb_str_new2("attribute"));
 }
 
@@ -304,14 +304,14 @@ ruby_xml_attr_node_type_name(VALUE self) {
  * 
  * Obtain this attribute's associated XML::NS, if any.
  */
-VALUE
-ruby_xml_attr_ns_get(VALUE self) {
+static VALUE
+rxml_attr_ns_get(VALUE self) {
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->ns == NULL)
     return(Qnil);
   else
-    return(ruby_xml_ns_wrap(xattr->ns));
+    return(rxml_ns_wrap(xattr->ns));
 }
 
 
@@ -322,8 +322,8 @@ ruby_xml_attr_ns_get(VALUE self) {
  * Determine whether this attribute has an associated 
  * namespace.
  */
-VALUE
-ruby_xml_attr_ns_q(VALUE self) {
+static VALUE
+rxml_attr_ns_q(VALUE self) {
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->ns == NULL)
@@ -339,14 +339,14 @@ ruby_xml_attr_ns_q(VALUE self) {
  * 
  * Obtain this attribute node's parent.
  */
-VALUE
-ruby_xml_attr_parent_get(VALUE self) {
+static VALUE
+rxml_attr_parent_get(VALUE self) {
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->parent == NULL)
     return(Qnil);
   else
-    return(ruby_xml_node2_wrap(cXMLNode, xattr->parent));
+    return(rxml_node2_wrap(cXMLNode, xattr->parent));
 }
 
 
@@ -356,8 +356,8 @@ ruby_xml_attr_parent_get(VALUE self) {
  * 
  * Determine whether this attribute has a parent.
  */
-VALUE
-ruby_xml_attr_parent_q(VALUE self) {
+static VALUE
+rxml_attr_parent_q(VALUE self) {
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->parent == NULL)
@@ -373,14 +373,14 @@ ruby_xml_attr_parent_q(VALUE self) {
  * 
  * Obtain the previous attribute.
  */
-VALUE
-ruby_xml_attr_prev_get(VALUE self) {
+static VALUE
+rxml_attr_prev_get(VALUE self) {
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->prev == NULL)
     return(Qnil);
   else
-    return(ruby_xml_attr_wrap(xattr->prev));
+    return(rxml_attr_wrap(xattr->prev));
 }
 
 
@@ -390,8 +390,8 @@ ruby_xml_attr_prev_get(VALUE self) {
  * 
  * Determine whether there is a previous attribute.
  */
-VALUE
-ruby_xml_attr_prev_q(VALUE self) {
+static VALUE
+rxml_attr_prev_q(VALUE self) {
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   if (xattr->prev == NULL)
@@ -407,8 +407,8 @@ ruby_xml_attr_prev_q(VALUE self) {
  * 
  * Removes this attribute from it's parent.
  */
-VALUE
-ruby_xml_attr_remove_ex(VALUE self) {
+static VALUE
+rxml_attr_remove_ex(VALUE self) {
   xmlAttrPtr xattr;
   Data_Get_Struct(self, xmlAttr, xattr);
   
@@ -427,13 +427,13 @@ ruby_xml_attr_remove_ex(VALUE self) {
  * Obtain the value of this attribute.
  */
 VALUE
-ruby_xml_attr_value_get(VALUE self) {
+rxml_attr_value_get(VALUE self) {
   xmlAttrPtr xattr;
   xmlChar *value;
   VALUE result = Qnil;
   
   Data_Get_Struct(self, xmlAttr, xattr);
-  if (ruby_xml_attr_parent_q(self) == Qtrue) {
+  if (rxml_attr_parent_q(self) == Qtrue) {
     value = xmlGetProp(xattr->parent, xattr->name);
     if (value != NULL)
     {
@@ -452,7 +452,7 @@ ruby_xml_attr_value_get(VALUE self) {
  * Sets the value of this attribute.
  */
 VALUE
-ruby_xml_attr_value_set(VALUE self, VALUE val) {
+rxml_attr_value_set(VALUE self, VALUE val) {
   xmlAttrPtr xattr;
   
   Check_Type(val, T_STRING);
@@ -476,25 +476,25 @@ ruby_xml_attr_value_set(VALUE self, VALUE val) {
 void
 ruby_init_xml_attr(void) {
   cXMLAttr = rb_define_class_under(mXML, "Attr", rb_cObject);
-  rb_define_alloc_func(cXMLAttr, ruby_xml_attr_alloc);
-  rb_define_method(cXMLAttr, "initialize", ruby_xml_attr_initialize, -1);
-  rb_define_method(cXMLAttr, "child", ruby_xml_attr_child_get, 0);
-  rb_define_method(cXMLAttr, "child?", ruby_xml_attr_child_q, 0);
-  rb_define_method(cXMLAttr, "doc", ruby_xml_attr_doc_get, 0);
-  rb_define_method(cXMLAttr, "doc?", ruby_xml_attr_doc_q, 0);
-  rb_define_method(cXMLAttr, "last", ruby_xml_attr_last_get, 0);
-  rb_define_method(cXMLAttr, "last?", ruby_xml_attr_last_q, 0);
-  rb_define_method(cXMLAttr, "name", ruby_xml_attr_name_get, 0);
-  rb_define_method(cXMLAttr, "next", ruby_xml_attr_next_get, 0);
-  rb_define_method(cXMLAttr, "next?", ruby_xml_attr_next_q, 0);
-  rb_define_method(cXMLAttr, "node_type_name", ruby_xml_attr_node_type_name, 0);
-  rb_define_method(cXMLAttr, "ns", ruby_xml_attr_ns_get, 0);
-  rb_define_method(cXMLAttr, "ns?", ruby_xml_attr_ns_q, 0);
-  rb_define_method(cXMLAttr, "parent", ruby_xml_attr_parent_get, 0);
-  rb_define_method(cXMLAttr, "parent?", ruby_xml_attr_parent_q, 0);
-  rb_define_method(cXMLAttr, "prev", ruby_xml_attr_prev_get, 0);
-  rb_define_method(cXMLAttr, "prev?", ruby_xml_attr_prev_q, 0);
-  rb_define_method(cXMLAttr, "remove!", ruby_xml_attr_remove_ex, 0);
-  rb_define_method(cXMLAttr, "value", ruby_xml_attr_value_get, 0);
-  rb_define_method(cXMLAttr, "value=", ruby_xml_attr_value_set, 1);
+  rb_define_alloc_func(cXMLAttr, rxml_attr_alloc);
+  rb_define_method(cXMLAttr, "initialize", rxml_attr_initialize, -1);
+  rb_define_method(cXMLAttr, "child", rxml_attr_child_get, 0);
+  rb_define_method(cXMLAttr, "child?", rxml_attr_child_q, 0);
+  rb_define_method(cXMLAttr, "doc", rxml_attr_doc_get, 0);
+  rb_define_method(cXMLAttr, "doc?", rxml_attr_doc_q, 0);
+  rb_define_method(cXMLAttr, "last", rxml_attr_last_get, 0);
+  rb_define_method(cXMLAttr, "last?", rxml_attr_last_q, 0);
+  rb_define_method(cXMLAttr, "name", rxml_attr_name_get, 0);
+  rb_define_method(cXMLAttr, "next", rxml_attr_next_get, 0);
+  rb_define_method(cXMLAttr, "next?", rxml_attr_next_q, 0);
+  rb_define_method(cXMLAttr, "node_type_name", rxml_attr_node_type_name, 0);
+  rb_define_method(cXMLAttr, "ns", rxml_attr_ns_get, 0);
+  rb_define_method(cXMLAttr, "ns?", rxml_attr_ns_q, 0);
+  rb_define_method(cXMLAttr, "parent", rxml_attr_parent_get, 0);
+  rb_define_method(cXMLAttr, "parent?", rxml_attr_parent_q, 0);
+  rb_define_method(cXMLAttr, "prev", rxml_attr_prev_get, 0);
+  rb_define_method(cXMLAttr, "prev?", rxml_attr_prev_q, 0);
+  rb_define_method(cXMLAttr, "remove!", rxml_attr_remove_ex, 0);
+  rb_define_method(cXMLAttr, "value", rxml_attr_value_get, 0);
+  rb_define_method(cXMLAttr, "value=", rxml_attr_value_set, 1);
 }