libxml-ruby 0.3.8.4 → 0.5.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+===== 14.1.2007 Laurent Sansonetti <lrz at chopine.be>
+* Added some preliminary RDoc comments for XML::Reader.
+
+===== 5.12.2006 Laurent Sansonetti <lrz at chopine.be>
+* Added XML::Reader, a set of bindings to the xmlTextReader API.
+
 ===== 15.4.2006 Ross Bamford <rosco at roscopeco.co.uk>
 * Implemented SAX parser callback handling
 

data/LICENSE

@@ -1,4 +1,4 @@
-# $Id: LICENSE,v 1.3 2006/02/28 09:57:52 roscopeco Exp $
+# $Id: LICENSE 42 2006-02-28 09:57:52Z roscopeco $
 
  Copyright (c) 2002-2006 Sean Chittenden <sean@chittenden.org> and contributors
  Copyright (c) 2001 Wai-Sun "Squidster" Chia <waisun.chia@compaq.com>

data/README

@@ -141,4 +141,4 @@ And your terminal should look like:
 
 If you have any questions, please send email to libxml-devel@rubyforge.org.
 
-# $Id: README,v 1.6 2006/08/15 13:49:53 roscopeco Exp $
+# $Id: README 83 2006-08-15 13:49:53Z roscopeco $

data/Rakefile

@@ -119,15 +119,18 @@ end
 # Used during release packaging if a REL is supplied
 task :update_version do
   unless PKG_VERSION == CURRENT_VERSION
+    pkg_vernum = PKG_VERSION.tr('.','').sub(/^0*/,'')
+    pkg_vernum << '0' until pkg_vernum.length > 2
+    
     File.open('ext/xml/libxml.h.new','w+') do |f|      
     maj, min, mic, patch = /(\d+)\.(\d+)(?:\.(\d+))?(?:\.(\d+))?/.match(PKG_VERSION).captures
       f << File.read('ext/xml/libxml.h').
            gsub(/RUBY_LIBXML_VERSION\s+"(\d.+)"/) { "RUBY_LIBXML_VERSION  \"#{PKG_VERSION}\"" }.
-           gsub(/RUBY_LIBXML_VERNUM\s+\d+/) { "RUBY_LIBXML_VERNUM   #{PKG_VERSION.tr('.','').sub(/^0*/,'')}" }.
-           gsub(/RUBY_LIBXML_VER_MAJ\s+\d+/) { "RUBY_LIBXML_VER_MAJ     #{maj}" }.
-           gsub(/RUBY_LIBXML_VER_MIN\s+\d+/) { "RUBY_LIBXML_VER_MIN     #{min}" }.
-           gsub(/RUBY_LIBXML_VER_MIC\s+\d+/) { "RUBY_LIBXML_VER_MIC     #{mic || 0}" }. 
-           gsub(/RUBY_LIBXML_VER_PATCH\s+\d+/) { "RUBY_LIBXML_VER_PATCH   #{patch || 0}" }           
+           gsub(/RUBY_LIBXML_VERNUM\s+\d+/) { "RUBY_LIBXML_VERNUM   #{pkg_vernum}" }.
+           gsub(/RUBY_LIBXML_VER_MAJ\s+\d+/) { "RUBY_LIBXML_VER_MAJ   #{maj}" }.
+           gsub(/RUBY_LIBXML_VER_MIN\s+\d+/) { "RUBY_LIBXML_VER_MIN   #{min}" }.
+           gsub(/RUBY_LIBXML_VER_MIC\s+\d+/) { "RUBY_LIBXML_VER_MIC   #{mic || 0}" }.
+           gsub(/RUBY_LIBXML_VER_PATCH\s+\d+/) { "RUBY_LIBXML_VER_PATCH #{patch || 0}" }           
     end
     mv('ext/xml/libxml.h.new', 'ext/xml/libxml.h')     
   end

data/TODO

@@ -1,4 +1,4 @@
-$Id: TODO,v 1.4 2006/04/12 12:08:39 roscopeco Exp $
+$Id: TODO 59 2006-04-12 12:08:39Z roscopeco $
 
 ==== BUGS
 

data/ext/xml/extconf.rb

@@ -37,6 +37,7 @@ unless have_library('m', 'atan')
 end
 
 unless have_library('z', 'inflate') or
+       have_library('zlib', 'inflate') or
        have_library('zlib1', 'inflate')
   crash('need zlib')
 else
@@ -45,6 +46,8 @@ end
 
 unless have_library('iconv','iconv_open') or 
        have_library('iconv','libiconv_open') or
+       have_library('libiconv', 'libiconv_open') or
+       have_library('libiconv', 'iconv_open') or
        have_library('c','iconv_open') or
        have_library('recode','iconv_open') or
        have_library('iconv')
@@ -80,7 +83,7 @@ need libxml2.
 EOL
 end
 
-unless have_library('xml2', 'xmlDocFormatDump')
+unless have_func('xmlDocFormatDump')
   crash('Your version of libxml2 is too old.  Please upgrade.')
 end
 
@@ -88,10 +91,6 @@ unless have_func('docbCreateFileParserCtxt')
   crash('Need docbCreateFileParserCtxt')
 end
 
-if try_compile('int main() { return 0; }','-Wall')
-  $CFLAGS << ' -Wall'
-end
-
 $CFLAGS << ' ' << $INCFLAGS
 $INSTALLFILES = [["libxml.rb", "$(RUBYLIBDIR)", "../xml"]]
 

data/ext/xml/libxml.c

@@ -1,4 +1,4 @@
-/* $Id: libxml.c,v 1.3.2.1 2006/11/26 12:37:41 roscopeco Exp $ */
+/* $Id: libxml.c 138 2007-08-29 18:00:35Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -49,6 +49,7 @@ static xmlStrdupFunc strdupFunc = NULL;
 void
 Init_libxml_so(void) {
   /* Some libxml memory goo that should be done before anything else */
+#ifdef NONE
   xmlMemGet((xmlFreeFunc *) & freeFunc,
             (xmlMallocFunc *) & mallocFunc,
             (xmlReallocFunc *) & reallocFunc,
@@ -57,6 +58,7 @@ Init_libxml_so(void) {
   if (xmlMemSetup((xmlFreeFunc)RubyMemFree, (xmlMallocFunc)RubyMemMalloc,
                   (xmlReallocFunc)RubyMemRealloc, (xmlStrdupFunc)RubyMemStrdup) != 0)
     rb_fatal("could not install the memory handlers for libxml");
+#endif
   xmlInitParser();
 
   mXML = rb_define_module("XML");
@@ -67,7 +69,6 @@ Init_libxml_so(void) {
   ruby_init_parser();  
   ruby_init_xml_parser_context();
   ruby_init_xml_attr();
-  ruby_init_xml_attribute();
   ruby_init_xml_document();
   ruby_init_xml_node();
   ruby_init_xml_node_set();
@@ -79,9 +80,11 @@ Init_libxml_so(void) {
   ruby_init_xml_xpath_context();
   ruby_init_xml_xpointer();
   ruby_init_xml_xpointer_context();
+  ruby_init_html_parser();
   ruby_init_input_callbacks(); 
   ruby_init_xml_dtd();         
   ruby_init_xml_schema();      
+  ruby_init_xml_reader();      
 
   ruby_xml_parser_default_substitute_entities_set(cXMLParser, Qtrue);
   ruby_xml_parser_default_load_external_dtd_set(cXMLParser, Qtrue);

data/ext/xml/libxml.h

@@ -6,12 +6,12 @@
 /* Don't nuke this block!  It is used for automatically updating the
  * versions below. VERSION = string formatting, VERNUM = numbered
  * version for inline testing: increment both or none at all. */
-#define RUBY_LIBXML_VERSION  "0.3.8.4"
-#define RUBY_LIBXML_VERNUM   384
-#define RUBY_LIBXML_VER_MAJ     0
-#define RUBY_LIBXML_VER_MIN     3
-#define RUBY_LIBXML_VER_MIC     8
-#define RUBY_LIBXML_VER_PATCH   4
+#define RUBY_LIBXML_VERSION  "0.5.0"
+#define RUBY_LIBXML_VERNUM   500
+#define RUBY_LIBXML_VER_MAJ   0
+#define RUBY_LIBXML_VER_MIN   5
+#define RUBY_LIBXML_VER_MIC   0
+#define RUBY_LIBXML_VER_PATCH 0
 
 #include <ruby.h>
 #include <rubyio.h>
@@ -24,6 +24,14 @@
 #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
+
 #ifdef LIBXML_DEBUG_ENABLED
 #include <libxml/xpathInternals.h>
 #endif
@@ -57,7 +65,6 @@ typedef struct rx_xpath_data {
 } rx_xpath_data;
 
 #include "ruby_xml_attr.h"
-#include "ruby_xml_attribute.h"
 #include "ruby_xml_document.h"
 #include "ruby_xml_node.h"
 #include "ruby_xml_node_set.h"
@@ -74,6 +81,8 @@ typedef struct rx_xpath_data {
 #include "ruby_xml_input_cbg.h"
 #include "ruby_xml_dtd.h"
 #include "ruby_xml_schema.h"
+#include "ruby_xml_html_parser.h"
+#include "ruby_xml_reader.h"
 
 extern VALUE mXML;
 extern VALUE eXMLError;

data/ext/xml/libxml.rb

@@ -1,4 +1,4 @@
-# $Id: libxml.rb,v 1.5.2.1 2006/11/26 12:37:42 roscopeco Exp $ 
+# $Id: libxml.rb 120 2006-11-26 12:57:56Z roscopeco $ 
 # Please see the LICENSE file for copyright and distribution information 
 require 'xml/libxml_so'
 
@@ -12,8 +12,8 @@ class XML::Document
 end
 
 class XML::Node::Set 
-  include Enumerable
-  
+  include Enumerable 
+
   # inefficient, but maybe can find a way to cache the
   # ary and dump on change?
   def [](i, count = nil) 

data/ext/xml/ruby_xml_attr.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_attr.c,v 1.2.2.1 2006/11/26 12:29:57 roscopeco Exp $ */
+/* $Id: ruby_xml_attr.c 138 2007-08-29 18:00:35Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -7,25 +7,90 @@
 
 VALUE cXMLAttr;
 
+void ruby_xml_attr_free(ruby_xml_attr_t *rx) {
+  if (rx->attr == NULL ) return;
+
+  if (rx->attr->parent == NULL && rx->attr->doc == NULL ) {
+#ifdef NODE_DEBUG
+    fprintf(stderr,"free rxn=0x%x xn=0x%x o=0x%x\n",(long)rxn,(long)rxn->node,(long)rxn->node->_private);
+#endif
+    rx->attr->_private=NULL;
+    xmlFreeProp(rx->attr);
+  }
+
+  rx->attr=NULL;
+  //  fprintf(stderr,"%0x ",(long)rxn);
+  free(rx);
+}
+
 void
-ruby_xml_attr_free(ruby_xml_attr *rxa) {
-  if (rxa->attr != NULL &&            // got an attr?
-      rxa->attr->parent == NULL &&    // unparented (otherwise, it gets freed with parent)
-      rxa->attr->doc == NULL) {       // No document? (otherwise, freed with doc)
-    if (rxa->attr->_private <= (void*)1) {
-      // is null or last reference, 
-      xmlFreeNode((xmlNodePtr)rxa->attr);  
-    } else {
-      // other pointers remain
-      rxa->attr->_private--;    
-    }    
+ruby_xml_attr_mark(ruby_xml_attr_t *rx) {
+  xmlNodePtr node;
+  if (rx->attr == NULL ) return;
+
+  if (rx->attr->_private == NULL ) {
+    rb_warning("XmlAttr is not bound! (%s:%d)",
+	       __FILE__,__LINE__);
+    return;
   }
 
-  rxa->attr = NULL;
-  free(rxa);
+  if (rx->attr->doc != NULL ) {
+    if (rx->attr->doc->_private == NULL )
+      rb_warning("XmlAttr Doc is not bound! (%s:%d)",
+		 __FILE__,__LINE__);
+    else {
+      rb_gc_mark((VALUE)rx->attr->doc->_private);
+#ifdef NODE_DEBUG
+      fprintf(stderr,"mark rx=0x%x xn=0x%x o=0x%x\n",(long)rx,(long)rx->attr,(long)rx->attr->_private);
+#endif
+    }
+  } else if (rx->attr->parent != NULL ) {
+    if (rx->attr->parent->_private == NULL )
+      rb_warning("XmlAttr Parent is not bound! (%s:%d)",
+		 __FILE__,__LINE__);
+    node=rx->attr->parent;
+    while (node->parent != NULL )
+      node=node->parent;
+    if (node->_private != NULL) {
+      rb_gc_mark((VALUE)node->_private);
+#ifdef NODE_DEBUG
+      fprintf(stderr,"mark rx=0x%x xn=0x%x o=0x%x\n",(long)0,(long)node,(long)node->_private);
+#endif
+    }
+  }
 }
 
+VALUE
+ruby_xml_attr_wrap(VALUE class, xmlAttrPtr xnode)
+{
+  VALUE obj;
+  ruby_xml_attr_t *rx;
+
+  // This node is already wrapped
+  if (xnode->_private != NULL)
+    return (VALUE)xnode->_private;
+
+  obj=Data_Make_Struct(class,ruby_xml_attr_t,ruby_xml_attr_mark,
+		       ruby_xml_attr_free,rx);
+
+  rx->attr=xnode;
+  xnode->_private=(void*)obj;
+#ifdef NODE_DEBUG
+  fprintf(stderr,"wrap rxn=0x%x xn=0x%x o=0x%x\n",(long)rxn,(long)xnode,(long)obj);
+#endif
+  return obj;
+}
 
+/*
+ * Only use this when a xmlAttr has just been created since
+ * oblitterates the _private. Not exposed to ruby interp.
+ */
+VALUE
+ruby_xml_attr_new(VALUE class, xmlAttrPtr xnode)
+{
+  xnode->_private=NULL;
+  return ruby_xml_attr_wrap(class,xnode);
+}
 /*
  * call-seq:
  *    attr.child => node
@@ -34,12 +99,12 @@ ruby_xml_attr_free(ruby_xml_attr *rxa) {
  */
 VALUE
 ruby_xml_attr_child_get(VALUE self) {
-  ruby_xml_attr *rxa;
-  Data_Get_Struct(self, ruby_xml_attr, rxa);
+  ruby_xml_attr_t *rxa;
+  Data_Get_Struct(self, ruby_xml_attr_t, rxa);
   if (rxa->attr->children == NULL)
     return(Qnil);
   else
-    return(ruby_xml_node_new_ptr(cXMLNode, rxa->xd, rxa->attr->children));
+    return(ruby_xml_node2_wrap(cXMLNode, rxa->attr->children));
 }
 
 
@@ -51,8 +116,8 @@ ruby_xml_attr_child_get(VALUE self) {
  */
 VALUE
 ruby_xml_attr_child_q(VALUE self) {
-  ruby_xml_attr *rxa;
-  Data_Get_Struct(self, ruby_xml_attr, rxa);
+  ruby_xml_attr_t *rxa;
+  Data_Get_Struct(self, ruby_xml_attr_t, rxa);
   if (rxa->attr->children == NULL)
     return(Qfalse);
   else
@@ -69,15 +134,14 @@ ruby_xml_attr_child_q(VALUE self) {
  */
 VALUE
 ruby_xml_attr_doc_get(VALUE self) {
-  ruby_xml_attr *rxa;
-  Data_Get_Struct(self, ruby_xml_attr, rxa);
+  ruby_xml_attr_t *rxa;
+  Data_Get_Struct(self, ruby_xml_attr_t, rxa);
   if (rxa->attr->doc == NULL)
     return(Qnil);
   else
-    return(ruby_xml_document_new(cXMLDocument, rxa->attr->doc));
+    return(ruby_xml_document_wrap(cXMLDocument, rxa->attr->doc));
 }
 
-
 /*
  * call-seq:
  *    attr.doc? => (true|false)
@@ -87,8 +151,8 @@ ruby_xml_attr_doc_get(VALUE self) {
  */
 VALUE
 ruby_xml_attr_doc_q(VALUE self) {
-  ruby_xml_attr *rxa;
-  Data_Get_Struct(self, ruby_xml_attr, rxa);
+  ruby_xml_attr_t *rxa;
+  Data_Get_Struct(self, ruby_xml_attr_t, rxa);
   if (rxa->attr->doc == NULL)
     return(Qfalse);
   else
@@ -104,12 +168,12 @@ ruby_xml_attr_doc_q(VALUE self) {
  */
 VALUE
 ruby_xml_attr_last_get(VALUE self) {
-  ruby_xml_attr *rxa;
-  Data_Get_Struct(self, ruby_xml_attr, rxa);
+  ruby_xml_attr_t *rxa;
+  Data_Get_Struct(self, ruby_xml_attr_t, rxa);
   if (rxa->attr->last == NULL)
     return(Qnil);
   else
-    return(ruby_xml_node_new_ptr(cXMLNode, rxa->xd, rxa->attr->last));
+    return(ruby_xml_node2_wrap(cXMLNode, rxa->attr->last));
 }
 
 
@@ -121,22 +185,14 @@ ruby_xml_attr_last_get(VALUE self) {
  */
 VALUE
 ruby_xml_attr_last_q(VALUE self) {
-  ruby_xml_attr *rxa;
-  Data_Get_Struct(self, ruby_xml_attr, rxa);
+  ruby_xml_attr_t *rxa;
+  Data_Get_Struct(self, ruby_xml_attr_t, rxa);
   if (rxa->attr->last == NULL)
     return(Qfalse);
   else
     return(Qtrue);
 }
 
-
-static void
-ruby_xml_attr_mark(ruby_xml_attr *rxa) {
-  if (rxa == NULL) return;
-  if (!NIL_P(rxa->xd)) rb_gc_mark(rxa->xd);
-}
-
-
 /*
  * call-seq:
  *    attr.name => "name"
@@ -145,8 +201,8 @@ ruby_xml_attr_mark(ruby_xml_attr *rxa) {
  */
 VALUE
 ruby_xml_attr_name_get(VALUE self) {
-  ruby_xml_attr *rxa;
-  Data_Get_Struct(self, ruby_xml_attr, rxa);
+  ruby_xml_attr_t *rxa;
+  Data_Get_Struct(self, ruby_xml_attr_t, rxa);
 
   if (rxa->attr->name == NULL)
     return(Qnil);
@@ -154,43 +210,6 @@ ruby_xml_attr_name_get(VALUE self) {
     return(rb_str_new2((const char*)rxa->attr->name));
 }
 
-
-VALUE
-ruby_xml_attr_new(VALUE class, VALUE xd, xmlAttrPtr attr) {
-  return(ruby_xml_attr_new2(class, xd, attr));
-}
-
-
-VALUE
-ruby_xml_attr_new2(VALUE class, VALUE xd, xmlAttrPtr attr) {
-  ruby_xml_attr *rxa;
-
-  rxa = ALLOC(ruby_xml_attr);
-
-  rxa->attr = attr;
-  if (attr->_private) {
-    attr->_private++;
-  } else {
-    attr->_private = (void*)1;
-  }
-    
-  if (NIL_P(xd)) {
-    rxa->xd = Qnil;
-    rxa->attr->doc = NULL;
-  } else {
-    /* Have to set node->doc too so we don't doublefree this node */
-    ruby_xml_document *xdoc;
-    Data_Get_Struct(xd, ruby_xml_document, xdoc);
-      
-    rxa->xd = xd;
-    rxa->attr->doc = xdoc->doc;
-  }
-
-  return(Data_Wrap_Struct(class, ruby_xml_attr_mark,
-			  ruby_xml_attr_free, rxa));
-}
-
-
 /*
  * call-seq:
  *    attr.next => node
@@ -199,12 +218,12 @@ ruby_xml_attr_new2(VALUE class, VALUE xd, xmlAttrPtr attr) {
  */
 VALUE
 ruby_xml_attr_next_get(VALUE self) {
-  ruby_xml_attr *rxa;
-  Data_Get_Struct(self, ruby_xml_attr, rxa);
+  ruby_xml_attr_t *rxa;
+  Data_Get_Struct(self, ruby_xml_attr_t, rxa);
   if (rxa->attr->next == NULL)
     return(Qnil);
   else
-    return(ruby_xml_attr_new(cXMLAttr, rxa->xd, rxa->attr->next));
+    return(ruby_xml_attr_wrap(cXMLAttr, rxa->attr->next));
 }
 
 
@@ -216,8 +235,8 @@ ruby_xml_attr_next_get(VALUE self) {
  */
 VALUE
 ruby_xml_attr_next_q(VALUE self) {
-  ruby_xml_attr *rxa;
-  Data_Get_Struct(self, ruby_xml_attr, rxa);
+  ruby_xml_attr_t *rxa;
+  Data_Get_Struct(self, ruby_xml_attr_t, rxa);
   if (rxa->attr->next == NULL)
     return(Qfalse);
   else
@@ -245,12 +264,12 @@ ruby_xml_attr_node_type_name(VALUE self) {
  */
 VALUE
 ruby_xml_attr_ns_get(VALUE self) {
-  ruby_xml_attr *rxa;
-  Data_Get_Struct(self, ruby_xml_attr, rxa);
+  ruby_xml_attr_t *rxa;
+  Data_Get_Struct(self, ruby_xml_attr_t, rxa);
   if (rxa->attr->ns == NULL)
     return(Qnil);
   else
-    return(ruby_xml_ns_new2(cXMLNS, rxa->xd, rxa->attr->ns));
+    return(ruby_xml_ns_new2(cXMLNS, NULL, rxa->attr->ns));
 }
 
 
@@ -263,8 +282,8 @@ ruby_xml_attr_ns_get(VALUE self) {
  */
 VALUE
 ruby_xml_attr_ns_q(VALUE self) {
-  ruby_xml_attr *rxa;
-  Data_Get_Struct(self, ruby_xml_attr, rxa);
+  ruby_xml_attr_t *rxa;
+  Data_Get_Struct(self, ruby_xml_attr_t, rxa);
   if (rxa->attr->ns == NULL)
     return(Qfalse);
   else
@@ -280,12 +299,12 @@ ruby_xml_attr_ns_q(VALUE self) {
  */
 VALUE
 ruby_xml_attr_parent_get(VALUE self) {
-  ruby_xml_attr *rxa;
-  Data_Get_Struct(self, ruby_xml_attr, rxa);
+  ruby_xml_attr_t *rxa;
+  Data_Get_Struct(self, ruby_xml_attr_t, rxa);
   if (rxa->attr->parent == NULL)
     return(Qnil);
   else
-    return(ruby_xml_node_new_ptr(cXMLNode, rxa->xd, rxa->attr->parent));
+    return(ruby_xml_node2_wrap(cXMLNode, rxa->attr->parent));
 }
 
 
@@ -297,8 +316,8 @@ ruby_xml_attr_parent_get(VALUE self) {
  */
 VALUE
 ruby_xml_attr_parent_q(VALUE self) {
-  ruby_xml_attr *rxa;
-  Data_Get_Struct(self, ruby_xml_attr, rxa);
+  ruby_xml_attr_t *rxa;
+  Data_Get_Struct(self, ruby_xml_attr_t, rxa);
   if (rxa->attr->parent == NULL)
     return(Qfalse);
   else
@@ -314,12 +333,12 @@ ruby_xml_attr_parent_q(VALUE self) {
  */
 VALUE
 ruby_xml_attr_prev_get(VALUE self) {
-  ruby_xml_attr *rxa;
-  Data_Get_Struct(self, ruby_xml_attr, rxa);
+  ruby_xml_attr_t *rxa;
+  Data_Get_Struct(self, ruby_xml_attr_t, rxa);
   if (rxa->attr->prev == NULL)
     return(Qnil);
   else
-    return(ruby_xml_attr_new(cXMLAttr, rxa->xd, rxa->attr->prev));
+    return(ruby_xml_attr_wrap(cXMLAttr, rxa->attr->prev));
 }
 
 
@@ -331,8 +350,8 @@ ruby_xml_attr_prev_get(VALUE self) {
  */
 VALUE
 ruby_xml_attr_prev_q(VALUE self) {
-  ruby_xml_attr *rxa;
-  Data_Get_Struct(self, ruby_xml_attr, rxa);
+  ruby_xml_attr_t *rxa;
+  Data_Get_Struct(self, ruby_xml_attr_t, rxa);
   if (rxa->attr->prev == NULL)
     return(Qfalse);
   else
@@ -348,10 +367,10 @@ ruby_xml_attr_prev_q(VALUE self) {
  */
 VALUE
 ruby_xml_attr_value(VALUE self) {
-  ruby_xml_attr *rxa;
+  ruby_xml_attr_t *rxa;
   xmlChar *value;
 
-  Data_Get_Struct(self, ruby_xml_attr, rxa);
+  Data_Get_Struct(self, ruby_xml_attr_t, rxa);
   if (ruby_xml_attr_parent_q(self) == Qtrue) {
     value = xmlGetProp(rxa->attr->parent, rxa->attr->name);
     if (value != NULL)

data/ext/xml/ruby_xml_attr.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_attr.h,v 1.2 2006/11/20 01:22:07 roscopeco Exp $ */
+/* $Id: ruby_xml_attr.h 138 2007-08-29 18:00:35Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -9,13 +9,10 @@ extern VALUE cXMLAttr;
 
 typedef struct ruby_xml_attr {
   xmlAttrPtr attr;
-  VALUE xd;
-  //int is_ptr;
-} ruby_xml_attr;
+} ruby_xml_attr_t;
 
-void ruby_xml_attr_free(ruby_xml_attr *rxn);
+void ruby_xml_attr_free(ruby_xml_attr_t *rxn);
+VALUE ruby_xml_attr_wrap(VALUE class, xmlAttrPtr xnode);
 void ruby_init_xml_attr(void);
-VALUE ruby_xml_attr_new(VALUE class, VALUE xd, xmlAttrPtr attr);
-VALUE ruby_xml_attr_new2(VALUE class, VALUE xd, xmlAttrPtr attr);
 VALUE ruby_xml_attr_name_get(VALUE self);
 #endif