libxml-ruby 0.3.8.4 → 0.5.0

data/ext/xml/ruby_xml_node.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node.h,v 1.3 2006/11/20 01:22:07 roscopeco Exp $ */
+/* $Id: ruby_xml_node.h 138 2007-08-29 18:00:35Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -12,18 +12,15 @@ extern VALUE eXMLNodeUnknownType;
 
 typedef struct ruby_xml_node {
   xmlNodePtr node;
-  VALUE xd;
-  //int is_ptr;
 } ruby_xml_node;
 
+VALUE
+ruby_xml_node2_wrap(VALUE class, xmlNodePtr xnode);
+
 void ruby_xml_node_free(ruby_xml_node *rxn);
 void ruby_init_xml_node(void);
 VALUE ruby_xml_node_child_set(VALUE self, VALUE obj);
-VALUE ruby_xml_node_new(VALUE class, xmlNodePtr node);
-VALUE ruby_xml_node_new_ptr(VALUE class, VALUE xd, xmlNodePtr node);
-VALUE ruby_xml_node_new3(VALUE class, VALUE xd, xmlNodePtr node, int ptr);
 VALUE ruby_xml_node_name_get(VALUE self);
 VALUE ruby_xml_node_property_get(VALUE self, VALUE key);
 VALUE ruby_xml_node_property_set(VALUE self, VALUE key, VALUE val);
-VALUE ruby_xml_node_set_ptr(VALUE node, int is_ptr);
 #endif

data/ext/xml/ruby_xml_node_set.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node_set.c,v 1.4.2.1 2006/11/26 12:37:42 roscopeco Exp $ */
+/* $Id: ruby_xml_node_set.c 138 2007-08-29 18:00:35Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -32,7 +32,7 @@ ruby_xml_node_set_to_a(VALUE self) {
   set_ary = rb_ary_new();
   if (!((rxnset->node_set == NULL) || (rxnset->node_set->nodeNr == 0))) {
     for (i = 0; i < rxnset->node_set->nodeNr; i++) {
-      nodeobj = ruby_xml_node_new_ptr(cXMLNode, rxnset->xd, rxnset->node_set->nodeTab[i]);
+      nodeobj = ruby_xml_node2_wrap(cXMLNode, rxnset->node_set->nodeTab[i]);
       rb_ary_push(set_ary, nodeobj);
     }
   }
@@ -61,10 +61,10 @@ ruby_xml_node_set_each(VALUE self) {
   for (i = 0; i < rxnset->node_set->nodeNr; i++) {
     switch(rxnset->node_set->nodeTab[i]->type) {
     case XML_ATTRIBUTE_NODE:
-      nodeobj = ruby_xml_attr_new2(cXMLAttr, rxnset->xd, (xmlAttrPtr)rxnset->node_set->nodeTab[i]);
+      nodeobj = ruby_xml_attr_wrap(cXMLAttr, (xmlAttrPtr)rxnset->node_set->nodeTab[i]);
       break;
     default:
-      nodeobj = ruby_xml_node_new_ptr(cXMLNode, rxnset->xd, rxnset->node_set->nodeTab[i]);
+      nodeobj = ruby_xml_node2_wrap(cXMLNode, rxnset->node_set->nodeTab[i]);
     }
 
     rb_yield(nodeobj);
@@ -105,10 +105,10 @@ ruby_xml_node_set_first(VALUE self) {
     
   switch(rxnset->node_set->nodeTab[0]->type) {
     case XML_ATTRIBUTE_NODE:
-      nodeobj = ruby_xml_attr_new2(cXMLAttr, rxnset->xd, (xmlAttrPtr)rxnset->node_set->nodeTab[0]);
+      nodeobj = ruby_xml_attr_wrap(cXMLAttr, (xmlAttrPtr)rxnset->node_set->nodeTab[0]);
       break;
     default:
-      nodeobj = ruby_xml_node_new_ptr(cXMLNode, rxnset->xd, rxnset->node_set->nodeTab[0]);
+      nodeobj = ruby_xml_node2_wrap(cXMLNode, rxnset->node_set->nodeTab[0]);
   }
 
   return(nodeobj);

data/ext/xml/ruby_xml_node_set.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node_set.h,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_node_set.h 39 2006-02-21 20:40:16Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_ns.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_ns.c,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_ns.c 39 2006-02-21 20:40:16Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_ns.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_ns.h,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_ns.h 39 2006-02-21 20:40:16Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_parser.c

@@ -1,5 +1,5 @@
-/* $Id: ruby_xml_parser.c,v 1.5 2006/11/20 01:22:07 roscopeco Exp $ */
-/* $Id: ruby_xml_parser.c,v 1.5 2006/11/20 01:22:07 roscopeco Exp $ */
+/* $Id: ruby_xml_parser.c 138 2007-08-29 18:00:35Z danj $ */
+/* $Id: ruby_xml_parser.c 138 2007-08-29 18:00:35Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -1107,7 +1107,7 @@ ruby_xml_parser_new_string(VALUE class, VALUE str) {
  */
 VALUE
 ruby_xml_parser_parse(VALUE self) {
-  ruby_xml_document *rxd;
+  ruby_xml_document_t *rxd;
   ruby_xml_parser *rxp;
   ruby_xml_parser_context *rxpc;
   xmlDocPtr xdp;
@@ -1136,10 +1136,7 @@ ruby_xml_parser_parse(VALUE self) {
       rxp->parsed = 1;
     }
 
-    doc = ruby_xml_document_new(cXMLDocument, xdp);
-    Data_Get_Struct(doc, ruby_xml_document, rxd);
-    rxd->is_ptr = 0;
-    rxd->doc = xdp;
+    doc = ruby_xml_document_wrap(cXMLDocument, xdp);
     break;
   default:
     rb_fatal("Unknown data type, %d", rxp->data_type);
@@ -1216,7 +1213,7 @@ ruby_xml_parser_str_set(VALUE self, VALUE str) {
   data->str = str;
 
   Data_Get_Struct(rxp->ctxt, ruby_xml_parser_context, rxpc);
-  rxpc->ctxt = xmlCreateMemoryParserCtxt(StringValuePtr(data->str), RSTRING(data->str)->len);
+  rxpc->ctxt = xmlCreateMemoryParserCtxt(StringValuePtr(data->str), RSTRING_LEN(data->str));
 
   return(data->str);
 }

data/ext/xml/ruby_xml_parser.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_parser.h,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_parser.h 39 2006-02-21 20:40:16Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_parser_context.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_parser_context.c,v 1.2 2006/11/20 01:22:07 roscopeco Exp $ */
+/* $Id: ruby_xml_parser_context.c 138 2007-08-29 18:00:35Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -82,7 +82,7 @@ ruby_xml_parser_context_doc_get(VALUE self) {
   if (rxpc->ctxt->myDoc == NULL)
     return(Qnil);
 
-  return(ruby_xml_document_new4(cXMLDocument, rxpc->ctxt->myDoc));
+  return(ruby_xml_document_wrap(cXMLDocument, rxpc->ctxt->myDoc));
 }
 
 
@@ -330,8 +330,7 @@ ruby_xml_parser_context_node_get(VALUE self) {
   if (rxpc->ctxt->node == NULL)
     return(Qnil);
   else
-    return(ruby_xml_node_new_ptr(cXMLNode,
-			      ruby_xml_document_new(cXMLDocument, rxpc->ctxt->myDoc),
+    return(ruby_xml_node2_wrap(cXMLNode,
 			      rxpc->ctxt->node));
 }
 

data/ext/xml/ruby_xml_parser_context.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_parser_context.h,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_parser_context.h 39 2006-02-21 20:40:16Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */