libxml-ruby 5.0.5 → 6.0.0

data/ext/libxml/ruby_xml_attr.h

@@ -1,12 +1,13 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_ATTR__
-#define __RXML_ATTR__
-
-extern VALUE cXMLAttr;
-
-void rxml_init_attr(void);
-VALUE rxml_attr_wrap(xmlAttrPtr xattr);
-VALUE rxml_attr_value_get(VALUE self);
-VALUE rxml_attr_value_set(VALUE self, VALUE val);
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_ATTR__
+#define __RXML_ATTR__
+
+extern VALUE cXMLAttr;
+extern const rb_data_type_t rxml_attr_type;
+
+void rxml_init_attr(void);
+VALUE rxml_attr_wrap(xmlAttrPtr xattr);
+VALUE rxml_attr_value_get(VALUE self);
+VALUE rxml_attr_value_set(VALUE self, VALUE val);
+#endif

data/ext/libxml/ruby_xml_attr_decl.c

@@ -13,14 +13,21 @@
 
 VALUE cXMLAttrDecl;
 
-void rxml_attr_decl_mark(xmlAttributePtr xattr)
+static void rxml_attr_decl_mark(void *data)
 {
-  rxml_node_mark((xmlNodePtr) xattr);
+  xmlAttributePtr xattr = (xmlAttributePtr)data;
+  rxml_node_mark((xmlNodePtr)xattr);
 }
 
