Skip to content
Snippets Groups Projects
Commit 22e1bbde authored by Richard Schwarting's avatar Richard Schwarting
Browse files

* update the libxml-2.0.vapi file to include changes in the upstream one

parent 4c54f3da
Branches
Tags
No related merge requests found
...@@ -191,7 +191,7 @@ namespace Xml { ...@@ -191,7 +191,7 @@ namespace Xml {
public static Doc* read_memory (string text, int len, string? url = null, string? encoding = null, int options = 0); public static Doc* read_memory (string text, int len, string? url = null, string? encoding = null, int options = 0);
} }
[CCode (cname = "xmlParserOption", cprefix = "XML_PARSE_", cheader_filename = "libxml/parser.h")] [CCode (cname = "xmlParserOption", cprefix = "XML_PARSE_", cheader_filename = "libxml/parser.h", has_type_id = false)]
public enum ParserOption { public enum ParserOption {
RECOVER, RECOVER,
NOENT, NOENT,
...@@ -212,7 +212,7 @@ namespace Xml { ...@@ -212,7 +212,7 @@ namespace Xml {
COMPACT, COMPACT,
} }
[CCode (cname = "xmlCharEncoding", cprefix = "XML_CHAR_ENCODING_", cheader_filename = "libxml/encoding.h")] [CCode (cname = "xmlCharEncoding", cprefix = "XML_CHAR_ENCODING_", cheader_filename = "libxml/encoding.h", has_type_id = false)]
public enum CharEncoding { public enum CharEncoding {
ERROR, ERROR,
NONE, NONE,
...@@ -300,7 +300,7 @@ namespace Xml { ...@@ -300,7 +300,7 @@ namespace Xml {
public weak string elem; public weak string elem;
} }
[CCode (cname = "xmlAttributeDefault", cprefix = "XML_ATTRIBUTE_", cheader_filename = "libxml/tree.h")] [CCode (cname = "xmlAttributeDefault", cprefix = "XML_ATTRIBUTE_", cheader_filename = "libxml/tree.h", has_type_id = false)]
public enum AttributeDefault { public enum AttributeDefault {
NONE, NONE,
REQUIRED, REQUIRED,
...@@ -308,7 +308,7 @@ namespace Xml { ...@@ -308,7 +308,7 @@ namespace Xml {
FIXED FIXED
} }
[CCode (cname = "xmlAttributeType", cprefix = "XML_ATTRIBUTE_", cheader_filename = "libxml/tree.h")] [CCode (cname = "xmlAttributeType", cprefix = "XML_ATTRIBUTE_", cheader_filename = "libxml/tree.h", has_type_id = false)]
public enum AttributeType { public enum AttributeType {
CDATA, CDATA,
ID, ID,
...@@ -352,6 +352,7 @@ namespace Xml { ...@@ -352,6 +352,7 @@ namespace Xml {
public Dtd* int_subset; public Dtd* int_subset;
[CCode (cname = "extSubset")] [CCode (cname = "extSubset")]
public Dtd* ext_subset; public Dtd* ext_subset;
[CCode (cname = "oldNs")]
public Ns* old_ns; public Ns* old_ns;
public weak string version; public weak string version;
public weak string encoding; public weak string encoding;
...@@ -366,11 +367,7 @@ namespace Xml { ...@@ -366,11 +367,7 @@ namespace Xml {
public Dtd* create_int_subset (string name, string external_id, string system_id); public Dtd* create_int_subset (string name, string external_id, string system_id);
[CCode (cname = "xmlDocDump", instance_pos = -1)] [CCode (cname = "xmlDocDump", instance_pos = -1)]
#if POSIX
public int dump (Posix.FILE f);
#else
public int dump (GLib.FileStream f); public int dump (GLib.FileStream f);
#endif
[CCode (cname = "xmlDocDumpFormatMemory")] [CCode (cname = "xmlDocDumpFormatMemory")]
public void dump_memory_format (out string mem, out int len = null, bool format = true); public void dump_memory_format (out string mem, out int len = null, bool format = true);
...@@ -398,11 +395,7 @@ namespace Xml { ...@@ -398,11 +395,7 @@ namespace Xml {
public Node* set_root_element(Node* root); public Node* set_root_element(Node* root);
[CCode (cname = "xmlElemDump", instance_pos = 1.1)] [CCode (cname = "xmlElemDump", instance_pos = 1.1)]
#if POSIX
public void elem_dump (Posix.FILE f, Node* cur);
#else
public void elem_dump (GLib.FileStream f, Node* cur); public void elem_dump (GLib.FileStream f, Node* cur);
#endif
[CCode (cname = "xmlGetDocCompressMode")] [CCode (cname = "xmlGetDocCompressMode")]
public int get_compress_mode (); public int get_compress_mode ();
...@@ -516,7 +509,7 @@ namespace Xml { ...@@ -516,7 +509,7 @@ namespace Xml {
public weak string prefix; public weak string prefix;
} }
[CCode (cname = "xmlElementType", cprefix = "XML_", cheader_filename = "libxml/tree.h")] [CCode (cname = "xmlElementType", cprefix = "XML_", cheader_filename = "libxml/tree.h", has_type_id = false)]
public enum ElementType { public enum ElementType {
ELEMENT_NODE, ELEMENT_NODE,
ATTRIBUTE_NODE, ATTRIBUTE_NODE,
...@@ -556,7 +549,7 @@ namespace Xml { ...@@ -556,7 +549,7 @@ namespace Xml {
public const string prefix; public const string prefix;
} }
[CCode (cname = "xmlElementContentType", cprefix = "XML_ELEMENT_CONTENT_", cheader_filename = "libxml/tree.h")] [CCode (cname = "xmlElementContentType", cprefix = "XML_ELEMENT_CONTENT_", cheader_filename = "libxml/tree.h", has_type_id = false)]
public enum ElementContentType { public enum ElementContentType {
PCDATA, PCDATA,
ELEMENT, ELEMENT,
...@@ -564,7 +557,7 @@ namespace Xml { ...@@ -564,7 +557,7 @@ namespace Xml {
OR OR
} }
[CCode (cname = "xmlElementContentOccur", cprefix = "XML_ELEMENT_CONTENT_", cheader_filename = "libxml/tree.h")] [CCode (cname = "xmlElementContentOccur", cprefix = "XML_ELEMENT_CONTENT_", cheader_filename = "libxml/tree.h", has_type_id = false)]
public enum ElementContentOccur { public enum ElementContentOccur {
ONCE, ONCE,
OPT, OPT,
...@@ -599,7 +592,7 @@ namespace Xml { ...@@ -599,7 +592,7 @@ namespace Xml {
public int checked; public int checked;
} }
[CCode (cname = "xmlEntityType", cprefix = "XML_", cheader_filename = "libxml/tree.h")] [CCode (cname = "xmlEntityType", cprefix = "XML_", cheader_filename = "libxml/tree.h", has_type_id = false)]
public enum EntityType { public enum EntityType {
INTERNAL_GENERAL_ENTITY, INTERNAL_GENERAL_ENTITY,
EXTERNAL_GENERAL_PARSED_ENTITY, EXTERNAL_GENERAL_PARSED_ENTITY,
...@@ -934,11 +927,7 @@ namespace Xml { ...@@ -934,11 +927,7 @@ namespace Xml {
public static string path_to_uri (string path); public static string path_to_uri (string path);
[CCode (cname = "xmlPrintURI", instance_pos = -1)] [CCode (cname = "xmlPrintURI", instance_pos = -1)]
#if POSIX
public void print (Posix.FILE stream);
#else
public void print (GLib.FileStream stream); public void print (GLib.FileStream stream);
#endif
[CCode (cname = "xmlSaveUri")] [CCode (cname = "xmlSaveUri")]
public string save (); public string save ();
...@@ -1010,11 +999,11 @@ namespace Xml { ...@@ -1010,11 +999,11 @@ namespace Xml {
[Compact] [Compact]
[CCode (cname = "xmlSaveCtxt", free_function = "xmlSaveClose", cheader_filename = "libxml/xmlsave.h")] [CCode (cname = "xmlSaveCtxt", free_function = "xmlSaveClose", cheader_filename = "libxml/xmlsave.h")]
public class SaveCtxt { public class SaveCtxt {
[CCode (cname = "xmlSaveToIO")] // , instance_pos = -1)] [CCode (cname = "xmlSaveToIO")]
public SaveCtxt.to_io (OutputWriteCallback iowrite, OutputCloseCallback ioclose, void * ioctx, string? encoding, int options = 0); public SaveCtxt.to_io (OutputWriteCallback iowrite, OutputCloseCallback ioclose, void * ioctx = null, string? encoding = null, int options = 0);
// [CCode (cname = "xmlSaveClose")] [CCode (cname = "xmlSaveClose")]
// public int close (); public int close ();
[CCode (cname = "xmlSaveFlush")] [CCode (cname = "xmlSaveFlush")]
public int flush (); public int flush ();
[CCode (cname = "xmlSaveDoc")] [CCode (cname = "xmlSaveDoc")]
...@@ -1128,7 +1117,7 @@ namespace Xml { ...@@ -1128,7 +1117,7 @@ namespace Xml {
/* xmlreader - the XMLReader implementation */ /* xmlreader - the XMLReader implementation */
[CCode (cname = "xmlParserProperties", cprefix = "XML_PARSER_", cheader_filename = "libxml/xmlreader.h")] [CCode (cname = "xmlParserProperties", cprefix = "XML_PARSER_", cheader_filename = "libxml/xmlreader.h", has_type_id = false)]
public enum ParserProperties { public enum ParserProperties {
LOADDTD, LOADDTD,
DEFAULTATTRS, DEFAULTATTRS,
...@@ -1136,7 +1125,7 @@ namespace Xml { ...@@ -1136,7 +1125,7 @@ namespace Xml {
SUBST_ENTITIES SUBST_ENTITIES
} }
[CCode (cname = "xmlParserSeverities", cprefix = "XML_PARSER_SEVERITY_", cheader_filename = "libxml/xmlreader.h")] [CCode (cname = "xmlParserSeverities", cprefix = "XML_PARSER_SEVERITY_", cheader_filename = "libxml/xmlreader.h", has_type_id = false)]
public enum ParserSeverities { public enum ParserSeverities {
VALIDITY_WARNING, VALIDITY_WARNING,
VALIDITY_ERROR, VALIDITY_ERROR,
...@@ -1144,7 +1133,7 @@ namespace Xml { ...@@ -1144,7 +1133,7 @@ namespace Xml {
ERROR ERROR
} }
[CCode (cname = "xmlReaderTypes", cheader_filename = "libxml/xmlreader.h")] [CCode (cname = "xmlReaderTypes", cheader_filename = "libxml/xmlreader.h", has_type_id = false)]
public enum ReaderType { public enum ReaderType {
NONE, NONE,
ELEMENT, ELEMENT,
...@@ -1400,7 +1389,7 @@ namespace Xml { ...@@ -1400,7 +1389,7 @@ namespace Xml {
public class TextReaderLocator { public class TextReaderLocator {
} }
[CCode (cname = "xmlTextReaderMode", cprefix = "XML_TEXTREADER_MODE_", cheader_filename = "libxml/xmlreader.h")] [CCode (cname = "xmlTextReaderMode", cprefix = "XML_TEXTREADER_MODE_", cheader_filename = "libxml/xmlreader.h", has_type_id = false)]
public enum TextReaderMode { public enum TextReaderMode {
INITIAL, INITIAL,
INTERACTIVE, INTERACTIVE,
...@@ -1456,7 +1445,7 @@ namespace Xml { ...@@ -1456,7 +1445,7 @@ namespace Xml {
public Context (Doc* doc); public Context (Doc* doc);
} }
[CCode (cname = "xmlXPathError", cprefix = "XPATH_", cheader_filename = "libxml/xpath.h")] [CCode (cname = "xmlXPathError", cprefix = "XPATH_", cheader_filename = "libxml/xpath.h", has_type_id = false)]
public enum Error { public enum Error {
EXPRESSION_OK, EXPRESSION_OK,
NUMBER_ERROR, NUMBER_ERROR,
...@@ -1500,7 +1489,7 @@ namespace Xml { ...@@ -1500,7 +1489,7 @@ namespace Xml {
public int index2; public int index2;
} }
[CCode (cname = "xmlXPathObjectType", cprefix = "XPATH_", cheader_filename = "libxml/xpath.h")] [CCode (cname = "xmlXPathObjectType", cprefix = "XPATH_", cheader_filename = "libxml/xpath.h", has_type_id = false)]
public enum ObjectType { public enum ObjectType {
UNDEFINED, UNDEFINED,
NODESET, NODESET,
...@@ -1694,7 +1683,7 @@ namespace Xml { ...@@ -1694,7 +1683,7 @@ namespace Xml {
public void* node; public void* node;
} }
[CCode (cname = "xmlErrorLevel", cprefix = "XML_ERR_", cheader_filename = "libxml/xmlerror.h")] [CCode (cname = "xmlErrorLevel", cprefix = "XML_ERR_", cheader_filename = "libxml/xmlerror.h", has_type_id = false)]
public enum ErrorLevel { public enum ErrorLevel {
NONE = 0, NONE = 0,
WARNING = 1, WARNING = 1,
...@@ -1720,7 +1709,7 @@ namespace Html { ...@@ -1720,7 +1709,7 @@ namespace Html {
[CCode (cname = "htmlHandleOmittedElem", cheader_filename = "libxml/HTMLparser.h")] [CCode (cname = "htmlHandleOmittedElem", cheader_filename = "libxml/HTMLparser.h")]
public static bool handle_omitted_elem (bool val); public static bool handle_omitted_elem (bool val);
[CCode (cname = "htmlParserOption", cprefix = "HTML_PARSE_", cheader_filename = "libxml/HTMLparser.h")] [CCode (cname = "htmlParserOption", cprefix = "HTML_PARSE_", cheader_filename = "libxml/HTMLparser.h", has_type_id = false)]
public enum ParserOption { public enum ParserOption {
RECOVER, RECOVER,
NOERROR, NOERROR,
...@@ -1731,7 +1720,7 @@ namespace Html { ...@@ -1731,7 +1720,7 @@ namespace Html {
COMPACT, COMPACT,
} }
[CCode (cname = "htmlStatus", cprefix = "HTML_", cheader_filename = "libxml/HTMLparser.h")] [CCode (cname = "htmlStatus", cprefix = "HTML_", cheader_filename = "libxml/HTMLparser.h", has_type_id = false)]
public enum Status { public enum Status {
NA, NA,
INVALID, INVALID,
...@@ -1790,28 +1779,16 @@ namespace Html { ...@@ -1790,28 +1779,16 @@ namespace Html {
public void dump_memory_format (out string mem, out int len = null, bool format = true); public void dump_memory_format (out string mem, out int len = null, bool format = true);
[CCode (cname = "htmlDocDump", instance_pos = -1)] [CCode (cname = "htmlDocDump", instance_pos = -1)]
#if POSIX
public int dump (Posix.FILE f);
#else
public int dump (GLib.FileStream f); public int dump (GLib.FileStream f);
#endif
[CCode (cname = "htmlSaveFile", instance_pos = -1)] [CCode (cname = "htmlSaveFile", instance_pos = -1)]
public int save_file (string filename); public int save_file (string filename);
[CCode (cname = "htmlNodeDumpFile", instance_pos = 1.1)] [CCode (cname = "htmlNodeDumpFile", instance_pos = 1.1)]
#if POSIX
public int node_dump_file (Posix.FILE file, Xml.Node* node);
#else
public int node_dump_file (GLib.FileStream file, Xml.Node* node); public int node_dump_file (GLib.FileStream file, Xml.Node* node);
#endif
[CCode (cname = "htmlNodeDumpFileFormat", instance_pos = 1.1)] [CCode (cname = "htmlNodeDumpFileFormat", instance_pos = 1.1)]
#if POSIX
public int node_dump_file_format (Posix.FILE file, string enc = "UTF-8", bool format = true);
#else
public int node_dump_file_format (GLib.FileStream file, string enc = "UTF-8", bool format = true); public int node_dump_file_format (GLib.FileStream file, string enc = "UTF-8", bool format = true);
#endif
[CCode (cname = "htmlSaveFileEnc", instance_pos = 1.1)] [CCode (cname = "htmlSaveFileEnc", instance_pos = 1.1)]
public int save_file_enc (string filename, string enc = "UTF-8"); public int save_file_enc (string filename, string enc = "UTF-8");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment