libxml-ruby 0.9.2-x86-mswin32-60 → 0.9.3-x86-mswin32-60

data/ext/libxml/ruby_xml_input.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_input.c 528 2008-11-15 23:43:48Z cfis $ */
+/* $Id: rxml_input.c 528 2008-11-15 23:43:48Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -20,7 +20,38 @@ VALUE cXMLInput;
 * but instead will use the various Document and Parser apis.
 * For example:
 *
-*   document = Document.file('my_file') */
+*   document = Document.file('my_file') 
+*
+* LibXML converts all data sources to UTF8 internally before 
+* processing them.  By default, LibXML will determine a data
+* source's encoding using the algorithm described on its
+* website[* http://xmlsoft.org/encoding.html].
+*
+* However, its some cases it is possible to tell LibXML
+* the data source's encoding via the constants defined in
+* the Encoding module.
+*
+* Example 1:
+* 
+*   parser = XML::Parser.new
+*   parser.input.encoding = XML::Input::ISO_8859_1
+*   parser.io = File.open('some_file', 'rb')
+*   doc = parser.parse
+*
+* Example 2:
+* 
+*   parser = XML::HTMLParser.new
+*   parser.encoding = XML::Input::ISO_8859_1
+*   parser.file = "some_file"
+*   doc = parser.parse
+*
+* Example 3:
+* 
+*   document = XML::Document.new
+*   encoding_string =  XML::Input.encoding_to_s(XML::Encoding::ISO_8859_1)
+*   document.encoding = document
+*   doc << XML::Node.new */
+
 
 ID ENCODING_ATTR;
 ID FILE_ATTR;
@@ -28,14 +59,125 @@ ID STRING_ATTR;
 ID DOCUMENT_ATTR;
 ID IO_ATTR;
 
+static ID READ_METHOD;
+
+
+/* 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;
+}
+
+/*
+ * call-seq:
+ *    Input.encoding_to_s(Input::ENCODING) -> "encoding"
+ * 
+ * Converts an encoding contstant defined on the XML::Input
+ * class to its text representation.
+ */
+VALUE
+rxml_input_encoding_to_s(VALUE self, VALUE encoding)
+{
+  char* encodingStr = NULL;
+
+  switch (NUM2INT(encoding))
+  {
+    case XML_CHAR_ENCODING_ERROR:
+      encodingStr = "Error";
+      break;
+    case XML_CHAR_ENCODING_NONE:
+      encodingStr = "None";
+      break;
+    case XML_CHAR_ENCODING_UTF8:
+      encodingStr = "UTF-8";
+      break;
+    case XML_CHAR_ENCODING_UTF16LE:
+      encodingStr = "UTF-16LE";
+      break;
+    case XML_CHAR_ENCODING_UTF16BE:
+      encodingStr = "UTF-16BE";
+      break;
+    case XML_CHAR_ENCODING_UCS4LE:
+      encodingStr = "UCS-4LE";
+      break;
+    case XML_CHAR_ENCODING_UCS4BE:
+      encodingStr = "UCS-4BE";
+      break;
+    case XML_CHAR_ENCODING_EBCDIC:
+      encodingStr = "EBCDIC";
+      break;
+    case XML_CHAR_ENCODING_UCS4_2143:
+      encodingStr = "UCS-4";
+      break;
+    case XML_CHAR_ENCODING_UCS4_3412:
+      encodingStr = "UCS-4";
+      break;
+    case XML_CHAR_ENCODING_UCS2:
+      encodingStr = "UCS-2";
+      break;
+    case XML_CHAR_ENCODING_8859_1:
+      encodingStr = "ISO-8859-1";
+      break;
+    case XML_CHAR_ENCODING_8859_2:
+      encodingStr = "ISO-8859-2";
+      break;
+    case XML_CHAR_ENCODING_8859_3:
+      encodingStr = "ISO-8859-3";
+      break;
+    case XML_CHAR_ENCODING_8859_4:
+      encodingStr = "ISO-8859-4";
+      break;
+    case XML_CHAR_ENCODING_8859_5:
+      encodingStr = "ISO-8859-5";
+      break;
+    case XML_CHAR_ENCODING_8859_6:
+      encodingStr = "ISO-8859-6";
+      break;
+    case XML_CHAR_ENCODING_8859_7:
+      encodingStr = "ISO-8859-7";
+      break;
+    case XML_CHAR_ENCODING_8859_8:
+      encodingStr = "ISO-8859-8";
+      break;
+    case XML_CHAR_ENCODING_8859_9:
+      encodingStr = "ISO-8859-9";
+      break;
+    case XML_CHAR_ENCODING_2022_JP:
+      encodingStr = "ISO-2022-JP";
+      break;
+    case XML_CHAR_ENCODING_SHIFT_JIS:
+      encodingStr = "Shift_JIS";
+      break;
+    case XML_CHAR_ENCODING_EUC_JP:
+      encodingStr = "EUC-JP";
+      break;
+    case XML_CHAR_ENCODING_ASCII:
+      encodingStr = "ASCII";
+      break;
+  }
+
+  return rb_str_new2(encodingStr);
+}
+
 /*
  * call-seq:
  *    initialize -> LibXML::XML::Input instance
  * 
  * Initialize a new intput object.
  */
-VALUE
-ruby_xml_input_initialize(VALUE self) {
+static VALUE
+rxml_input_initialize(VALUE self) {
   rb_ivar_set(self, ENCODING_ATTR, INT2NUM(XML_CHAR_ENCODING_UTF8));
   return self;
 }
@@ -47,8 +189,8 @@ ruby_xml_input_initialize(VALUE self) {
  * 
  * Obtain the FILE this parser will read from.
  */
-VALUE
-ruby_xml_input_file_get(VALUE self) {
+static VALUE
+rxml_input_file_get(VALUE self) {
   return rb_ivar_get(self, FILE_ATTR);
 }
 
@@ -58,8 +200,8 @@ ruby_xml_input_file_get(VALUE self) {
  * 
  * Set the FILE this parser will read from.
  */
-VALUE
-ruby_xml_input_file_set(VALUE self, VALUE FILE) {
+static VALUE
+rxml_input_file_set(VALUE self, VALUE FILE) {
   Check_Type(FILE, T_STRING);
   rb_ivar_set(self, FILE_ATTR, FILE);
   rb_ivar_set(self, STRING_ATTR, Qnil);
@@ -75,8 +217,8 @@ ruby_xml_input_file_set(VALUE self, VALUE FILE) {
  * 
  * Obtain the string this parser will read from.
  */
-VALUE
-ruby_xml_input_string_get(VALUE self) {
+static VALUE
+rxml_input_string_get(VALUE self) {
   return rb_ivar_get(self, STRING_ATTR);
 }
 
@@ -87,8 +229,8 @@ ruby_xml_input_string_get(VALUE self) {
  * 
  * Set the string this parser will read from.
  */
-VALUE
-ruby_xml_input_string_set(VALUE self, VALUE string) {
+static VALUE
+rxml_input_string_set(VALUE self, VALUE string) {
   Check_Type(string, T_STRING);
   rb_ivar_set(self, FILE_ATTR, Qnil);
   rb_ivar_set(self, STRING_ATTR, string);
@@ -103,8 +245,8 @@ ruby_xml_input_string_set(VALUE self, VALUE string) {
  * 
  * Obtain the document this parser will read from.
  */
-VALUE
-ruby_xml_input_document_get(VALUE self) {
+static VALUE
+rxml_input_document_get(VALUE self) {
   return rb_ivar_get(self, DOCUMENT_ATTR);
 }
 
@@ -114,8 +256,8 @@ ruby_xml_input_document_get(VALUE self) {
  * 
  * Set the document this parser will read from.
  */
-VALUE
-ruby_xml_input_document_set(VALUE self, VALUE document) {
+static VALUE
+rxml_input_document_set(VALUE self, VALUE document) {
   rb_ivar_set(self, FILE_ATTR, Qnil);
   rb_ivar_set(self, STRING_ATTR, Qnil);
   rb_ivar_set(self, DOCUMENT_ATTR, document);
@@ -129,8 +271,8 @@ ruby_xml_input_document_set(VALUE self, VALUE document) {
  * 
  * Obtain the IO instance this parser works with.
  */
-VALUE
-ruby_xml_input_io_get(VALUE self) {
+static VALUE
+rxml_input_io_get(VALUE self) {
   return rb_ivar_get(self, IO_ATTR);
 }
 
@@ -140,11 +282,8 @@ ruby_xml_input_io_get(VALUE self) {
  * 
  * Set the IO instance this parser works with.
  */
-VALUE
-ruby_xml_input_io_set(VALUE self, VALUE io) {
-  if (!rb_obj_is_kind_of(io, rb_cIO))
-    rb_raise(rb_eTypeError, "Invalid argument, must be an IO object");
-
+static VALUE
+rxml_input_io_set(VALUE self, VALUE io) {
   rb_ivar_set(self, FILE_ATTR, Qnil);
   rb_ivar_set(self, STRING_ATTR, Qnil);
   rb_ivar_set(self, DOCUMENT_ATTR, Qnil);
@@ -152,6 +291,14 @@ ruby_xml_input_io_set(VALUE self, VALUE io) {
   return self;
 }
 
+// Rdoc needs to know 
+#ifdef RDOC_NEVER_DEFINED
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
+#endif
+
+
+
 // Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
   mLibXML = rb_define_module("LibXML");
@@ -164,16 +311,45 @@ ruby_init_xml_input(void) {
   STRING_ATTR = rb_intern("@string");
   DOCUMENT_ATTR = rb_intern("@document");
   IO_ATTR = rb_intern("@io");
+  READ_METHOD = rb_intern("read");
 
   cXMLInput = rb_define_class_under(mXML, "Input", rb_cObject);
+  rb_define_singleton_method(cXMLInput, "encoding_to_s", rxml_input_encoding_to_s, 1);
+
+  rb_define_const(cXMLInput, "UNDEFINED", INT2NUM(XPATH_UNDEFINED));
+  rb_define_const(cXMLInput, "ERROR", INT2NUM(XML_CHAR_ENCODING_ERROR));         /* No char encoding detected */
+  rb_define_const(cXMLInput, "NONE", INT2NUM(XML_CHAR_ENCODING_NONE));           /* No char encoding detected */
+  rb_define_const(cXMLInput, "UTF8", INT2NUM(XML_CHAR_ENCODING_UTF8));	          /* UTF-8 */
+  rb_define_const(cXMLInput, "UTF16LE", INT2NUM(XML_CHAR_ENCODING_UTF16LE));	    /* UTF-16 little endian */
+  rb_define_const(cXMLInput, "UTF16BE", INT2NUM(XML_CHAR_ENCODING_UTF16BE));	    /* UTF-16 big endian */
+  rb_define_const(cXMLInput, "UCS4LE", INT2NUM(XML_CHAR_ENCODING_UCS4LE));	      /* UCS-4 little endian */
+  rb_define_const(cXMLInput, "UCS4BE", INT2NUM(XML_CHAR_ENCODING_UCS4BE));	      /* UCS-4 big endian */
+  rb_define_const(cXMLInput, "EBCDIC", INT2NUM(XML_CHAR_ENCODING_EBCDIC));	      /* EBCDIC uh! */
+  rb_define_const(cXMLInput, "UCS4_2143", INT2NUM(XML_CHAR_ENCODING_UCS4_2143)); /* UCS-4 unusual ordering */
+  rb_define_const(cXMLInput, "UCS4_3412", INT2NUM(XML_CHAR_ENCODING_UCS4_3412)); /* UCS-4 unusual ordering */
+  rb_define_const(cXMLInput, "UCS2", INT2NUM(XML_CHAR_ENCODING_UCS2));	          /* UCS-2 */
+  rb_define_const(cXMLInput, "ISO_8859_1", INT2NUM(XML_CHAR_ENCODING_8859_1));	      /* ISO-8859-1 ISO Latin 1 */
+  rb_define_const(cXMLInput, "ISO_8859_2", INT2NUM(XML_CHAR_ENCODING_8859_2));	      /* ISO-8859-2 ISO Latin 2 */
+  rb_define_const(cXMLInput, "ISO_8859_3", INT2NUM(XML_CHAR_ENCODING_8859_3));	      /* ISO-8859-3 */
+  rb_define_const(cXMLInput, "ISO_8859_4", INT2NUM(XML_CHAR_ENCODING_8859_4));	      /* ISO-8859-4 */
+  rb_define_const(cXMLInput, "ISO_8859_5", INT2NUM(XML_CHAR_ENCODING_8859_5));	      /* ISO-8859-5 */
+  rb_define_const(cXMLInput, "ISO_8859_6", INT2NUM(XML_CHAR_ENCODING_8859_6));	      /* ISO-8859-6 */
+  rb_define_const(cXMLInput, "ISO_8859_7", INT2NUM(XML_CHAR_ENCODING_8859_7));	      /* ISO-8859-7 */
+  rb_define_const(cXMLInput, "ISO_8859_8", INT2NUM(XML_CHAR_ENCODING_8859_8));	      /* ISO-8859-8 */
+  rb_define_const(cXMLInput, "ISO_8859_9", INT2NUM(XML_CHAR_ENCODING_8859_9));	      /* ISO-8859-9 */
+  rb_define_const(cXMLInput, "ISO_2022_JP", INT2NUM(XML_CHAR_ENCODING_2022_JP));     /* ISO-2022-JP */
+  rb_define_const(cXMLInput, "SHIFT_JIS", INT2NUM(XML_CHAR_ENCODING_SHIFT_JIS)); /* Shift_JIS */
+  rb_define_const(cXMLInput, "EUC_JP", INT2NUM(XML_CHAR_ENCODING_EUC_JP));       /* EUC-JP */
+  rb_define_const(cXMLInput, "ASCII", INT2NUM(XML_CHAR_ENCODING_ASCII));         /* pure ASCII */
+
   rb_define_attr(cXMLInput, "encoding", 1, 1);
-  rb_define_method(cXMLInput, "initialize", ruby_xml_input_initialize, 0);
-  rb_define_method(cXMLInput, "file", ruby_xml_input_file_get, 0);
-  rb_define_method(cXMLInput, "file=", ruby_xml_input_file_set, 1);
-  rb_define_method(cXMLInput, "string", ruby_xml_input_string_get, 0);
-  rb_define_method(cXMLInput, "string=", ruby_xml_input_string_set, 1);
-  rb_define_method(cXMLInput, "document", ruby_xml_input_document_get, 0);
-  rb_define_method(cXMLInput, "document=", ruby_xml_input_document_set, 1);
-  rb_define_method(cXMLInput, "io", ruby_xml_input_io_get, 0);
-  rb_define_method(cXMLInput, "io=", ruby_xml_input_io_set, 1);
+  rb_define_method(cXMLInput, "initialize", rxml_input_initialize, 0);
+  rb_define_method(cXMLInput, "file", rxml_input_file_get, 0);
+  rb_define_method(cXMLInput, "file=", rxml_input_file_set, 1);
+  rb_define_method(cXMLInput, "string", rxml_input_string_get, 0);
+  rb_define_method(cXMLInput, "string=", rxml_input_string_set, 1);
+  rb_define_method(cXMLInput, "document", rxml_input_document_get, 0);
+  rb_define_method(cXMLInput, "document=", rxml_input_document_set, 1);
+  rb_define_method(cXMLInput, "io", rxml_input_io_get, 0);
+  rb_define_method(cXMLInput, "io=", rxml_input_io_set, 1);
 }

data/ext/libxml/ruby_xml_input.h

@@ -1,18 +1,20 @@
-/* $Id: ruby_xml_parser.h 39 2006-02-21 20:40:16Z roscopeco $ */
+/* $Id: rxml_parser.h 39 2006-02-21 20:40:16Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
-#ifndef __RUBY_XML_INPUT__
-#define __RUBY_XML_INPUT__
+#ifndef __rxml_INPUT__
+#define __rxml_INPUT__
 
 extern VALUE cXMLInput;
 
-void ruby_init_xml_input();
-
 extern ID ENCODING_ATTR;
 extern ID FILE_ATTR;
 extern ID STRING_ATTR;
 extern ID DOCUMENT_ATTR;
 extern ID IO_ATTR;
 
+void ruby_init_xml_input();
+int rxml_read_callback(void *context, char *buffer, int len);
+VALUE rxml_input_encoding_to_s(VALUE self, VALUE encoding);
+
 #endif

data/ext/libxml/ruby_xml_input_cbg.c

@@ -79,7 +79,7 @@ int ic_close (void *context) {
  * 
  * Register a new set of I/O callback for handling parser input.
  */
-VALUE input_callbacks_register_input_callbacks() {
+static VALUE input_callbacks_register_input_callbacks() {
     xmlRegisterInputCallbacks( ic_match, ic_open, ic_read, ic_close );
     return(Qtrue);
 }
@@ -91,7 +91,7 @@ VALUE input_callbacks_register_input_callbacks() {
  * 
  * No documentation available.
  */
-VALUE
+static VALUE
 input_callbacks_add_scheme (VALUE self, VALUE scheme_name, VALUE class) {
   ic_scheme *scheme;
 
@@ -124,7 +124,7 @@ input_callbacks_add_scheme (VALUE self, VALUE scheme_name, VALUE class) {
  * 
  * No documentation available.
  */
-VALUE
+static VALUE
 input_callbacks_remove_scheme (VALUE self, VALUE scheme_name) {
     char *name;
     ic_scheme *save_scheme, *scheme;

data/ext/libxml/ruby_xml_node.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node.c 560 2008-11-18 04:09:19Z cfis $ */
+/* $Id: ruby_xml_node.c 612 2008-11-21 08:01:29Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -34,8 +34,8 @@ check_string_or_symbol( VALUE val ) {
  * 
  * Obtain this node's base URI.
  */
-VALUE
-ruby_xml_node_base_get(VALUE self) {
+static VALUE
+rxml_node_base_get(VALUE self) {
   xmlNodePtr xnode;
   xmlChar* base_uri;            
   VALUE result = Qnil;
@@ -63,8 +63,8 @@ ruby_xml_node_base_get(VALUE self) {
  * 
  * Set this node's base URI.
  */
-VALUE
-ruby_xml_node_base_set(VALUE self, VALUE uri) {
+static VALUE
+rxml_node_base_set(VALUE self, VALUE uri) {
   xmlNodePtr xnode;
 
   Check_Type(uri, T_STRING);
@@ -83,8 +83,8 @@ ruby_xml_node_base_set(VALUE self, VALUE uri) {
  * 
  * Obtain this node's content as a string.
  */
-VALUE
-ruby_xml_node_content_get(VALUE self) {
+static VALUE
+rxml_node_content_get(VALUE self) {
   xmlNodePtr xnode;
   xmlChar *content;
   VALUE result = Qnil;
@@ -105,8 +105,8 @@ ruby_xml_node_content_get(VALUE self) {
  * 
  * Set this node's content to the specified string.
  */ 
-VALUE
-ruby_xml_node_content_set(VALUE self, VALUE content) {
+static VALUE
+rxml_node_content_set(VALUE self, VALUE content) {
   xmlNodePtr xnode;
 
   Check_Type(content, T_STRING);
@@ -126,8 +126,8 @@ ruby_xml_node_content_set(VALUE self, VALUE content) {
  * *Deprecated*: Stripped content can be obtained via the
  * +content+ method.
  */
-VALUE
-ruby_xml_node_content_stripped_get(VALUE self) {
+static VALUE
+rxml_node_content_stripped_get(VALUE self) {
   xmlNodePtr xnode;
   xmlChar* content;
   VALUE result = Qnil;
@@ -151,14 +151,14 @@ ruby_xml_node_content_stripped_get(VALUE self) {
  * 
  * Returns this node's first child node if any.
  */
-VALUE
-ruby_xml_node_first_get(VALUE self) {
+static VALUE
+rxml_node_first_get(VALUE self) {
   xmlNodePtr xnode;
 
   Data_Get_Struct(self, xmlNode, xnode);
 
   if (xnode->children)
-    return(ruby_xml_node2_wrap(cXMLNode, xnode->children));
+    return(rxml_node2_wrap(cXMLNode, xnode->children));
   else
     return(Qnil);
 }
@@ -168,8 +168,8 @@ ruby_xml_node_first_get(VALUE self) {
  * underlying for child_set and child_add, difference being
  * former raises on implicit copy, latter does not.
  */
-VALUE
-ruby_xml_node_child_set_aux(VALUE self, VALUE rnode) {
+static VALUE
+rxml_node_child_set_aux(VALUE self, VALUE rnode) {
   xmlNodePtr pnode, chld, ret;
 
   if (rb_obj_is_kind_of(rnode, cXMLNode) == Qfalse)
@@ -183,14 +183,14 @@ ruby_xml_node_child_set_aux(VALUE self, VALUE rnode) {
 
   ret = xmlAddChild(pnode, chld);
   if (ret == NULL) {
-    ruby_xml_raise(&xmlLastError);
+    rxml_raise(&xmlLastError);
   } else if ( ret==chld ) {
     /* child was added whole to parent and we need to return it as a new object */
-    return ruby_xml_node2_wrap(cXMLNode,chld);
+    return rxml_node2_wrap(cXMLNode,chld);
   }
   /* else */
   /* If it was a text node, then ret should be parent->last, so we will just return ret. */
-  return ruby_xml_node2_wrap(cXMLNode,ret);
+  return rxml_node2_wrap(cXMLNode,ret);
 }
 
 /*
@@ -199,9 +199,9 @@ ruby_xml_node_child_set_aux(VALUE self, VALUE rnode) {
  * 
  * Set a child node for this node. Also called for <<
  */
-VALUE
-ruby_xml_node_child_set(VALUE self, VALUE rnode) {
-  return ruby_xml_node_child_set_aux(self, rnode);
+static VALUE
+rxml_node_child_set(VALUE self, VALUE rnode) {
+  return rxml_node_child_set_aux(self, rnode);
 }
 
 
@@ -214,8 +214,8 @@ ruby_xml_node_child_set(VALUE self, VALUE rnode) {
  * added and not self, thereby allowing << calls to
  * be chained.
  */
-VALUE
-ruby_xml_node_content_add(VALUE self, VALUE obj) {
+static VALUE
+rxml_node_content_add(VALUE self, VALUE obj) {
   xmlNodePtr xnode;
   VALUE str;
 
@@ -225,7 +225,7 @@ ruby_xml_node_content_add(VALUE self, VALUE obj) {
    * danj 070827
    */
   if (rb_obj_is_kind_of(obj, cXMLNode)) {
-    ruby_xml_node_child_set(self, obj);
+    rxml_node_child_set(self, obj);
   } else {
     str = rb_obj_as_string(obj);
     if (NIL_P(str) || TYPE(str) != T_STRING)
@@ -242,9 +242,9 @@ ruby_xml_node_content_add(VALUE self, VALUE obj) {
  * 
  * Set a child node for this node.
  */
-VALUE
-ruby_xml_node_child_add(VALUE self, VALUE rnode) {
-  return ruby_xml_node_child_set_aux(self, rnode);
+static VALUE
+rxml_node_child_add(VALUE self, VALUE rnode) {
+  return rxml_node_child_set_aux(self, rnode);
 }
 
 /*
@@ -253,8 +253,8 @@ ruby_xml_node_child_add(VALUE self, VALUE rnode) {
  * 
  * Obtain the XML::Document this node belongs to.
  */
-VALUE
-ruby_xml_node_doc(VALUE self) {
+static VALUE
+rxml_node_doc(VALUE self) {
   xmlNodePtr xnode;
   xmlDocPtr doc=NULL;
 
@@ -298,8 +298,8 @@ ruby_xml_node_doc(VALUE self) {
  * 
  * Dump this node to stdout.
  */
-VALUE
-ruby_xml_node_dump(VALUE self) {
+static VALUE
+rxml_node_dump(VALUE self) {
   xmlNodePtr xnode;
   xmlBufferPtr buf;
 
@@ -323,8 +323,8 @@ ruby_xml_node_dump(VALUE self) {
  * Dump this node to stdout, including any debugging
  * information.
  */
-VALUE
-ruby_xml_node_debug_dump(VALUE self) {
+static VALUE
+rxml_node_debug_dump(VALUE self) {
   xmlNodePtr xnode;
   Data_Get_Struct(self, xmlNode, xnode);
 
@@ -346,8 +346,8 @@ ruby_xml_node_debug_dump(VALUE self) {
  *  doc = XML::Document.new('model/books.xml')
  *  doc.root.each {|node| puts node}
  */
-VALUE
-ruby_xml_node_each(VALUE self) {
+static VALUE
+rxml_node_each(VALUE self) {
   xmlNodePtr xnode;
   xmlNodePtr xchild;
   Data_Get_Struct(self, xmlNode, xnode);
@@ -355,7 +355,7 @@ ruby_xml_node_each(VALUE self) {
   xchild = xnode->children;
   
   while (xchild) {
-    rb_yield(ruby_xml_node2_wrap(cXMLNode, xchild));
+    rb_yield(rxml_node2_wrap(cXMLNode, xchild));
     xchild = xchild->next;
   }
   return Qnil;
@@ -368,8 +368,8 @@ ruby_xml_node_each(VALUE self) {
  * 
  * Determine whether this node is empty.
  */
-VALUE
-ruby_xml_node_empty_q(VALUE self) {
+static VALUE
+rxml_node_empty_q(VALUE self) {
   xmlNodePtr xnode;
   Data_Get_Struct(self, xmlNode, xnode);
   if (xnode == NULL)
@@ -379,7 +379,7 @@ ruby_xml_node_empty_q(VALUE self) {
 }
 
 
-VALUE ruby_xml_node_to_s(VALUE self);
+static VALUE rxml_node_to_s(VALUE self);
 
 /*
  * call-seq:
@@ -387,8 +387,8 @@ VALUE ruby_xml_node_to_s(VALUE self);
  * 
  * Test equality between the two nodes. Two nodes are equal
  * if they are the same node or have the same XML representation.*/
-VALUE
-ruby_xml_node_eql_q(VALUE self, VALUE other) {
+static VALUE
+rxml_node_eql_q(VALUE self, VALUE other) {
   if (self == other)
   {
     return Qtrue;
@@ -405,8 +405,8 @@ ruby_xml_node_eql_q(VALUE self, VALUE other) {
     if (rb_obj_is_kind_of(other, cXMLNode) == Qfalse)
       rb_raise(rb_eTypeError, "Nodes can only be compared against other nodes");
     
-    self_xml = ruby_xml_node_to_s(self);
-    other_xml = ruby_xml_node_to_s(other);
+    self_xml = rxml_node_to_s(self);
+    other_xml = rxml_node_to_s(other);
     return(rb_funcall(self_xml, rb_intern("=="), 1, other_xml));
   }    
 }
@@ -418,8 +418,8 @@ ruby_xml_node_eql_q(VALUE self, VALUE other) {
  * Create a new #CDATA node, optionally setting
  * the node's content.
  */
-VALUE
-ruby_xml_node_new_cdata(int argc, VALUE *argv, VALUE class) {
+static VALUE
+rxml_node_new_cdata(int argc, VALUE *argv, VALUE class) {
   xmlNodePtr xnode;
   VALUE str=Qnil;
 
@@ -436,7 +436,7 @@ ruby_xml_node_new_cdata(int argc, VALUE *argv, VALUE class) {
     if (xnode == NULL)
       return(Qnil);
       
-    return ruby_xml_node2_wrap(class,xnode);
+    return rxml_node2_wrap(class,xnode);
 
   default:
     rb_raise(rb_eArgError, "wrong number of arguments (1)");
@@ -455,8 +455,8 @@ ruby_xml_node_new_cdata(int argc, VALUE *argv, VALUE class) {
  * the node's content.
  * 
  */
-VALUE
-ruby_xml_node_new_comment(int argc, VALUE *argv, VALUE class) {
+static VALUE
+rxml_node_new_comment(int argc, VALUE *argv, VALUE class) {
   xmlNodePtr xnode;
   VALUE str=Qnil;
 
@@ -474,7 +474,7 @@ ruby_xml_node_new_comment(int argc, VALUE *argv, VALUE class) {
     if (xnode == NULL)
       return(Qnil);
 
-    return ruby_xml_node2_wrap(class,xnode);
+    return rxml_node2_wrap(class,xnode);
 
   default:
     rb_raise(rb_eArgError, "wrong number of arguments (1)");
@@ -492,8 +492,8 @@ ruby_xml_node_new_comment(int argc, VALUE *argv, VALUE class) {
  * Obtain the language set for this node, if any.
  * This is set in XML via the xml:lang attribute.
  */
-VALUE
-ruby_xml_node_lang_get(VALUE self) {
+static VALUE
+rxml_node_lang_get(VALUE self) {
   xmlNodePtr xnode;
   xmlChar *lang;
   VALUE result = Qnil;
@@ -519,8 +519,8 @@ ruby_xml_node_lang_get(VALUE self) {
  * Set the language for this node. This affects the value
  * of the xml:lang attribute.
  */
-VALUE
-ruby_xml_node_lang_set(VALUE self, VALUE lang) {
+static VALUE
+rxml_node_lang_set(VALUE self, VALUE lang) {
   xmlNodePtr xnode;
 
   Check_Type(lang, T_STRING);
@@ -537,14 +537,14 @@ ruby_xml_node_lang_set(VALUE self, VALUE lang) {
  * 
  * Obtain the last child node of this node, if any.
  */
-VALUE
-ruby_xml_node_last_get(VALUE self) {
+static VALUE
+rxml_node_last_get(VALUE self) {
   xmlNodePtr xnode;
 
   Data_Get_Struct(self, xmlNode, xnode);
 
   if (xnode->last)
-    return(ruby_xml_node2_wrap(cXMLNode, xnode->last));
+    return(rxml_node2_wrap(cXMLNode, xnode->last));
   else
     return(Qnil);
 }
@@ -557,8 +557,8 @@ ruby_xml_node_last_get(VALUE self) {
  * node was read from. If +default_line_numbers+ is set
  * false (the default), this method returns zero.
  */
-VALUE
-ruby_xml_node_line_num(VALUE self) {
+static VALUE
+rxml_node_line_num(VALUE self) {
   xmlNodePtr xnode;
   long line_num;
   Data_Get_Struct(self, xmlNode, xnode);
@@ -580,8 +580,8 @@ ruby_xml_node_line_num(VALUE self) {
  * 
  * Determine whether this node is an xlink node.
  */
-VALUE
-ruby_xml_node_xlink_q(VALUE self) {
+static VALUE
+rxml_node_xlink_q(VALUE self) {
   xmlNodePtr xnode;
   xlinkType xlt;
 
@@ -603,8 +603,8 @@ ruby_xml_node_xlink_q(VALUE self) {
  * If this is not an xlink node (see +xlink?+), will return
  * nil.
  */
-VALUE
-ruby_xml_node_xlink_type(VALUE self) {
+static VALUE
+rxml_node_xlink_type(VALUE self) {
   xmlNodePtr xnode;
   xlinkType xlt;
 
@@ -626,8 +626,8 @@ ruby_xml_node_xlink_type(VALUE self) {
  * If this is not an xlink node (see +xlink?+), will return
  * nil.
  */
-VALUE
-ruby_xml_node_xlink_type_name(VALUE self) {
+static VALUE
+rxml_node_xlink_type_name(VALUE self) {
   xmlNodePtr xnode;
   xlinkType xlt;
 
@@ -654,8 +654,8 @@ ruby_xml_node_xlink_type_name(VALUE self) {
  * 
  * Obtain this node's name.
  */
-VALUE
-ruby_xml_node_name_get(VALUE self) {
+static VALUE
+rxml_node_name_get(VALUE self) {
   xmlNodePtr xnode;
   const xmlChar *name;
 
@@ -702,8 +702,8 @@ ruby_xml_node_name_get(VALUE self) {
  * 
  * Set this node's name.
  */
-VALUE
-ruby_xml_node_name_set(VALUE self, VALUE name) {
+static VALUE
+rxml_node_name_set(VALUE self, VALUE name) {
   xmlNodePtr xnode;
 
   Check_Type(name, T_STRING);
@@ -720,8 +720,8 @@ ruby_xml_node_name_set(VALUE self, VALUE name) {
  * Obtain an array of +XML::NS+ objects representing
  * this node's xmlns attributes
  */
-VALUE
-ruby_xml_node_namespace_get(VALUE self) {
+static VALUE
+rxml_node_namespace_get(VALUE self) {
   xmlNodePtr xnode;
   xmlNsPtr *nsList, *cur;
   VALUE arr, ns;
@@ -737,7 +737,7 @@ ruby_xml_node_namespace_get(VALUE self) {
 
   arr = rb_ary_new();
   for (cur = nsList; *cur != NULL; cur++) {
-    ns = ruby_xml_ns_wrap(*cur);
+    ns = rxml_ns_wrap(*cur);
     if (ns == Qnil)
       continue;
     else
@@ -755,15 +755,15 @@ ruby_xml_node_namespace_get(VALUE self) {
  * 
  * Obtain this node's namespace node.
  */
-VALUE
-ruby_xml_node_namespace_get_node(VALUE self) {
+static VALUE
+rxml_node_namespace_get_node(VALUE self) {
   xmlNodePtr xnode;
 
   Data_Get_Struct(self, xmlNode, xnode);
   if (xnode->ns == NULL)
     return(Qnil);
   else
-    return ruby_xml_ns_wrap(xnode->ns);
+    return rxml_ns_wrap(xnode->ns);
 }
 
 // TODO namespace_set can take varargs (in fact, must if used
@@ -779,8 +779,8 @@ ruby_xml_node_namespace_get_node(VALUE self) {
  * 
  * Add the specified XML::NS object to this node's xmlns attributes.
  */
-VALUE
-ruby_xml_node_namespace_set(int argc, VALUE *argv, VALUE self) {
+static VALUE
+rxml_node_namespace_set(int argc, VALUE *argv, VALUE self) {
   VALUE rns, rprefix;
   xmlNodePtr xnode;
   xmlNsPtr xns;
@@ -818,9 +818,9 @@ ruby_xml_node_namespace_set(int argc, VALUE *argv, VALUE self) {
 
     xns = xmlNewNs(xnode, (xmlChar*)href, (xmlChar*)StringValuePtr(rprefix));
     if (xns == NULL)
-      ruby_xml_raise(&xmlLastError);
+      rxml_raise(&xmlLastError);
     else
-      return ruby_xml_ns_wrap(xns);
+      return rxml_ns_wrap(xns);
     break;
 
   default:
@@ -844,7 +844,7 @@ ruby_xml_node_namespace_set(int argc, VALUE *argv, VALUE self) {
  * If the xmlNode has no parent or document, then call xmlFree.
  */
 void
-ruby_xml_node2_free(xmlNodePtr xnode) {
+rxml_node2_free(xmlNodePtr xnode) {
 
   if (xnode != NULL) {
     xnode->_private=NULL;
@@ -856,7 +856,7 @@ ruby_xml_node2_free(xmlNodePtr xnode) {
 }
 
 void
-ruby_xml_node_mark_common(xmlNodePtr xnode) {
+rxml_node_mark_common(xmlNodePtr xnode) {
   if (xnode->parent == NULL ) {
 #ifdef NODE_DEBUG
     fprintf(stderr,"mark no parent r=0x%x *n=0x%x\n",rxn,node);
@@ -880,7 +880,7 @@ ruby_xml_node_mark_common(xmlNodePtr xnode) {
 }
 
 void
-ruby_xml_node2_mark(xmlNodePtr xnode) {
+rxml_node2_mark(xmlNodePtr xnode) {
   if (xnode == NULL ) return;
 
   if (xnode->_private == NULL ) {
@@ -889,11 +889,11 @@ ruby_xml_node2_mark(xmlNodePtr xnode) {
     return;
   }
 
-  ruby_xml_node_mark_common(xnode);
+  rxml_node_mark_common(xnode);
 }
 
 VALUE
-ruby_xml_node2_wrap(VALUE class, xmlNodePtr xnode)
+rxml_node2_wrap(VALUE class, xmlNodePtr xnode)
 {
   VALUE obj;
 
@@ -903,7 +903,7 @@ ruby_xml_node2_wrap(VALUE class, xmlNodePtr xnode)
   }
 
   obj=Data_Wrap_Struct(class,
-                       ruby_xml_node2_mark, ruby_xml_node2_free,
+                       rxml_node2_mark, rxml_node2_free,
                        xnode);
 
   xnode->_private=(void*)obj;
@@ -917,8 +917,8 @@ ruby_xml_node2_wrap(VALUE class, xmlNodePtr xnode)
  * Create a new element node in the specified namespace with the 
  * supplied name and content.
  */
-VALUE
-ruby_xml_node_new_string(VALUE klass, VALUE ns, VALUE name, VALUE val)
+static VALUE
+rxml_node_new_string(VALUE klass, VALUE ns, VALUE name, VALUE val)
 {
   xmlNodePtr xnode;
   xmlNsPtr xns = NULL;
@@ -931,7 +931,7 @@ ruby_xml_node_new_string(VALUE klass, VALUE ns, VALUE name, VALUE val)
   xnode = xmlNewNode(xns,(xmlChar*)StringValuePtr(name));
   xnode->_private=NULL;
 
-  node = ruby_xml_node2_wrap(klass, xnode);
+  node = rxml_node2_wrap(klass, xnode);
   rb_obj_call_init(node, 0, NULL);
   
   if (!NIL_P(val))
@@ -939,7 +939,7 @@ ruby_xml_node_new_string(VALUE klass, VALUE ns, VALUE name, VALUE val)
     if (TYPE(val) != T_STRING)
       val = rb_obj_as_string(val);
 
-    ruby_xml_node_content_set(node, val);
+    rxml_node_content_set(node, val);
   }
   return node;
 }
@@ -953,8 +953,8 @@ ruby_xml_node_new_string(VALUE klass, VALUE ns, VALUE name, VALUE val)
  * the node's content.
  * backward compatibility for <.5 new
  */
-VALUE
-ruby_xml_node_new_string_bc(int argc, VALUE *argv, VALUE class)
+static VALUE
+rxml_node_new_string_bc(int argc, VALUE *argv, VALUE class)
 {
   VALUE content=Qnil;
   VALUE name=Qnil;
@@ -966,7 +966,7 @@ ruby_xml_node_new_string_bc(int argc, VALUE *argv, VALUE class)
     
   case 1:
     name=check_string_or_symbol( argv[0] );
-    return ruby_xml_node_new_string(class,Qnil,name,content);
+    return rxml_node_new_string(class,Qnil,name,content);
 
   default:
     rb_raise(rb_eArgError, "wrong number of arguments (1 or 2) given %d",argc);
@@ -979,14 +979,14 @@ ruby_xml_node_new_string_bc(int argc, VALUE *argv, VALUE class)
  * 
  * Obtain the next sibling node, if any.
  */
-VALUE
-ruby_xml_node_next_get(VALUE self) {
+static VALUE
+rxml_node_next_get(VALUE self) {
   xmlNodePtr xnode;
 
   Data_Get_Struct(self, xmlNode, xnode);
 
   if (xnode->next)
-    return(ruby_xml_node2_wrap(cXMLNode, xnode->next));
+    return(rxml_node2_wrap(cXMLNode, xnode->next));
   else
     return(Qnil);
 }
@@ -998,8 +998,8 @@ ruby_xml_node_next_get(VALUE self) {
  * 
  * Insert the specified node as this node's next sibling.
  */
-VALUE
-ruby_xml_node_next_set(VALUE self, VALUE rnode) {
+static VALUE
+rxml_node_next_set(VALUE self, VALUE rnode) {
   xmlNodePtr cnode, pnode, ret;
 
   if (rb_obj_is_kind_of(rnode, cXMLNode) == Qfalse)
@@ -1010,9 +1010,9 @@ ruby_xml_node_next_set(VALUE self, VALUE rnode) {
 
   ret = xmlAddNextSibling(pnode, cnode);
   if (ret == NULL)
-    ruby_xml_raise(&xmlLastError);
+    rxml_raise(&xmlLastError);
 
-  return(ruby_xml_node2_wrap(cXMLNode, ret));
+  return(rxml_node2_wrap(cXMLNode, ret));
 }
 
 
@@ -1022,8 +1022,8 @@ ruby_xml_node_next_set(VALUE self, VALUE rnode) {
  * 
  * Determine whether this node has a namespace.
  */
-VALUE
-ruby_xml_node_ns_q(VALUE self) {
+static VALUE
+rxml_node_ns_q(VALUE self) {
   xmlNodePtr xnode;
   Data_Get_Struct(self, xmlNode, xnode);
   if (xnode->ns == NULL)
@@ -1039,8 +1039,8 @@ ruby_xml_node_ns_q(VALUE self) {
  * Obtain an array of +XML::NS+ objects representing
  * this node's xmlns attributes
  */
-VALUE
-ruby_xml_node_ns_def_q(VALUE self) {
+static VALUE
+rxml_node_ns_def_q(VALUE self) {
   xmlNodePtr xnode;
   Data_Get_Struct(self, xmlNode, xnode);
   if (xnode->nsDef == NULL)
@@ -1056,14 +1056,14 @@ ruby_xml_node_ns_def_q(VALUE self) {
  * 
  * Obtain this node's default namespace.
  */
-VALUE
-ruby_xml_node_ns_def_get(VALUE self) {
+static VALUE
+rxml_node_ns_def_get(VALUE self) {
   xmlNodePtr xnode;
   Data_Get_Struct(self, xmlNode, xnode);
   if (xnode->nsDef == NULL)
     return(Qnil);
   else
-    return(ruby_xml_ns_wrap(xnode->nsDef));
+    return(rxml_ns_wrap(xnode->nsDef));
 }
 
 
@@ -1073,14 +1073,14 @@ ruby_xml_node_ns_def_get(VALUE self) {
  * 
  * Obtain this node's parent node, if any.
  */
-VALUE
-ruby_xml_node_parent_get(VALUE self) {
+static VALUE
+rxml_node_parent_get(VALUE self) {
   xmlNodePtr xnode;
 
   Data_Get_Struct(self, xmlNode, xnode);
 
   if (xnode->parent)
-    return(ruby_xml_node2_wrap(cXMLNode, xnode->parent));
+    return(rxml_node2_wrap(cXMLNode, xnode->parent));
   else
     return(Qnil);
 }
@@ -1092,8 +1092,8 @@ ruby_xml_node_parent_get(VALUE self) {
  * 
  * Obtain this node's path.
  */
-VALUE
-ruby_xml_node_path(VALUE self) {
+static VALUE
+rxml_node_path(VALUE self) {
   xmlNodePtr xnode;
   xmlChar *path;
 
@@ -1113,9 +1113,9 @@ ruby_xml_node_path(VALUE self) {
  * 
  * Evaluates an XPointer expression relative to this node.
  */
-VALUE
-ruby_xml_node_pointer(VALUE self, VALUE xptr_str) {
-  return(ruby_xml_xpointer_point2(self, xptr_str));
+static VALUE
+rxml_node_pointer(VALUE self, VALUE xptr_str) {
+  return(rxml_xpointer_point2(self, xptr_str));
 }
 
 
@@ -1125,8 +1125,8 @@ ruby_xml_node_pointer(VALUE self, VALUE xptr_str) {
  * 
  * Obtain the previous sibling, if any.
  */
-VALUE
-ruby_xml_node_prev_get(VALUE self) {
+static VALUE
+rxml_node_prev_get(VALUE self) {
   xmlNodePtr xnode;
   xmlNodePtr node;
   Data_Get_Struct(self, xmlNode, xnode);
@@ -1154,7 +1154,7 @@ ruby_xml_node_prev_get(VALUE self) {
   if (node == NULL)
     return(Qnil);
   else
-    return(ruby_xml_node2_wrap(cXMLNode, node));
+    return(rxml_node2_wrap(cXMLNode, node));
 }
 
 
@@ -1164,8 +1164,8 @@ ruby_xml_node_prev_get(VALUE self) {
  * 
  * Insert the specified node as this node's previous sibling.
  */
-VALUE
-ruby_xml_node_prev_set(VALUE self, VALUE rnode) {
+static VALUE
+rxml_node_prev_set(VALUE self, VALUE rnode) {
   xmlNodePtr cnode, pnode, ret;
 
   if (rb_obj_is_kind_of(rnode, cXMLNode) == Qfalse)
@@ -1176,9 +1176,9 @@ ruby_xml_node_prev_set(VALUE self, VALUE rnode) {
 
   ret = xmlAddPrevSibling(pnode, cnode);
   if (ret == NULL)
-    ruby_xml_raise(&xmlLastError);
+    rxml_raise(&xmlLastError);
 
-  return(ruby_xml_node2_wrap(cXMLNode, ret));
+  return(rxml_node2_wrap(cXMLNode, ret));
 }
 
 /*
@@ -1187,12 +1187,12 @@ ruby_xml_node_prev_set(VALUE self, VALUE rnode) {
  * 
  * Returns the XML::Attributes for this node. 
  */
-VALUE
-ruby_xml_node_attributes_get(VALUE self) {
+static VALUE
+rxml_node_attributes_get(VALUE self) {
   xmlNodePtr xnode;
 
   Data_Get_Struct(self, xmlNode, xnode);
-  return ruby_xml_attributes_new(xnode);
+  return rxml_attributes_new(xnode);
 }
 
 /*
@@ -1202,10 +1202,10 @@ ruby_xml_node_attributes_get(VALUE self) {
  * 
  * Obtain the named pyroperty.
  */
-VALUE
-ruby_xml_node_attribute_get(VALUE self, VALUE name) {
-  VALUE attributes = ruby_xml_node_attributes_get(self);
-  return ruby_xml_attributes_attribute_get(attributes, name);
+static VALUE
+rxml_node_attribute_get(VALUE self, VALUE name) {
+  VALUE attributes = rxml_node_attributes_get(self);
+  return rxml_attributes_attribute_get(attributes, name);
 }
 
 /*
@@ -1214,10 +1214,10 @@ ruby_xml_node_attribute_get(VALUE self, VALUE name) {
  * 
  * Set the named property.
  */
-VALUE
-ruby_xml_node_property_set(VALUE self, VALUE name, VALUE value) {
-  VALUE attributes = ruby_xml_node_attributes_get(self);
-  return ruby_xml_attributes_attribute_set(attributes, name, value);
+static VALUE
+rxml_node_property_set(VALUE self, VALUE name, VALUE value) {
+  VALUE attributes = rxml_node_attributes_get(self);
+  return rxml_attributes_attribute_set(attributes, name, value);
 }
 
 
@@ -1227,8 +1227,8 @@ ruby_xml_node_property_set(VALUE self, VALUE name, VALUE value) {
 *
 * Removes this node from it's parent.
 */
-VALUE
-ruby_xml_node_remove_ex(VALUE self) {
+static VALUE
+rxml_node_remove_ex(VALUE self) {
   xmlNodePtr xnode;
   Data_Get_Struct(self, xmlNode, xnode);
   xmlUnlinkNode(xnode);
@@ -1242,13 +1242,13 @@ ruby_xml_node_remove_ex(VALUE self) {
  * 
  * Search for a namespace by href.
  */
-VALUE
-ruby_xml_node_search_href(VALUE self, VALUE href) {
+static VALUE
+rxml_node_search_href(VALUE self, VALUE href) {
   xmlNodePtr xnode;
 
   Check_Type(href, T_STRING);
   Data_Get_Struct(self, xmlNode, xnode);
-  return(ruby_xml_ns_wrap(xmlSearchNsByHref(xnode->doc, xnode,
+  return(rxml_ns_wrap(xmlSearchNsByHref(xnode->doc, xnode,
 					    (xmlChar*)StringValuePtr(href))));
 }
 
@@ -1259,13 +1259,13 @@ ruby_xml_node_search_href(VALUE self, VALUE href) {
  * 
  * Search for a namespace by namespace.
  */
-VALUE
-ruby_xml_node_search_ns(VALUE self, VALUE ns) {
+static VALUE
+rxml_node_search_ns(VALUE self, VALUE ns) {
   xmlNodePtr xnode;
 
   Check_Type(ns, T_STRING);
   Data_Get_Struct(self, xmlNode, xnode);
-  return(ruby_xml_ns_wrap(xmlSearchNs(xnode->doc, xnode,
+  return(rxml_ns_wrap(xmlSearchNs(xnode->doc, xnode,
 			              (xmlChar*)StringValuePtr(ns))));
 }
 
@@ -1276,8 +1276,8 @@ ruby_xml_node_search_ns(VALUE self, VALUE ns) {
  * 
  * Add the specified node as a sibling of this node.
  */
-VALUE
-ruby_xml_node_sibling_set(VALUE self, VALUE rnode) {
+static VALUE
+rxml_node_sibling_set(VALUE self, VALUE rnode) {
   xmlNodePtr cnode, pnode, ret;
   VALUE obj;
 
@@ -1289,10 +1289,10 @@ ruby_xml_node_sibling_set(VALUE self, VALUE rnode) {
 
   ret = xmlAddSibling(pnode, cnode);
   if (ret == NULL)
-    ruby_xml_raise(&xmlLastError);
+    rxml_raise(&xmlLastError);
 
   if (ret->_private==NULL)
-    obj=ruby_xml_node2_wrap(cXMLNode,ret);
+    obj=rxml_node2_wrap(cXMLNode,ret);
   else
     obj=(VALUE)ret->_private;
 
@@ -1306,8 +1306,8 @@ ruby_xml_node_sibling_set(VALUE self, VALUE rnode) {
  * 
  * Determine whether this node preserves whitespace.
  */
-VALUE
-ruby_xml_node_space_preserve_get(VALUE self) {
+static VALUE
+rxml_node_space_preserve_get(VALUE self) {
   xmlNodePtr xnode;
 
   Data_Get_Struct(self, xmlNode, xnode);
@@ -1321,8 +1321,8 @@ ruby_xml_node_space_preserve_get(VALUE self) {
  * 
  * Control whether this node preserves whitespace.
  */
-VALUE
-ruby_xml_node_space_preserve_set(VALUE self, VALUE bool) {
+static VALUE
+rxml_node_space_preserve_set(VALUE self, VALUE bool) {
   xmlNodePtr xnode;
   Data_Get_Struct(self, xmlNode, xnode);
 
@@ -1341,8 +1341,8 @@ ruby_xml_node_space_preserve_set(VALUE self, VALUE bool) {
  * Coerce this node to a string representation of
  * it's XML.
  */
-VALUE
-ruby_xml_node_to_s(VALUE self) {
+static VALUE
+rxml_node_to_s(VALUE self) {
   xmlNodePtr xnode;
   xmlBufferPtr buf;
   VALUE result;
@@ -1363,8 +1363,8 @@ ruby_xml_node_to_s(VALUE self) {
  * 
  * Obtain this node's type identifier.
  */
-VALUE
-ruby_xml_node_type(VALUE self) {
+static VALUE
+rxml_node_type(VALUE self) {
   xmlNodePtr xnode;
   Data_Get_Struct(self, xmlNode, xnode);
   return(INT2NUM(xnode->type));
@@ -1383,8 +1383,8 @@ ruby_xml_node_type(VALUE self) {
  * to true. 
  *
  */
-VALUE
-ruby_xml_node_copy(VALUE self, VALUE deep) {
+static VALUE
+rxml_node_copy(VALUE self, VALUE deep) {
   xmlNodePtr xnode;
   xmlNodePtr xcopy;
   int recursive = (deep==Qnil || deep==Qfalse) ? 0 : 1;
@@ -1393,7 +1393,7 @@ ruby_xml_node_copy(VALUE self, VALUE deep) {
   xcopy = xmlCopyNode(xnode, recursive);
 
   if (xcopy)
-    return ruby_xml_node2_wrap(cXMLNode, xcopy);
+    return rxml_node2_wrap(cXMLNode, xcopy);
   else
     return Qnil;
 }
@@ -1406,8 +1406,8 @@ ruby_xml_node_copy(VALUE self, VALUE deep) {
  * the node's content.
  * 
  */
-VALUE
-ruby_xml_node_new_text(VALUE class, VALUE text)
+static VALUE
+rxml_node_new_text(VALUE class, VALUE text)
 {
   VALUE obj;
   xmlNodePtr xnode;
@@ -1422,19 +1422,19 @@ ruby_xml_node_new_text(VALUE class, VALUE text)
   if ( xnode == NULL )
     return Qnil;
   
-  obj=ruby_xml_node2_wrap(class,xnode);
+  obj=rxml_node2_wrap(class,xnode);
   rb_obj_call_init(obj,0,NULL);
   return obj;
 }
 
 void
-ruby_xml_node_registerNode(xmlNodePtr node)
+rxml_node_registerNode(xmlNodePtr node)
 {
   node->_private=NULL;
 }
 
 void
-ruby_xml_node_deregisterNode(xmlNodePtr xnode)
+rxml_node_deregisterNode(xmlNodePtr xnode)
 {
   VALUE node;
   
@@ -1451,8 +1451,8 @@ ruby_xml_node_deregisterNode(xmlNodePtr xnode)
 
 void
 ruby_init_xml_node(void) {
-  xmlRegisterNodeDefault(ruby_xml_node_registerNode);
-  xmlDeregisterNodeDefault(ruby_xml_node_deregisterNode);
+  xmlRegisterNodeDefault(rxml_node_registerNode);
+  xmlDeregisterNodeDefault(rxml_node_deregisterNode);
 
   cXMLNode = rb_define_class_under(mXML, "Node", rb_cObject);
   
@@ -1498,69 +1498,69 @@ ruby_init_xml_node(void) {
   rb_define_const(cXMLNode, "DOCB_DOCUMENT_NODE", Qnil);
 #endif
   
-  rb_define_singleton_method(cXMLNode, "new", ruby_xml_node_new_string_bc, -1);
-  rb_define_singleton_method(cXMLNode, "new_cdata", ruby_xml_node_new_cdata, -1);
-  rb_define_singleton_method(cXMLNode, "new_comment", ruby_xml_node_new_comment, -1); 
-  rb_define_singleton_method(cXMLNode, "new_text", ruby_xml_node_new_text, 1); 
+  rb_define_singleton_method(cXMLNode, "new", rxml_node_new_string_bc, -1);
+  rb_define_singleton_method(cXMLNode, "new_cdata", rxml_node_new_cdata, -1);
+  rb_define_singleton_method(cXMLNode, "new_comment", rxml_node_new_comment, -1); 
+  rb_define_singleton_method(cXMLNode, "new_text", rxml_node_new_text, 1); 
   
   /* Traversal */
   rb_include_module(cXMLNode, rb_mEnumerable);
-  rb_define_method(cXMLNode, "[]", ruby_xml_node_attribute_get, 1);
-  rb_define_method(cXMLNode, "each", ruby_xml_node_each, 0);
-  rb_define_method(cXMLNode, "first", ruby_xml_node_first_get, 0);
-  rb_define_method(cXMLNode, "last", ruby_xml_node_last_get, 0);
-  rb_define_method(cXMLNode, "next", ruby_xml_node_next_get, 0);
-  rb_define_method(cXMLNode, "parent", ruby_xml_node_parent_get, 0);
-  rb_define_method(cXMLNode, "prev", ruby_xml_node_prev_get, 0);
+  rb_define_method(cXMLNode, "[]", rxml_node_attribute_get, 1);
+  rb_define_method(cXMLNode, "each", rxml_node_each, 0);
+  rb_define_method(cXMLNode, "first", rxml_node_first_get, 0);
+  rb_define_method(cXMLNode, "last", rxml_node_last_get, 0);
+  rb_define_method(cXMLNode, "next", rxml_node_next_get, 0);
+  rb_define_method(cXMLNode, "parent", rxml_node_parent_get, 0);
+  rb_define_method(cXMLNode, "prev", rxml_node_prev_get, 0);
 
   /* Modification */
-  rb_define_method(cXMLNode, "<<", ruby_xml_node_content_add, 1);
-  rb_define_method(cXMLNode, "[]=", ruby_xml_node_property_set, 2);
-  rb_define_method(cXMLNode, "child_add", ruby_xml_node_child_add, 1);
-  rb_define_method(cXMLNode, "child=", ruby_xml_node_child_set, 1);
-  rb_define_method(cXMLNode, "sibling=", ruby_xml_node_sibling_set, 1);
-  rb_define_method(cXMLNode, "next=", ruby_xml_node_next_set, 1);
-  rb_define_method(cXMLNode, "prev=", ruby_xml_node_prev_set, 1);
+  rb_define_method(cXMLNode, "<<", rxml_node_content_add, 1);
+  rb_define_method(cXMLNode, "[]=", rxml_node_property_set, 2);
+  rb_define_method(cXMLNode, "child_add", rxml_node_child_add, 1);
+  rb_define_method(cXMLNode, "child=", rxml_node_child_set, 1);
+  rb_define_method(cXMLNode, "sibling=", rxml_node_sibling_set, 1);
+  rb_define_method(cXMLNode, "next=", rxml_node_next_set, 1);
+  rb_define_method(cXMLNode, "prev=", rxml_node_prev_set, 1);
 
  
   /* Rest of the node api */
-  rb_define_method(cXMLNode, "attributes", ruby_xml_node_attributes_get, 0);
-  rb_define_method(cXMLNode, "base", ruby_xml_node_base_get, 0);
-  rb_define_method(cXMLNode, "base=", ruby_xml_node_base_set, 1);
-  rb_define_method(cXMLNode, "blank?", ruby_xml_node_empty_q, 0);
-  rb_define_method(cXMLNode, "copy", ruby_xml_node_copy, 1);
-  rb_define_method(cXMLNode, "content", ruby_xml_node_content_get, 0);
-  rb_define_method(cXMLNode, "content=", ruby_xml_node_content_set, 1);
-  rb_define_method(cXMLNode, "content_stripped", ruby_xml_node_content_stripped_get, 0);
-  rb_define_method(cXMLNode, "doc", ruby_xml_node_doc, 0);
-  rb_define_method(cXMLNode, "dump", ruby_xml_node_dump, 0);
-  rb_define_method(cXMLNode, "debug_dump", ruby_xml_node_debug_dump, 0);
-  rb_define_method(cXMLNode, "empty?", ruby_xml_node_empty_q, 0);
-  rb_define_method(cXMLNode, "eql?", ruby_xml_node_eql_q, 1);
-  rb_define_method(cXMLNode, "lang", ruby_xml_node_lang_get, 0);
-  rb_define_method(cXMLNode, "lang=", ruby_xml_node_lang_set, 1);
-  rb_define_method(cXMLNode, "line_num", ruby_xml_node_line_num, 0);
-  rb_define_method(cXMLNode, "name", ruby_xml_node_name_get, 0);
-  rb_define_method(cXMLNode, "name=", ruby_xml_node_name_set, 1);
-  rb_define_method(cXMLNode, "namespace", ruby_xml_node_namespace_get, 0);
-  rb_define_method(cXMLNode, "namespace_node", ruby_xml_node_namespace_get_node, 0);
-  rb_define_method(cXMLNode, "namespace=", ruby_xml_node_namespace_set, -1);  
-  rb_define_method(cXMLNode, "node_type", ruby_xml_node_type, 0);
-  rb_define_method(cXMLNode, "ns", ruby_xml_node_namespace_get, 0);
-  rb_define_method(cXMLNode, "ns?", ruby_xml_node_ns_q, 0);
-  rb_define_method(cXMLNode, "ns_def?", ruby_xml_node_ns_def_q, 0);
-  rb_define_method(cXMLNode, "ns_def", ruby_xml_node_ns_def_get, 0);
-  rb_define_method(cXMLNode, "path", ruby_xml_node_path, 0);
-  rb_define_method(cXMLNode, "pointer", ruby_xml_node_pointer, 1);
-  rb_define_method(cXMLNode, "remove!", ruby_xml_node_remove_ex, 0);
-  rb_define_method(cXMLNode, "search_ns", ruby_xml_node_search_ns, 1);
-  rb_define_method(cXMLNode, "search_href", ruby_xml_node_search_href, 1);
-  rb_define_method(cXMLNode, "space_preserve", ruby_xml_node_space_preserve_get, 0);
-  rb_define_method(cXMLNode, "space_preserve=", ruby_xml_node_space_preserve_set, 1);
-  rb_define_method(cXMLNode, "to_s", ruby_xml_node_to_s, 0);
-  rb_define_method(cXMLNode, "xlink?", ruby_xml_node_xlink_q, 0);
-  rb_define_method(cXMLNode, "xlink_type", ruby_xml_node_xlink_type, 0);
-  rb_define_method(cXMLNode, "xlink_type_name", ruby_xml_node_xlink_type_name, 0);
+  rb_define_method(cXMLNode, "attributes", rxml_node_attributes_get, 0);
+  rb_define_method(cXMLNode, "base", rxml_node_base_get, 0);
+  rb_define_method(cXMLNode, "base=", rxml_node_base_set, 1);
+  rb_define_method(cXMLNode, "blank?", rxml_node_empty_q, 0);
+  rb_define_method(cXMLNode, "copy", rxml_node_copy, 1);
+  rb_define_method(cXMLNode, "content", rxml_node_content_get, 0);
+  rb_define_method(cXMLNode, "content=", rxml_node_content_set, 1);
+  rb_define_method(cXMLNode, "content_stripped", rxml_node_content_stripped_get, 0);
+  rb_define_method(cXMLNode, "doc", rxml_node_doc, 0);
+  rb_define_method(cXMLNode, "dump", rxml_node_dump, 0);
+  rb_define_method(cXMLNode, "debug_dump", rxml_node_debug_dump, 0);
+  rb_define_method(cXMLNode, "empty?", rxml_node_empty_q, 0);
+  rb_define_method(cXMLNode, "eql?", rxml_node_eql_q, 1);
+  rb_define_method(cXMLNode, "lang", rxml_node_lang_get, 0);
+  rb_define_method(cXMLNode, "lang=", rxml_node_lang_set, 1);
+  rb_define_method(cXMLNode, "line_num", rxml_node_line_num, 0);
+  rb_define_method(cXMLNode, "name", rxml_node_name_get, 0);
+  rb_define_method(cXMLNode, "name=", rxml_node_name_set, 1);
+  rb_define_method(cXMLNode, "namespace", rxml_node_namespace_get, 0);
+  rb_define_method(cXMLNode, "namespace_node", rxml_node_namespace_get_node, 0);
+  rb_define_method(cXMLNode, "namespace=", rxml_node_namespace_set, -1);  
+  rb_define_method(cXMLNode, "node_type", rxml_node_type, 0);
+  rb_define_method(cXMLNode, "ns", rxml_node_namespace_get, 0);
+  rb_define_method(cXMLNode, "ns?", rxml_node_ns_q, 0);
+  rb_define_method(cXMLNode, "ns_def?", rxml_node_ns_def_q, 0);
+  rb_define_method(cXMLNode, "ns_def", rxml_node_ns_def_get, 0);
+  rb_define_method(cXMLNode, "path", rxml_node_path, 0);
+  rb_define_method(cXMLNode, "pointer", rxml_node_pointer, 1);
+  rb_define_method(cXMLNode, "remove!", rxml_node_remove_ex, 0);
+  rb_define_method(cXMLNode, "search_ns", rxml_node_search_ns, 1);
+  rb_define_method(cXMLNode, "search_href", rxml_node_search_href, 1);
+  rb_define_method(cXMLNode, "space_preserve", rxml_node_space_preserve_get, 0);
+  rb_define_method(cXMLNode, "space_preserve=", rxml_node_space_preserve_set, 1);
+  rb_define_method(cXMLNode, "to_s", rxml_node_to_s, 0);
+  rb_define_method(cXMLNode, "xlink?", rxml_node_xlink_q, 0);
+  rb_define_method(cXMLNode, "xlink_type", rxml_node_xlink_type, 0);
+  rb_define_method(cXMLNode, "xlink_type_name", rxml_node_xlink_type_name, 0);
 
   rb_define_alias(cXMLNode, "==", "eql?");
 }