nokogiri 1.14.3-x86_64-darwin → 1.15.0-x86_64-darwin

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of nokogiri might be problematic. Click here for more details.

Files changed (113) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +9 -8
  3. data/dependencies.yml +6 -6
  4. data/ext/nokogiri/extconf.rb +66 -22
  5. data/ext/nokogiri/html4_document.c +1 -2
  6. data/ext/nokogiri/html4_element_description.c +19 -14
  7. data/ext/nokogiri/html4_sax_parser_context.c +10 -16
  8. data/ext/nokogiri/html4_sax_push_parser.c +2 -2
  9. data/ext/nokogiri/include/libexslt/exsltconfig.h +3 -3
  10. data/ext/nokogiri/include/libxml2/libxml/HTMLparser.h +52 -38
  11. data/ext/nokogiri/include/libxml2/libxml/HTMLtree.h +18 -18
  12. data/ext/nokogiri/include/libxml2/libxml/SAX.h +36 -36
  13. data/ext/nokogiri/include/libxml2/libxml/SAX2.h +37 -36
  14. data/ext/nokogiri/include/libxml2/libxml/c14n.h +4 -4
  15. data/ext/nokogiri/include/libxml2/libxml/catalog.h +36 -36
  16. data/ext/nokogiri/include/libxml2/libxml/chvalid.h +9 -9
  17. data/ext/nokogiri/include/libxml2/libxml/debugXML.h +28 -28
  18. data/ext/nokogiri/include/libxml2/libxml/dict.h +13 -13
  19. data/ext/nokogiri/include/libxml2/libxml/encoding.h +20 -19
  20. data/ext/nokogiri/include/libxml2/libxml/entities.h +19 -21
  21. data/ext/nokogiri/include/libxml2/libxml/globals.h +89 -59
  22. data/ext/nokogiri/include/libxml2/libxml/hash.h +25 -25
  23. data/ext/nokogiri/include/libxml2/libxml/list.h +26 -26
  24. data/ext/nokogiri/include/libxml2/libxml/nanoftp.h +22 -22
  25. data/ext/nokogiri/include/libxml2/libxml/nanohttp.h +17 -17
  26. data/ext/nokogiri/include/libxml2/libxml/parser.h +100 -79
  27. data/ext/nokogiri/include/libxml2/libxml/parserInternals.h +149 -143
  28. data/ext/nokogiri/include/libxml2/libxml/pattern.h +15 -15
  29. data/ext/nokogiri/include/libxml2/libxml/relaxng.h +26 -26
  30. data/ext/nokogiri/include/libxml2/libxml/schemasInternals.h +2 -2
  31. data/ext/nokogiri/include/libxml2/libxml/schematron.h +18 -18
  32. data/ext/nokogiri/include/libxml2/libxml/threads.h +23 -20
  33. data/ext/nokogiri/include/libxml2/libxml/tree.h +166 -164
  34. data/ext/nokogiri/include/libxml2/libxml/uri.h +15 -15
  35. data/ext/nokogiri/include/libxml2/libxml/valid.h +72 -87
  36. data/ext/nokogiri/include/libxml2/libxml/xinclude.h +10 -10
  37. data/ext/nokogiri/include/libxml2/libxml/xlink.h +5 -5
  38. data/ext/nokogiri/include/libxml2/libxml/xmlIO.h +60 -59
  39. data/ext/nokogiri/include/libxml2/libxml/xmlautomata.h +21 -21
  40. data/ext/nokogiri/include/libxml2/libxml/xmlerror.h +18 -46
  41. data/ext/nokogiri/include/libxml2/libxml/xmlexports.h +14 -41
  42. data/ext/nokogiri/include/libxml2/libxml/xmlmemory.h +26 -24
  43. data/ext/nokogiri/include/libxml2/libxml/xmlmodule.h +4 -4
  44. data/ext/nokogiri/include/libxml2/libxml/xmlreader.h +87 -87
  45. data/ext/nokogiri/include/libxml2/libxml/xmlregexp.h +30 -30
  46. data/ext/nokogiri/include/libxml2/libxml/xmlsave.h +10 -10
  47. data/ext/nokogiri/include/libxml2/libxml/xmlschemas.h +30 -30
  48. data/ext/nokogiri/include/libxml2/libxml/xmlschemastypes.h +34 -34
  49. data/ext/nokogiri/include/libxml2/libxml/xmlstring.h +30 -30
  50. data/ext/nokogiri/include/libxml2/libxml/xmlunicode.h +166 -166
  51. data/ext/nokogiri/include/libxml2/libxml/xmlversion.h +50 -27
  52. data/ext/nokogiri/include/libxml2/libxml/xmlwriter.h +80 -80
  53. data/ext/nokogiri/include/libxml2/libxml/xpath.h +41 -41
  54. data/ext/nokogiri/include/libxml2/libxml/xpathInternals.h +117 -117
  55. data/ext/nokogiri/include/libxml2/libxml/xpointer.h +21 -21
  56. data/ext/nokogiri/include/libxslt/attributes.h +1 -0
  57. data/ext/nokogiri/include/libxslt/variables.h +3 -3
  58. data/ext/nokogiri/include/libxslt/xsltInternals.h +14 -4
  59. data/ext/nokogiri/include/libxslt/xsltconfig.h +4 -4
  60. data/ext/nokogiri/include/libxslt/xsltlocale.h +14 -54
  61. data/ext/nokogiri/include/libxslt/xsltutils.h +35 -2
  62. data/ext/nokogiri/nokogiri.c +46 -24
  63. data/ext/nokogiri/nokogiri.h +13 -2
  64. data/ext/nokogiri/xml_attr.c +1 -1
  65. data/ext/nokogiri/xml_cdata.c +10 -2
  66. data/ext/nokogiri/xml_comment.c +1 -1
  67. data/ext/nokogiri/xml_document.c +102 -22
  68. data/ext/nokogiri/xml_document_fragment.c +1 -1
  69. data/ext/nokogiri/xml_dtd.c +1 -1
  70. data/ext/nokogiri/xml_element_content.c +32 -29
  71. data/ext/nokogiri/xml_element_decl.c +5 -5
  72. data/ext/nokogiri/xml_encoding_handler.c +12 -4
  73. data/ext/nokogiri/xml_entity_reference.c +1 -1
  74. data/ext/nokogiri/xml_namespace.c +11 -12
  75. data/ext/nokogiri/xml_node.c +7 -7
  76. data/ext/nokogiri/xml_node_set.c +125 -105
  77. data/ext/nokogiri/xml_processing_instruction.c +1 -1
  78. data/ext/nokogiri/xml_reader.c +37 -28
  79. data/ext/nokogiri/xml_relax_ng.c +65 -78
  80. data/ext/nokogiri/xml_sax_parser.c +24 -5
  81. data/ext/nokogiri/xml_sax_parser_context.c +46 -25
  82. data/ext/nokogiri/xml_sax_push_parser.c +29 -8
  83. data/ext/nokogiri/xml_schema.c +90 -116
  84. data/ext/nokogiri/xml_text.c +10 -2
  85. data/ext/nokogiri/xml_xpath_context.c +156 -83
  86. data/ext/nokogiri/xslt_stylesheet.c +103 -50
  87. data/lib/nokogiri/2.7/nokogiri.bundle +0 -0
  88. data/lib/nokogiri/3.0/nokogiri.bundle +0 -0
  89. data/lib/nokogiri/3.1/nokogiri.bundle +0 -0
  90. data/lib/nokogiri/3.2/nokogiri.bundle +0 -0
  91. data/lib/nokogiri/css/xpath_visitor.rb +2 -2
  92. data/lib/nokogiri/extension.rb +1 -1
  93. data/lib/nokogiri/html4/document_fragment.rb +1 -1
  94. data/lib/nokogiri/html4/element_description_defaults.rb +1821 -353
  95. data/lib/nokogiri/html5/document_fragment.rb +1 -1
  96. data/lib/nokogiri/html5/node.rb +5 -0
  97. data/lib/nokogiri/html5.rb +5 -2
  98. data/lib/nokogiri/jruby/nokogiri_jars.rb +6 -6
  99. data/lib/nokogiri/version/constant.rb +1 -1
  100. data/lib/nokogiri/xml/attribute_decl.rb +4 -2
  101. data/lib/nokogiri/xml/document_fragment.rb +1 -1
  102. data/lib/nokogiri/xml/element_content.rb +10 -2
  103. data/lib/nokogiri/xml/element_decl.rb +4 -2
  104. data/lib/nokogiri/xml/entity_decl.rb +4 -2
  105. data/lib/nokogiri/xml/node/save_options.rb +8 -0
  106. data/lib/nokogiri/xml/node.rb +22 -13
  107. data/lib/nokogiri/xml/pp/node.rb +23 -12
  108. data/lib/nokogiri/xml/sax/document.rb +1 -1
  109. data/lib/nokogiri/xml/searchable.rb +18 -10
  110. data/lib/nokogiri/xslt.rb +73 -3
  111. data/lib/nokogiri.rb +12 -4
  112. data/lib/xsd/xmlparser/nokogiri.rb +1 -1
  113. metadata +2 -2
@@ -80,52 +80,52 @@ typedef void (*ftpDataCallback) (void *userData,
80
80
  * Init
81
81
  */
82
82
  XML_DEPRECATED
83
- XMLPUBFUN void XMLCALL
83
+ XMLPUBFUN void
84
84
  xmlNanoFTPInit (void);
85
85
  XML_DEPRECATED
86
- XMLPUBFUN void XMLCALL
86
+ XMLPUBFUN void
87
87
  xmlNanoFTPCleanup (void);
88
88
 
89
89
  /*
90
90
  * Creating/freeing contexts.
91
91
  */
92
92
  XML_DEPRECATED
93
- XMLPUBFUN void * XMLCALL
93
+ XMLPUBFUN void *
94
94
  xmlNanoFTPNewCtxt (const char *URL);
95
95
  XML_DEPRECATED
96
- XMLPUBFUN void XMLCALL
96
+ XMLPUBFUN void
97
97
  xmlNanoFTPFreeCtxt (void * ctx);
98
98
  XML_DEPRECATED
99
- XMLPUBFUN void * XMLCALL
99
+ XMLPUBFUN void *
100
100
  xmlNanoFTPConnectTo (const char *server,
101
101
  int port);
102
102
  /*
103
103
  * Opening/closing session connections.
104
104
  */
105
105
  XML_DEPRECATED
106
- XMLPUBFUN void * XMLCALL
106
+ XMLPUBFUN void *
107
107
  xmlNanoFTPOpen (const char *URL);
108
108
  XML_DEPRECATED
109
- XMLPUBFUN int XMLCALL
109
+ XMLPUBFUN int
110
110
  xmlNanoFTPConnect (void *ctx);
111
111
  XML_DEPRECATED
112
- XMLPUBFUN int XMLCALL
112
+ XMLPUBFUN int
113
113
  xmlNanoFTPClose (void *ctx);
114
114
  XML_DEPRECATED
115
- XMLPUBFUN int XMLCALL
115
+ XMLPUBFUN int
116
116
  xmlNanoFTPQuit (void *ctx);
117
117
  XML_DEPRECATED
118
- XMLPUBFUN void XMLCALL
118
+ XMLPUBFUN void
119
119
  xmlNanoFTPScanProxy (const char *URL);
120
120
  XML_DEPRECATED
121
- XMLPUBFUN void XMLCALL
121
+ XMLPUBFUN void
122
122
  xmlNanoFTPProxy (const char *host,
123
123
  int port,
124
124
  const char *user,
125
125
  const char *passwd,
126
126
  int type);
127
127
  XML_DEPRECATED
128
- XMLPUBFUN int XMLCALL
128
+ XMLPUBFUN int
129
129
  xmlNanoFTPUpdateURL (void *ctx,
130
130
  const char *URL);
131
131
 
@@ -133,48 +133,48 @@ XMLPUBFUN int XMLCALL
133
133
  * Rather internal commands.
134
134
  */
135
135
  XML_DEPRECATED
136
- XMLPUBFUN int XMLCALL
136
+ XMLPUBFUN int
137
137
  xmlNanoFTPGetResponse (void *ctx);
138
138
  XML_DEPRECATED
139
- XMLPUBFUN int XMLCALL
139
+ XMLPUBFUN int
140
140
  xmlNanoFTPCheckResponse (void *ctx);
141
141
 
142
142
  /*
143
143
  * CD/DIR/GET handlers.
144
144
  */
145
145
  XML_DEPRECATED
146
- XMLPUBFUN int XMLCALL
146
+ XMLPUBFUN int
147
147
  xmlNanoFTPCwd (void *ctx,
148
148
  const char *directory);
149
149
  XML_DEPRECATED
150
- XMLPUBFUN int XMLCALL
150
+ XMLPUBFUN int
151
151
  xmlNanoFTPDele (void *ctx,
152
152
  const char *file);
153
153
 
154
154
  XML_DEPRECATED
155
- XMLPUBFUN SOCKET XMLCALL
155
+ XMLPUBFUN SOCKET
156
156
  xmlNanoFTPGetConnection (void *ctx);
157
157
  XML_DEPRECATED
158
- XMLPUBFUN int XMLCALL
158
+ XMLPUBFUN int
159
159
  xmlNanoFTPCloseConnection(void *ctx);
160
160
  XML_DEPRECATED
161
- XMLPUBFUN int XMLCALL
161
+ XMLPUBFUN int
162
162
  xmlNanoFTPList (void *ctx,
163
163
  ftpListCallback callback,
164
164
  void *userData,
165
165
  const char *filename);
166
166
  XML_DEPRECATED
167
- XMLPUBFUN SOCKET XMLCALL
167
+ XMLPUBFUN SOCKET
168
168
  xmlNanoFTPGetSocket (void *ctx,
169
169
  const char *filename);
170
170
  XML_DEPRECATED
171
- XMLPUBFUN int XMLCALL
171
+ XMLPUBFUN int
172
172
  xmlNanoFTPGet (void *ctx,
173
173
  ftpDataCallback callback,
174
174
  void *userData,
175
175
  const char *filename);
176
176
  XML_DEPRECATED
177
- XMLPUBFUN int XMLCALL
177
+ XMLPUBFUN int
178
178
  xmlNanoFTPRead (void *ctx,
179
179
  void *dest,
180
180
  int len);
@@ -18,24 +18,24 @@
18
18
  #ifdef __cplusplus
19
19
  extern "C" {
20
20
  #endif
21
- XMLPUBFUN void XMLCALL
21
+ XMLPUBFUN void
22
22
  xmlNanoHTTPInit (void);
23
- XMLPUBFUN void XMLCALL
23
+ XMLPUBFUN void
24
24
  xmlNanoHTTPCleanup (void);
25
- XMLPUBFUN void XMLCALL
25
+ XMLPUBFUN void
26
26
  xmlNanoHTTPScanProxy (const char *URL);
27
- XMLPUBFUN int XMLCALL
27
+ XMLPUBFUN int
28
28
  xmlNanoHTTPFetch (const char *URL,
29
29
  const char *filename,
30
30
  char **contentType);
31
- XMLPUBFUN void * XMLCALL
31
+ XMLPUBFUN void *
32
32
  xmlNanoHTTPMethod (const char *URL,
33
33
  const char *method,
34
34
  const char *input,
35
35
  char **contentType,
36
36
  const char *headers,
37
37
  int ilen);
38
- XMLPUBFUN void * XMLCALL
38
+ XMLPUBFUN void *
39
39
  xmlNanoHTTPMethodRedir (const char *URL,
40
40
  const char *method,
41
41
  const char *input,
@@ -43,35 +43,35 @@ XMLPUBFUN void * XMLCALL
43
43
  char **redir,
44
44
  const char *headers,
45
45
  int ilen);
46
- XMLPUBFUN void * XMLCALL
46
+ XMLPUBFUN void *
47
47
  xmlNanoHTTPOpen (const char *URL,
48
48
  char **contentType);
49
- XMLPUBFUN void * XMLCALL
49
+ XMLPUBFUN void *
50
50
  xmlNanoHTTPOpenRedir (const char *URL,
51
51
  char **contentType,
52
52
  char **redir);
53
- XMLPUBFUN int XMLCALL
53
+ XMLPUBFUN int
54
54
  xmlNanoHTTPReturnCode (void *ctx);
55
- XMLPUBFUN const char * XMLCALL
55
+ XMLPUBFUN const char *
56
56
  xmlNanoHTTPAuthHeader (void *ctx);
57
- XMLPUBFUN const char * XMLCALL
57
+ XMLPUBFUN const char *
58
58
  xmlNanoHTTPRedir (void *ctx);
59
- XMLPUBFUN int XMLCALL
59
+ XMLPUBFUN int
60
60
  xmlNanoHTTPContentLength( void * ctx );
61
- XMLPUBFUN const char * XMLCALL
61
+ XMLPUBFUN const char *
62
62
  xmlNanoHTTPEncoding (void *ctx);
63
- XMLPUBFUN const char * XMLCALL
63
+ XMLPUBFUN const char *
64
64
  xmlNanoHTTPMimeType (void *ctx);
65
- XMLPUBFUN int XMLCALL
65
+ XMLPUBFUN int
66
66
  xmlNanoHTTPRead (void *ctx,
67
67
  void *dest,
68
68
  int len);
69
69
  #ifdef LIBXML_OUTPUT_ENABLED
70
- XMLPUBFUN int XMLCALL
70
+ XMLPUBFUN int
71
71
  xmlNanoHTTPSave (void *ctxt,
72
72
  const char *filename);
73
73
  #endif /* LIBXML_OUTPUT_ENABLED */
74
- XMLPUBFUN void XMLCALL
74
+ XMLPUBFUN void
75
75
  xmlNanoHTTPClose (void *ctx);
76
76
  #ifdef __cplusplus
77
77
  }
@@ -61,17 +61,14 @@ struct _xmlParserInput {
61
61
  int length; /* length if known */
62
62
  int line; /* Current line */
63
63
  int col; /* Current column */
64
- /*
65
- * NOTE: consumed is only tested for equality in the parser code,
66
- * so even if there is an overflow this should not give troubles
67
- * for parsing very large instances.
68
- */
69
64
  unsigned long consumed; /* How many xmlChars already consumed */
70
65
  xmlParserInputDeallocate free; /* function to deallocate the base */
71
66
  const xmlChar *encoding; /* the encoding string for entity */
72
67
  const xmlChar *version; /* the version string for entity */
73
68
  int standalone; /* Was that entity marked standalone */
74
69
  int id; /* an unique identifier for the entity */
70
+ unsigned long parentConsumed; /* consumed bytes from parents */
71
+ xmlEntityPtr entity; /* entity, if any */
75
72
  };
76
73
 
77
74
  /**
@@ -300,7 +297,7 @@ struct _xmlParserCtxt {
300
297
  */
301
298
  xmlError lastError;
302
299
  xmlParserMode parseMode; /* the parser mode */
303
- unsigned long nbentities; /* number of entities references */
300
+ unsigned long nbentities; /* unused */
304
301
  unsigned long sizeentities; /* size of parsed entities */
305
302
 
306
303
  /* for use by HTML non-recursive parser */
@@ -311,6 +308,10 @@ struct _xmlParserCtxt {
311
308
 
312
309
  int input_id; /* we need to label inputs */
313
310
  unsigned long sizeentcopy; /* volume of entity copy */
311
+
312
+ int endCheckState; /* quote state for push parser */
313
+ unsigned short nbErrors; /* number of errors */
314
+ unsigned short nbWarnings; /* number of warnings */
314
315
  };
315
316
 
316
317
  /**
@@ -605,7 +606,7 @@ typedef void (*cdataBlockSAXFunc) (
605
606
  *
606
607
  * Display and format a warning messages, callback.
607
608
  */
608
- typedef void (XMLCDECL *warningSAXFunc) (void *ctx,
609
+ typedef void (*warningSAXFunc) (void *ctx,
609
610
  const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
610
611
  /**
611
612
  * errorSAXFunc:
@@ -615,7 +616,7 @@ typedef void (XMLCDECL *warningSAXFunc) (void *ctx,
615
616
  *
616
617
  * Display and format an error messages, callback.
617
618
  */
618
- typedef void (XMLCDECL *errorSAXFunc) (void *ctx,
619
+ typedef void (*errorSAXFunc) (void *ctx,
619
620
  const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
620
621
  /**
621
622
  * fatalErrorSAXFunc:
@@ -627,7 +628,7 @@ typedef void (XMLCDECL *errorSAXFunc) (void *ctx,
627
628
  * Note: so far fatalError() SAX callbacks are not used, error()
628
629
  * get all the callbacks for errors.
629
630
  */
630
- typedef void (XMLCDECL *fatalErrorSAXFunc) (void *ctx,
631
+ typedef void (*fatalErrorSAXFunc) (void *ctx,
631
632
  const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
632
633
  /**
633
634
  * isStandaloneSAXFunc:
@@ -819,18 +820,20 @@ extern "C" {
819
820
  /*
820
821
  * Init/Cleanup
821
822
  */
822
- XMLPUBFUN void XMLCALL
823
+ XMLPUBFUN void
823
824
  xmlInitParser (void);
824
- XMLPUBFUN void XMLCALL
825
+ XMLPUBFUN void
825
826
  xmlCleanupParser (void);
826
827
 
827
828
  /*
828
829
  * Input functions
829
830
  */
830
- XMLPUBFUN int XMLCALL
831
+ XML_DEPRECATED
832
+ XMLPUBFUN int
831
833
  xmlParserInputRead (xmlParserInputPtr in,
832
834
  int len);
833
- XMLPUBFUN int XMLCALL
835
+ XML_DEPRECATED
836
+ XMLPUBFUN int
834
837
  xmlParserInputGrow (xmlParserInputPtr in,
835
838
  int len);
836
839
 
@@ -838,101 +841,114 @@ XMLPUBFUN int XMLCALL
838
841
  * Basic parsing Interfaces
839
842
  */
840
843
  #ifdef LIBXML_SAX1_ENABLED
841
- XMLPUBFUN xmlDocPtr XMLCALL
844
+ XMLPUBFUN xmlDocPtr
842
845
  xmlParseDoc (const xmlChar *cur);
843
- XMLPUBFUN xmlDocPtr XMLCALL
846
+ XMLPUBFUN xmlDocPtr
844
847
  xmlParseFile (const char *filename);
845
- XMLPUBFUN xmlDocPtr XMLCALL
848
+ XMLPUBFUN xmlDocPtr
846
849
  xmlParseMemory (const char *buffer,
847
850
  int size);
848
851
  #endif /* LIBXML_SAX1_ENABLED */
849
- XMLPUBFUN int XMLCALL
852
+ XMLPUBFUN int
850
853
  xmlSubstituteEntitiesDefault(int val);
851
- XMLPUBFUN int XMLCALL
854
+ XMLPUBFUN int
852
855
  xmlKeepBlanksDefault (int val);
853
- XMLPUBFUN void XMLCALL
856
+ XMLPUBFUN void
854
857
  xmlStopParser (xmlParserCtxtPtr ctxt);
855
- XMLPUBFUN int XMLCALL
858
+ XMLPUBFUN int
856
859
  xmlPedanticParserDefault(int val);
857
- XMLPUBFUN int XMLCALL
860
+ XMLPUBFUN int
858
861
  xmlLineNumbersDefault (int val);
859
862
 
860
863
  #ifdef LIBXML_SAX1_ENABLED
861
864
  /*
862
865
  * Recovery mode
863
866
  */
864
- XMLPUBFUN xmlDocPtr XMLCALL
867
+ XML_DEPRECATED
868
+ XMLPUBFUN xmlDocPtr
865
869
  xmlRecoverDoc (const xmlChar *cur);
866
- XMLPUBFUN xmlDocPtr XMLCALL
870
+ XML_DEPRECATED
871
+ XMLPUBFUN xmlDocPtr
867
872
  xmlRecoverMemory (const char *buffer,
868
873
  int size);
869
- XMLPUBFUN xmlDocPtr XMLCALL
874
+ XML_DEPRECATED
875
+ XMLPUBFUN xmlDocPtr
870
876
  xmlRecoverFile (const char *filename);
871
877
  #endif /* LIBXML_SAX1_ENABLED */
872
878
 
873
879
  /*
874
880
  * Less common routines and SAX interfaces
875
881
  */
876
- XMLPUBFUN int XMLCALL
882
+ XMLPUBFUN int
877
883
  xmlParseDocument (xmlParserCtxtPtr ctxt);
878
- XMLPUBFUN int XMLCALL
884
+ XMLPUBFUN int
879
885
  xmlParseExtParsedEnt (xmlParserCtxtPtr ctxt);
880
886
  #ifdef LIBXML_SAX1_ENABLED
881
- XMLPUBFUN int XMLCALL
887
+ XML_DEPRECATED
888
+ XMLPUBFUN int
882
889
  xmlSAXUserParseFile (xmlSAXHandlerPtr sax,
883
890
  void *user_data,
884
891
  const char *filename);
885
- XMLPUBFUN int XMLCALL
892
+ XML_DEPRECATED
893
+ XMLPUBFUN int
886
894
  xmlSAXUserParseMemory (xmlSAXHandlerPtr sax,
887
895
  void *user_data,
888
896
  const char *buffer,
889
897
  int size);
890
- XMLPUBFUN xmlDocPtr XMLCALL
898
+ XML_DEPRECATED
899
+ XMLPUBFUN xmlDocPtr
891
900
  xmlSAXParseDoc (xmlSAXHandlerPtr sax,
892
901
  const xmlChar *cur,
893
902
  int recovery);
894
- XMLPUBFUN xmlDocPtr XMLCALL
903
+ XML_DEPRECATED
904
+ XMLPUBFUN xmlDocPtr
895
905
  xmlSAXParseMemory (xmlSAXHandlerPtr sax,
896
906
  const char *buffer,
897
907
  int size,
898
908
  int recovery);
899
- XMLPUBFUN xmlDocPtr XMLCALL
909
+ XML_DEPRECATED
910
+ XMLPUBFUN xmlDocPtr
900
911
  xmlSAXParseMemoryWithData (xmlSAXHandlerPtr sax,
901
912
  const char *buffer,
902
913
  int size,
903
914
  int recovery,
904
915
  void *data);
905
- XMLPUBFUN xmlDocPtr XMLCALL
916
+ XML_DEPRECATED
917
+ XMLPUBFUN xmlDocPtr
906
918
  xmlSAXParseFile (xmlSAXHandlerPtr sax,
907
919
  const char *filename,
908
920
  int recovery);
909
- XMLPUBFUN xmlDocPtr XMLCALL
921
+ XML_DEPRECATED
922
+ XMLPUBFUN xmlDocPtr
910
923
  xmlSAXParseFileWithData (xmlSAXHandlerPtr sax,
911
924
  const char *filename,
912
925
  int recovery,
913
926
  void *data);
914
- XMLPUBFUN xmlDocPtr XMLCALL
927
+ XML_DEPRECATED
928
+ XMLPUBFUN xmlDocPtr
915
929
  xmlSAXParseEntity (xmlSAXHandlerPtr sax,
916
930
  const char *filename);
917
- XMLPUBFUN xmlDocPtr XMLCALL
931
+ XML_DEPRECATED
932
+ XMLPUBFUN xmlDocPtr
918
933
  xmlParseEntity (const char *filename);
919
934
  #endif /* LIBXML_SAX1_ENABLED */
920
935
 
921
936
  #ifdef LIBXML_VALID_ENABLED
922
- XMLPUBFUN xmlDtdPtr XMLCALL
937
+ XML_DEPRECATED
938
+ XMLPUBFUN xmlDtdPtr
923
939
  xmlSAXParseDTD (xmlSAXHandlerPtr sax,
924
940
  const xmlChar *ExternalID,
925
941
  const xmlChar *SystemID);
926
- XMLPUBFUN xmlDtdPtr XMLCALL
942
+ XMLPUBFUN xmlDtdPtr
927
943
  xmlParseDTD (const xmlChar *ExternalID,
928
944
  const xmlChar *SystemID);
929
- XMLPUBFUN xmlDtdPtr XMLCALL
945
+ XMLPUBFUN xmlDtdPtr
930
946
  xmlIOParseDTD (xmlSAXHandlerPtr sax,
931
947
  xmlParserInputBufferPtr input,
932
948
  xmlCharEncoding enc);
933
949
  #endif /* LIBXML_VALID_ENABLE */
934
950
  #ifdef LIBXML_SAX1_ENABLED
935
- XMLPUBFUN int XMLCALL
951
+ XMLPUBFUN int
936
952
  xmlParseBalancedChunkMemory(xmlDocPtr doc,
937
953
  xmlSAXHandlerPtr sax,
938
954
  void *user_data,
@@ -940,14 +956,14 @@ XMLPUBFUN int XMLCALL
940
956
  const xmlChar *string,
941
957
  xmlNodePtr *lst);
942
958
  #endif /* LIBXML_SAX1_ENABLED */
943
- XMLPUBFUN xmlParserErrors XMLCALL
959
+ XMLPUBFUN xmlParserErrors
944
960
  xmlParseInNodeContext (xmlNodePtr node,
945
961
  const char *data,
946
962
  int datalen,
947
963
  int options,
948
964
  xmlNodePtr *lst);
949
965
  #ifdef LIBXML_SAX1_ENABLED
950
- XMLPUBFUN int XMLCALL
966
+ XMLPUBFUN int
951
967
  xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc,
952
968
  xmlSAXHandlerPtr sax,
953
969
  void *user_data,
@@ -955,7 +971,8 @@ XMLPUBFUN int XMLCALL
955
971
  const xmlChar *string,
956
972
  xmlNodePtr *lst,
957
973
  int recover);
958
- XMLPUBFUN int XMLCALL
974
+ XML_DEPRECATED
975
+ XMLPUBFUN int
959
976
  xmlParseExternalEntity (xmlDocPtr doc,
960
977
  xmlSAXHandlerPtr sax,
961
978
  void *user_data,
@@ -964,7 +981,7 @@ XMLPUBFUN int XMLCALL
964
981
  const xmlChar *ID,
965
982
  xmlNodePtr *lst);
966
983
  #endif /* LIBXML_SAX1_ENABLED */
967
- XMLPUBFUN int XMLCALL
984
+ XMLPUBFUN int
968
985
  xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctx,
969
986
  const xmlChar *URL,
970
987
  const xmlChar *ID,
@@ -973,21 +990,25 @@ XMLPUBFUN int XMLCALL
973
990
  /*
974
991
  * Parser contexts handling.
975
992
  */
976
- XMLPUBFUN xmlParserCtxtPtr XMLCALL
993
+ XMLPUBFUN xmlParserCtxtPtr
977
994
  xmlNewParserCtxt (void);
978
- XMLPUBFUN int XMLCALL
995
+ XMLPUBFUN xmlParserCtxtPtr
996
+ xmlNewSAXParserCtxt (const xmlSAXHandler *sax,
997
+ void *userData);
998
+ XMLPUBFUN int
979
999
  xmlInitParserCtxt (xmlParserCtxtPtr ctxt);
980
- XMLPUBFUN void XMLCALL
1000
+ XMLPUBFUN void
981
1001
  xmlClearParserCtxt (xmlParserCtxtPtr ctxt);
982
- XMLPUBFUN void XMLCALL
1002
+ XMLPUBFUN void
983
1003
  xmlFreeParserCtxt (xmlParserCtxtPtr ctxt);
984
1004
  #ifdef LIBXML_SAX1_ENABLED
985
- XMLPUBFUN void XMLCALL
1005
+ XML_DEPRECATED
1006
+ XMLPUBFUN void
986
1007
  xmlSetupParserForBuffer (xmlParserCtxtPtr ctxt,
987
1008
  const xmlChar* buffer,
988
1009
  const char *filename);
989
1010
  #endif /* LIBXML_SAX1_ENABLED */
990
- XMLPUBFUN xmlParserCtxtPtr XMLCALL
1011
+ XMLPUBFUN xmlParserCtxtPtr
991
1012
  xmlCreateDocParserCtxt (const xmlChar *cur);
992
1013
 
993
1014
  #ifdef LIBXML_LEGACY_ENABLED
@@ -995,16 +1016,16 @@ XMLPUBFUN xmlParserCtxtPtr XMLCALL
995
1016
  * Reading/setting optional parsing features.
996
1017
  */
997
1018
  XML_DEPRECATED
998
- XMLPUBFUN int XMLCALL
1019
+ XMLPUBFUN int
999
1020
  xmlGetFeaturesList (int *len,
1000
1021
  const char **result);
1001
1022
  XML_DEPRECATED
1002
- XMLPUBFUN int XMLCALL
1023
+ XMLPUBFUN int
1003
1024
  xmlGetFeature (xmlParserCtxtPtr ctxt,
1004
1025
  const char *name,
1005
1026
  void *result);
1006
1027
  XML_DEPRECATED
1007
- XMLPUBFUN int XMLCALL
1028
+ XMLPUBFUN int
1008
1029
  xmlSetFeature (xmlParserCtxtPtr ctxt,
1009
1030
  const char *name,
1010
1031
  void *value);
@@ -1014,13 +1035,13 @@ XMLPUBFUN int XMLCALL
1014
1035
  /*
1015
1036
  * Interfaces for the Push mode.
1016
1037
  */
1017
- XMLPUBFUN xmlParserCtxtPtr XMLCALL
1038
+ XMLPUBFUN xmlParserCtxtPtr
1018
1039
  xmlCreatePushParserCtxt(xmlSAXHandlerPtr sax,
1019
1040
  void *user_data,
1020
1041
  const char *chunk,
1021
1042
  int size,
1022
1043
  const char *filename);
1023
- XMLPUBFUN int XMLCALL
1044
+ XMLPUBFUN int
1024
1045
  xmlParseChunk (xmlParserCtxtPtr ctxt,
1025
1046
  const char *chunk,
1026
1047
  int size,
@@ -1031,7 +1052,7 @@ XMLPUBFUN int XMLCALL
1031
1052
  * Special I/O mode.
1032
1053
  */
1033
1054
 
1034
- XMLPUBFUN xmlParserCtxtPtr XMLCALL
1055
+ XMLPUBFUN xmlParserCtxtPtr
1035
1056
  xmlCreateIOParserCtxt (xmlSAXHandlerPtr sax,
1036
1057
  void *user_data,
1037
1058
  xmlInputReadCallback ioread,
@@ -1039,7 +1060,7 @@ XMLPUBFUN xmlParserCtxtPtr XMLCALL
1039
1060
  void *ioctx,
1040
1061
  xmlCharEncoding enc);
1041
1062
 
1042
- XMLPUBFUN xmlParserInputPtr XMLCALL
1063
+ XMLPUBFUN xmlParserInputPtr
1043
1064
  xmlNewIOInputStream (xmlParserCtxtPtr ctxt,
1044
1065
  xmlParserInputBufferPtr input,
1045
1066
  xmlCharEncoding enc);
@@ -1047,17 +1068,17 @@ XMLPUBFUN xmlParserInputPtr XMLCALL
1047
1068
  /*
1048
1069
  * Node infos.
1049
1070
  */
1050
- XMLPUBFUN const xmlParserNodeInfo* XMLCALL
1071
+ XMLPUBFUN const xmlParserNodeInfo*
1051
1072
  xmlParserFindNodeInfo (const xmlParserCtxtPtr ctxt,
1052
1073
  const xmlNodePtr node);
1053
- XMLPUBFUN void XMLCALL
1074
+ XMLPUBFUN void
1054
1075
  xmlInitNodeInfoSeq (xmlParserNodeInfoSeqPtr seq);
1055
- XMLPUBFUN void XMLCALL
1076
+ XMLPUBFUN void
1056
1077
  xmlClearNodeInfoSeq (xmlParserNodeInfoSeqPtr seq);
1057
- XMLPUBFUN unsigned long XMLCALL
1078
+ XMLPUBFUN unsigned long
1058
1079
  xmlParserFindNodeInfoIndex(const xmlParserNodeInfoSeqPtr seq,
1059
1080
  const xmlNodePtr node);
1060
- XMLPUBFUN void XMLCALL
1081
+ XMLPUBFUN void
1061
1082
  xmlParserAddNodeInfo (xmlParserCtxtPtr ctxt,
1062
1083
  const xmlParserNodeInfoPtr info);
1063
1084
 
@@ -1065,11 +1086,11 @@ XMLPUBFUN void XMLCALL
1065
1086
  * External entities handling actually implemented in xmlIO.
1066
1087
  */
1067
1088
 
1068
- XMLPUBFUN void XMLCALL
1089
+ XMLPUBFUN void
1069
1090
  xmlSetExternalEntityLoader(xmlExternalEntityLoader f);
1070
- XMLPUBFUN xmlExternalEntityLoader XMLCALL
1091
+ XMLPUBFUN xmlExternalEntityLoader
1071
1092
  xmlGetExternalEntityLoader(void);
1072
- XMLPUBFUN xmlParserInputPtr XMLCALL
1093
+ XMLPUBFUN xmlParserInputPtr
1073
1094
  xmlLoadExternalEntity (const char *URL,
1074
1095
  const char *ID,
1075
1096
  xmlParserCtxtPtr ctxt);
@@ -1077,7 +1098,7 @@ XMLPUBFUN xmlParserInputPtr XMLCALL
1077
1098
  /*
1078
1099
  * Index lookup, actually implemented in the encoding module
1079
1100
  */
1080
- XMLPUBFUN long XMLCALL
1101
+ XMLPUBFUN long
1081
1102
  xmlByteConsumed (xmlParserCtxtPtr ctxt);
1082
1103
 
1083
1104
  /*
@@ -1117,69 +1138,69 @@ typedef enum {
1117
1138
  XML_PARSE_BIG_LINES = 1<<22 /* Store big lines numbers in text PSVI field */
1118
1139
  } xmlParserOption;
1119
1140
 
1120
- XMLPUBFUN void XMLCALL
1141
+ XMLPUBFUN void
1121
1142
  xmlCtxtReset (xmlParserCtxtPtr ctxt);
1122
- XMLPUBFUN int XMLCALL
1143
+ XMLPUBFUN int
1123
1144
  xmlCtxtResetPush (xmlParserCtxtPtr ctxt,
1124
1145
  const char *chunk,
1125
1146
  int size,
1126
1147
  const char *filename,
1127
1148
  const char *encoding);
1128
- XMLPUBFUN int XMLCALL
1149
+ XMLPUBFUN int
1129
1150
  xmlCtxtUseOptions (xmlParserCtxtPtr ctxt,
1130
1151
  int options);
1131
- XMLPUBFUN xmlDocPtr XMLCALL
1152
+ XMLPUBFUN xmlDocPtr
1132
1153
  xmlReadDoc (const xmlChar *cur,
1133
1154
  const char *URL,
1134
1155
  const char *encoding,
1135
1156
  int options);
1136
- XMLPUBFUN xmlDocPtr XMLCALL
1157
+ XMLPUBFUN xmlDocPtr
1137
1158
  xmlReadFile (const char *URL,
1138
1159
  const char *encoding,
1139
1160
  int options);
1140
- XMLPUBFUN xmlDocPtr XMLCALL
1161
+ XMLPUBFUN xmlDocPtr
1141
1162
  xmlReadMemory (const char *buffer,
1142
1163
  int size,
1143
1164
  const char *URL,
1144
1165
  const char *encoding,
1145
1166
  int options);
1146
- XMLPUBFUN xmlDocPtr XMLCALL
1167
+ XMLPUBFUN xmlDocPtr
1147
1168
  xmlReadFd (int fd,
1148
1169
  const char *URL,
1149
1170
  const char *encoding,
1150
1171
  int options);
1151
- XMLPUBFUN xmlDocPtr XMLCALL
1172
+ XMLPUBFUN xmlDocPtr
1152
1173
  xmlReadIO (xmlInputReadCallback ioread,
1153
1174
  xmlInputCloseCallback ioclose,
1154
1175
  void *ioctx,
1155
1176
  const char *URL,
1156
1177
  const char *encoding,
1157
1178
  int options);
1158
- XMLPUBFUN xmlDocPtr XMLCALL
1179
+ XMLPUBFUN xmlDocPtr
1159
1180
  xmlCtxtReadDoc (xmlParserCtxtPtr ctxt,
1160
1181
  const xmlChar *cur,
1161
1182
  const char *URL,
1162
1183
  const char *encoding,
1163
1184
  int options);
1164
- XMLPUBFUN xmlDocPtr XMLCALL
1185
+ XMLPUBFUN xmlDocPtr
1165
1186
  xmlCtxtReadFile (xmlParserCtxtPtr ctxt,
1166
1187
  const char *filename,
1167
1188
  const char *encoding,
1168
1189
  int options);
1169
- XMLPUBFUN xmlDocPtr XMLCALL
1190
+ XMLPUBFUN xmlDocPtr
1170
1191
  xmlCtxtReadMemory (xmlParserCtxtPtr ctxt,
1171
1192
  const char *buffer,
1172
1193
  int size,
1173
1194
  const char *URL,
1174
1195
  const char *encoding,
1175
1196
  int options);
1176
- XMLPUBFUN xmlDocPtr XMLCALL
1197
+ XMLPUBFUN xmlDocPtr
1177
1198
  xmlCtxtReadFd (xmlParserCtxtPtr ctxt,
1178
1199
  int fd,
1179
1200
  const char *URL,
1180
1201
  const char *encoding,
1181
1202
  int options);
1182
- XMLPUBFUN xmlDocPtr XMLCALL
1203
+ XMLPUBFUN xmlDocPtr
1183
1204
  xmlCtxtReadIO (xmlParserCtxtPtr ctxt,
1184
1205
  xmlInputReadCallback ioread,
1185
1206
  xmlInputCloseCallback ioclose,
@@ -1235,7 +1256,7 @@ typedef enum {
1235
1256
  XML_WITH_NONE = 99999 /* just to be sure of allocation size */
1236
1257
  } xmlFeature;
1237
1258
 
1238
- XMLPUBFUN int XMLCALL
1259
+ XMLPUBFUN int
1239
1260
  xmlHasFeature (xmlFeature feature);
1240
1261
 
1241
1262
  #ifdef __cplusplus