libxml-ruby 4.1.1-x64-mingw-ucrt → 4.1.2-x64-mingw-ucrt

data/ext/libxml/ruby_xml_schema_attribute.c

@@ -1,107 +1,108 @@
-#include "ruby_libxml.h"
-#include "ruby_xml_schema_attribute.h"
-#include "ruby_xml_schema_type.h"
-
-/**
- * xmlSchemaBasicItem:
- *
- * The abstract base type for schema components.
- */
-typedef struct _xmlSchemaBasicItem xmlSchemaBasicItem;
-typedef xmlSchemaBasicItem *xmlSchemaBasicItemPtr;
-struct _xmlSchemaBasicItem {
-    xmlSchemaTypeType type;
-};
-
-/**
- * xmlSchemaQNameRef:
- *
- * A component reference item (not a schema component)
- * (Extends xmlSchemaBasicItem)
- */
-typedef struct _xmlSchemaQNameRef xmlSchemaQNameRef;
-typedef xmlSchemaQNameRef *xmlSchemaQNameRefPtr;
-struct _xmlSchemaQNameRef {
-    xmlSchemaTypeType type;
-    xmlSchemaBasicItemPtr item;
-    /* The resolved referenced item. */
-    xmlSchemaTypeType itemType;
-    const xmlChar *name;
-    const xmlChar *targetNamespace;
-    xmlNodePtr node;
-};
-
-/**
- * xmlSchemaAttributeUseProhibPtr:
- *
- * A helper component to reflect attribute prohibitions.
- * (Extends xmlSchemaBasicItem)
- */
-typedef struct _xmlSchemaAttributeUseProhib xmlSchemaAttributeUseProhib;
-typedef xmlSchemaAttributeUseProhib *xmlSchemaAttributeUseProhibPtr;
-struct _xmlSchemaAttributeUseProhib {
-    xmlSchemaTypeType type;
-    /* == XML_SCHEMA_EXTRA_ATTR_USE_PROHIB */
-    xmlNodePtr node;
-    const xmlChar *name;
-    const xmlChar *targetNamespace;
-    int isRef;
-};
-
-VALUE cXMLSchemaAttribute;
-
-static void rxml_schema_attribute_free(xmlSchemaAttributeUsePtr attr)
-{
-  attr = NULL;
-  xmlFree(attr);
-}
-
-VALUE rxml_wrap_schema_attribute(xmlSchemaAttributeUsePtr attr)
-{
-  VALUE result;
-  const xmlChar *tns_str, *name_str;
-
-  if (!attr)
-    rb_raise(rb_eArgError, "XML::Schema::Attribute required!");
-
-  result = Data_Wrap_Struct(cXMLSchemaAttribute, NULL, rxml_schema_attribute_free, attr);
-
-  if (attr->type == XML_SCHEMA_EXTRA_ATTR_USE_PROHIB) {
-    tns_str = ((xmlSchemaAttributeUseProhibPtr) attr)->targetNamespace;
-    name_str = ((xmlSchemaAttributeUseProhibPtr) attr)->name;
-  } else if (attr->type == XML_SCHEMA_EXTRA_QNAMEREF) {
-    tns_str = ((xmlSchemaQNameRefPtr) attr)->targetNamespace;
-    name_str = ((xmlSchemaQNameRefPtr) attr)->name;
-  } else {
-    tns_str = ((xmlSchemaAttributePtr) (attr->attrDecl))->targetNamespace;
-    name_str = ((xmlSchemaAttributePtr) (attr->attrDecl))->name;
-  }
-  rb_iv_set(result, "@target_namespace", QNIL_OR_STRING(tns_str));
-  rb_iv_set(result, "@name", QNIL_OR_STRING(name_str));
-  rb_iv_set(result, "@type", rxml_wrap_schema_type((xmlSchemaTypePtr)attr->attrDecl->subtypes));
-  rb_iv_set(result, "@value", QNIL_OR_STRING(attr->defValue));
-  rb_iv_set(result, "@occurs", INT2NUM(attr->occurs));
-
-  return result;
-}
-
-static VALUE rxml_schema_attribute_node(VALUE self)
-{
-  xmlSchemaAttributeUsePtr attr;
-
-  Data_Get_Struct(self, xmlSchemaAttributeUse, attr);
-
-  return rxml_node_wrap(attr->node);
-}
-
-void rxml_init_schema_attribute(void)
-{
-  cXMLSchemaAttribute = rb_define_class_under(cXMLSchema, "Attribute", rb_cObject);
-  rb_define_attr(cXMLSchemaAttribute, "name", 1, 0);
-  rb_define_attr(cXMLSchemaAttribute, "type", 1, 0);
-  rb_define_attr(cXMLSchemaAttribute, "namespace", 1, 0);
-  rb_define_attr(cXMLSchemaAttribute, "value", 1, 0);
-  rb_define_attr(cXMLSchemaAttribute, "occurs", 1, 0);
-
-  rb_define_method(cXMLSchemaAttribute, "node", rxml_schema_attribute_node, 0);
-}
+#include "ruby_libxml.h"
+#include "ruby_xml_schema_attribute.h"
+#include "ruby_xml_schema_type.h"
+
+/**
+ * xmlSchemaBasicItem:
+ *
+ * The abstract base type for schema components.
+ */
+typedef struct _xmlSchemaBasicItem xmlSchemaBasicItem;
+typedef xmlSchemaBasicItem *xmlSchemaBasicItemPtr;
+struct _xmlSchemaBasicItem {
+    xmlSchemaTypeType type;
+};
+
+/**
+ * xmlSchemaQNameRef:
+ *
+ * A component reference item (not a schema component)
+ * (Extends xmlSchemaBasicItem)
+ */
+typedef struct _xmlSchemaQNameRef xmlSchemaQNameRef;
+typedef xmlSchemaQNameRef *xmlSchemaQNameRefPtr;
+struct _xmlSchemaQNameRef {
+    xmlSchemaTypeType type;
+    xmlSchemaBasicItemPtr item;
+    /* The resolved referenced item. */
+    xmlSchemaTypeType itemType;
+    const xmlChar *name;
+    const xmlChar *targetNamespace;
+    xmlNodePtr node;
+};
+
+/**
+ * xmlSchemaAttributeUseProhibPtr:
+ *
+ * A helper component to reflect attribute prohibitions.
+ * (Extends xmlSchemaBasicItem)
+ */
+typedef struct _xmlSchemaAttributeUseProhib xmlSchemaAttributeUseProhib;
+typedef xmlSchemaAttributeUseProhib *xmlSchemaAttributeUseProhibPtr;
+struct _xmlSchemaAttributeUseProhib {
+    xmlSchemaTypeType type;
+    /* == XML_SCHEMA_EXTRA_ATTR_USE_PROHIB */
+    xmlNodePtr node;
+    const xmlChar *name;
+    const xmlChar *targetNamespace;
+    int isRef;
+};
+
+VALUE cXMLSchemaAttribute;
+
+static void rxml_schema_attribute_free(xmlSchemaAttributeUsePtr attr)
+{
+  attr = NULL;
+  xmlFree(attr);
+}
+
+VALUE rxml_wrap_schema_attribute(xmlSchemaAttributeUsePtr attr)
+{
+  VALUE result;
+  const xmlChar *tns_str, *name_str;
+
+  if (!attr)
+    rb_raise(rb_eArgError, "XML::Schema::Attribute required!");
+
+  result = Data_Wrap_Struct(cXMLSchemaAttribute, NULL, rxml_schema_attribute_free, attr);
+
+  if (attr->type == XML_SCHEMA_EXTRA_ATTR_USE_PROHIB) {
+    tns_str = ((xmlSchemaAttributeUseProhibPtr) attr)->targetNamespace;
+    name_str = ((xmlSchemaAttributeUseProhibPtr) attr)->name;
+  } else if (attr->type == XML_SCHEMA_EXTRA_QNAMEREF) {
+    tns_str = ((xmlSchemaQNameRefPtr) attr)->targetNamespace;
+    name_str = ((xmlSchemaQNameRefPtr) attr)->name;
+  } else {
+    tns_str = ((xmlSchemaAttributePtr) (attr->attrDecl))->targetNamespace;
+    name_str = ((xmlSchemaAttributePtr) (attr->attrDecl))->name;
+  }
+  rb_iv_set(result, "@target_namespace", QNIL_OR_STRING(tns_str));
+  rb_iv_set(result, "@name", QNIL_OR_STRING(name_str));
+  rb_iv_set(result, "@type", rxml_wrap_schema_type((xmlSchemaTypePtr)attr->attrDecl->subtypes));
+  rb_iv_set(result, "@value", QNIL_OR_STRING(attr->defValue));
+  rb_iv_set(result, "@occurs", INT2NUM(attr->occurs));
+
+  return result;
+}
+
+static VALUE rxml_schema_attribute_node(VALUE self)
+{
+  xmlSchemaAttributeUsePtr attr;
+
+  Data_Get_Struct(self, xmlSchemaAttributeUse, attr);
+
+  return rxml_node_wrap(attr->node);
+}
+
+void rxml_init_schema_attribute(void)
+{
+  cXMLSchemaAttribute = rb_define_class_under(cXMLSchema, "Attribute", rb_cObject);
+  rb_undef_alloc_func(cXMLSchemaAttribute);
+  rb_define_attr(cXMLSchemaAttribute, "name", 1, 0);
+  rb_define_attr(cXMLSchemaAttribute, "type", 1, 0);
+  rb_define_attr(cXMLSchemaAttribute, "namespace", 1, 0);
+  rb_define_attr(cXMLSchemaAttribute, "value", 1, 0);
+  rb_define_attr(cXMLSchemaAttribute, "occurs", 1, 0);
+
+  rb_define_method(cXMLSchemaAttribute, "node", rxml_schema_attribute_node, 0);
+}