+static const rb_data_type_t rxml_attr_decl_type = {
+  "LibXML::XML::AttrDecl",
+  {rxml_attr_decl_mark, NULL, 0},
+  &rxml_attr_type, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 VALUE rxml_attr_decl_wrap(xmlAttributePtr xattr)
 {
-  return Data_Wrap_Struct(cXMLAttrDecl, rxml_attr_decl_mark, NULL, xattr);
+  return TypedData_Wrap_Struct(cXMLAttrDecl, &rxml_attr_decl_type, xattr);
 }
 
 /*
@@ -32,11 +39,11 @@ VALUE rxml_attr_decl_wrap(xmlAttributePtr xattr)
 static VALUE rxml_attr_decl_doc_get(VALUE self)
 {
   xmlAttributePtr xattr;
-  Data_Get_Struct(self, xmlAttribute, xattr);
+  TypedData_Get_Struct(self, xmlAttribute, &rxml_attr_decl_type, xattr);
   if (xattr->doc == NULL)
     return Qnil;
   else
-    return rxml_document_wrap(xattr->doc);
+    return rxml_registry_lookup(xattr->doc);
 }
 
 
@@ -49,7 +56,7 @@ static VALUE rxml_attr_decl_doc_get(VALUE self)
 static VALUE rxml_attr_decl_name_get(VALUE self)
 {
   xmlAttributePtr xattr;
-  Data_Get_Struct(self, xmlAttribute, xattr);
+  TypedData_Get_Struct(self, xmlAttribute, &rxml_attr_decl_type, xattr);
 
   if (xattr->name == NULL)
     return Qnil;
@@ -66,7 +73,7 @@ static VALUE rxml_attr_decl_name_get(VALUE self)
 static VALUE rxml_attr_decl_next_get(VALUE self)
 {
   xmlAttributePtr xattr;
-  Data_Get_Struct(self, xmlAttribute, xattr);
+  TypedData_Get_Struct(self, xmlAttribute, &rxml_attr_decl_type, xattr);
   if (xattr->next == NULL)
     return Qnil;
   else
@@ -81,8 +88,8 @@ static VALUE rxml_attr_decl_next_get(VALUE self)
  */
 static VALUE rxml_attr_decl_node_type(VALUE self)
 {
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
+  xmlAttributePtr xattr;
+  TypedData_Get_Struct(self, xmlAttribute, &rxml_attr_decl_type, xattr);
   return INT2NUM(xattr->type);
 }
 
@@ -96,7 +103,7 @@ static VALUE rxml_attr_decl_node_type(VALUE self)
 static VALUE rxml_attr_decl_parent_get(VALUE self)
 {
   xmlAttributePtr xattr;
-  Data_Get_Struct(self, xmlAttribute, xattr);
+  TypedData_Get_Struct(self, xmlAttribute, &rxml_attr_decl_type, xattr);
 
   if (xattr->parent == NULL)
     return Qnil;
@@ -114,7 +121,7 @@ static VALUE rxml_attr_decl_parent_get(VALUE self)
 static VALUE rxml_attr_decl_prev_get(VALUE self)
 {
   xmlAttributePtr xattr;
-  Data_Get_Struct(self, xmlAttribute, xattr);
+  TypedData_Get_Struct(self, xmlAttribute, &rxml_attr_decl_type, xattr);
 
   if (xattr->prev == NULL)
     return Qnil;
@@ -132,7 +139,7 @@ VALUE rxml_attr_decl_value_get(VALUE self)
 {
   xmlAttributePtr xattr;
 
-  Data_Get_Struct(self, xmlAttribute, xattr);
+  TypedData_Get_Struct(self, xmlAttribute, &rxml_attr_decl_type, xattr);
 
   if (xattr->defaultValue)
     return rxml_new_cstr(xattr->defaultValue, NULL);

data/ext/libxml/ruby_xml_attr_decl.h

@@ -1,11 +1,11 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_ATTR_DECL__
-#define __RXML_ATTR_DECL__
-
-extern VALUE cXMLAttrDecl;
-
-void rxml_init_attr_decl(void);
-VALUE rxml_attr_decl_wrap(xmlAttributePtr xattribute);
-VALUE rxml_attr_decl_value_get(VALUE self);
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_ATTR_DECL__
+#define __RXML_ATTR_DECL__
+
+extern VALUE cXMLAttrDecl;
+
+void rxml_init_attr_decl(void);
+VALUE rxml_attr_decl_wrap(xmlAttributePtr xattribute);
+VALUE rxml_attr_decl_value_get(VALUE self);
+#endif

data/ext/libxml/ruby_xml_attributes.c

@@ -32,17 +32,26 @@
 
 VALUE cXMLAttributes;
 
-void rxml_attributes_mark(xmlNodePtr xnode)
+void rxml_attributes_mark(void *data)
 {
-  rxml_node_mark(xnode);
+  rxml_node_mark((xmlNodePtr)data);
 }
 
+static const rb_data_type_t rxml_attributes_data_type = {
+  .wrap_struct_name = "LibXML::XML::Attributes",
+  .function = {
+    .dmark = rxml_attributes_mark,
+    .dfree = NULL,
+  },
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 /*
  * Creates a  new attributes instance.  Not exposed to ruby.
  */
 VALUE rxml_attributes_new(xmlNodePtr xnode)
 {
-  return Data_Wrap_Struct(cXMLAttributes, rxml_attributes_mark, NULL, xnode);
+  return TypedData_Wrap_Struct(cXMLAttributes, &rxml_attributes_data_type, xnode);
 }
 
 /*
@@ -56,7 +65,7 @@ VALUE rxml_attributes_new(xmlNodePtr xnode)
 VALUE rxml_attributes_node_get(VALUE self)
 {
   xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
+  TypedData_Get_Struct(self, xmlNode, &rxml_attributes_data_type, xnode);
   return rxml_node_wrap(xnode);
 }
 
@@ -80,7 +89,7 @@ static VALUE rxml_attributes_get_attribute(VALUE self, VALUE name)
 
   name = rb_obj_as_string(name);
 
-  Data_Get_Struct(self, xmlNode, xnode);
+  TypedData_Get_Struct(self, xmlNode, &rxml_attributes_data_type, xnode);
 
   xattr = xmlHasProp(xnode, (xmlChar*) StringValuePtr(name));
 
@@ -114,7 +123,7 @@ static VALUE rxml_attributes_get_attribute_ns(VALUE self, VALUE namespace,
 
   name = rb_obj_as_string(name);
 
-  Data_Get_Struct(self, xmlNode, xnode);
+  TypedData_Get_Struct(self, xmlNode, &rxml_attributes_data_type, xnode);
 
   xattr = xmlHasNsProp(xnode, (xmlChar*) StringValuePtr(name),
                       (xmlChar*) StringValuePtr(namespace));
@@ -191,7 +200,7 @@ static VALUE rxml_attributes_each(VALUE self)
 {
   xmlNodePtr xnode;
   xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlNode, xnode);
+  TypedData_Get_Struct(self, xmlNode, &rxml_attributes_data_type, xnode);
 
   xattr = xnode->properties;
 
@@ -222,7 +231,7 @@ static VALUE rxml_attributes_length(VALUE self)
   int length = 0;
   xmlNodePtr xnode;
   xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlNode, xnode);
+  TypedData_Get_Struct(self, xmlNode, &rxml_attributes_data_type, xnode);
 
   xattr = xnode->properties;
 
@@ -246,7 +255,7 @@ static VALUE rxml_attributes_length(VALUE self)
 static VALUE rxml_attributes_first(VALUE self)
 {
   xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
+  TypedData_Get_Struct(self, xmlNode, &rxml_attributes_data_type, xnode);
 
   if (xnode->type == XML_ELEMENT_NODE)
   {