data/ext/libxml/ruby_xml_schema_element.c

@@ -1,69 +1,70 @@
-#include "ruby_libxml.h"
-#include "ruby_xml_schema_element.h"
-#include "ruby_xml_schema_type.h"
-
-VALUE cXMLSchemaElement;
-
-static void rxml_schema_element_free(xmlSchemaElementPtr xschema_element)
-{
-  xschema_element = NULL;
-  xmlFree(xschema_element);
-}
-
-VALUE rxml_wrap_schema_element(xmlSchemaElementPtr xelem)
-{
-  VALUE result;
-
-  if (!xelem)
-    rb_raise(rb_eArgError, "XML::Schema::Element is required!");
-
-  result = Data_Wrap_Struct(cXMLSchemaElement, NULL, rxml_schema_element_free, xelem);
-
-  rb_iv_set(result, "@name", QNIL_OR_STRING(xelem->name));
-  rb_iv_set(result, "@value", QNIL_OR_STRING(xelem->value));
-  rb_iv_set(result, "@namespace", QNIL_OR_STRING(xelem->targetNamespace));
-  rb_iv_set(result, "@type", rxml_wrap_schema_type((xmlSchemaTypePtr) (xelem->subtypes)));
-
-  return result;
-}
-
-static VALUE rxml_schema_element_node(VALUE self)
-{
-  xmlSchemaElementPtr xelem;
-
-  Data_Get_Struct(self, xmlSchemaElement, xelem);
-
-  return rxml_node_wrap(xelem->node);
-}
-
-static VALUE rxml_schema_element_annot(VALUE self)
-{
-  xmlSchemaElementPtr xelem;
-  VALUE annotation = Qnil;
-
-  Data_Get_Struct(self, xmlSchemaElement, xelem);
-
-  if ((xelem->annot != NULL) && (xelem->annot->content != NULL))
-  {
-    xmlChar *content = xmlNodeGetContent(xelem->annot->content);
-    if (content)
-    {
-      annotation = rxml_new_cstr(content, NULL);
-      xmlFree(content);
-    }
-  }
-
-  return annotation;
-}
-
-void rxml_init_schema_element(void)
-{
-  cXMLSchemaElement = rb_define_class_under(cXMLSchema, "Element", rb_cObject);
-  rb_define_attr(cXMLSchemaElement, "name", 1, 0);
-  rb_define_attr(cXMLSchemaElement, "value", 1, 0);
-  rb_define_attr(cXMLSchemaElement, "namespace", 1, 0);
-  rb_define_attr(cXMLSchemaElement, "type", 1, 0);
-
-  rb_define_method(cXMLSchemaElement, "node", rxml_schema_element_node, 0);
-  rb_define_method(cXMLSchemaElement, "annotation", rxml_schema_element_annot, 0);
-}
+#include "ruby_libxml.h"
+#include "ruby_xml_schema_element.h"
+#include "ruby_xml_schema_type.h"
+
+VALUE cXMLSchemaElement;
+
+static void rxml_schema_element_free(xmlSchemaElementPtr xschema_element)
+{
+  xschema_element = NULL;
+  xmlFree(xschema_element);
+}
+
+VALUE rxml_wrap_schema_element(xmlSchemaElementPtr xelem)
+{
+  VALUE result;
+
+  if (!xelem)
+    rb_raise(rb_eArgError, "XML::Schema::Element is required!");
+
+  result = Data_Wrap_Struct(cXMLSchemaElement, NULL, rxml_schema_element_free, xelem);
+
+  rb_iv_set(result, "@name", QNIL_OR_STRING(xelem->name));
+  rb_iv_set(result, "@value", QNIL_OR_STRING(xelem->value));
+  rb_iv_set(result, "@namespace", QNIL_OR_STRING(xelem->targetNamespace));
+  rb_iv_set(result, "@type", rxml_wrap_schema_type((xmlSchemaTypePtr) (xelem->subtypes)));
+
+  return result;
+}
+
+static VALUE rxml_schema_element_node(VALUE self)
+{
+  xmlSchemaElementPtr xelem;
+
+  Data_Get_Struct(self, xmlSchemaElement, xelem);
+
+  return rxml_node_wrap(xelem->node);
+}
+
+static VALUE rxml_schema_element_annot(VALUE self)
+{
+  xmlSchemaElementPtr xelem;
+  VALUE annotation = Qnil;
+
+  Data_Get_Struct(self, xmlSchemaElement, xelem);
+
+  if ((xelem->annot != NULL) && (xelem->annot->content != NULL))
+  {
+    xmlChar *content = xmlNodeGetContent(xelem->annot->content);
+    if (content)
+    {
+      annotation = rxml_new_cstr(content, NULL);
+      xmlFree(content);
+    }
+  }
+
+  return annotation;
+}
+
+void rxml_init_schema_element(void)
+{
+  cXMLSchemaElement = rb_define_class_under(cXMLSchema, "Element", rb_cObject);
+  rb_undef_alloc_func(cXMLSchemaElement);
+  rb_define_attr(cXMLSchemaElement, "name", 1, 0);
+  rb_define_attr(cXMLSchemaElement, "value", 1, 0);
+  rb_define_attr(cXMLSchemaElement, "namespace", 1, 0);
+  rb_define_attr(cXMLSchemaElement, "type", 1, 0);
+
+  rb_define_method(cXMLSchemaElement, "node", rxml_schema_element_node, 0);
+  rb_define_method(cXMLSchemaElement, "annotation", rxml_schema_element_annot, 0);
+}