nokogiri 1.14.4-x64-mingw32 → 1.15.1-x64-mingw32

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 (110) 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.so +0 -0
  88. data/lib/nokogiri/3.0/nokogiri.so +0 -0
  89. data/lib/nokogiri/css/xpath_visitor.rb +2 -2
  90. data/lib/nokogiri/extension.rb +1 -1
  91. data/lib/nokogiri/html4/document_fragment.rb +1 -1
  92. data/lib/nokogiri/html4/element_description_defaults.rb +1821 -353
  93. data/lib/nokogiri/html5/document_fragment.rb +1 -1
  94. data/lib/nokogiri/html5/node.rb +5 -0
  95. data/lib/nokogiri/html5.rb +5 -2
  96. data/lib/nokogiri/version/constant.rb +1 -1
  97. data/lib/nokogiri/xml/attribute_decl.rb +4 -2
  98. data/lib/nokogiri/xml/document_fragment.rb +1 -1
  99. data/lib/nokogiri/xml/element_content.rb +10 -2
  100. data/lib/nokogiri/xml/element_decl.rb +4 -2
  101. data/lib/nokogiri/xml/entity_decl.rb +4 -2
  102. data/lib/nokogiri/xml/node/save_options.rb +8 -0
  103. data/lib/nokogiri/xml/node.rb +22 -13
  104. data/lib/nokogiri/xml/pp/node.rb +23 -12
  105. data/lib/nokogiri/xml/sax/document.rb +1 -1
  106. data/lib/nokogiri/xml/searchable.rb +18 -10
  107. data/lib/nokogiri/xslt.rb +73 -3
  108. data/lib/nokogiri.rb +12 -4
  109. data/lib/xsd/xmlparser/nokogiri.rb +1 -1
  110. metadata +2 -2
data/ext/nokogiri/include/libxml2/libxml/chvalid.h CHANGED
@@ -51,7 +51,7 @@ struct _xmlChRangeGroup {
51
51
  /**
52
52
  * Range checking routine
53
53
  */
54
- XMLPUBFUN int XMLCALL
54
+ XMLPUBFUN int
55
55
  xmlCharInRange(unsigned int val, const xmlChRangeGroup *group);
56
56
 
57
57
 
@@ -207,21 +207,21 @@ XMLPUBVAR const unsigned char xmlIsPubidChar_tab[256];
207
207
  #define xmlIsPubidCharQ(c) (((c) < 0x100) ? \
208
208
  xmlIsPubidChar_ch((c)) : 0)
209
209
 
210
- XMLPUBFUN int XMLCALL
210
+ XMLPUBFUN int
211
211
  xmlIsBaseChar(unsigned int ch);
212
- XMLPUBFUN int XMLCALL
212
+ XMLPUBFUN int
213
213
  xmlIsBlank(unsigned int ch);
214
- XMLPUBFUN int XMLCALL
214
+ XMLPUBFUN int
215
215
  xmlIsChar(unsigned int ch);
216
- XMLPUBFUN int XMLCALL
216
+ XMLPUBFUN int
217
217
  xmlIsCombining(unsigned int ch);
218
- XMLPUBFUN int XMLCALL
218
+ XMLPUBFUN int
219
219
  xmlIsDigit(unsigned int ch);
220
- XMLPUBFUN int XMLCALL
220
+ XMLPUBFUN int
221
221
  xmlIsExtender(unsigned int ch);
222
- XMLPUBFUN int XMLCALL
222
+ XMLPUBFUN int
223
223
  xmlIsIdeographic(unsigned int ch);
224
- XMLPUBFUN int XMLCALL
224
+ XMLPUBFUN int
225
225
  xmlIsPubidChar(unsigned int ch);
226
226
 
227
227
  #ifdef __cplusplus
data/ext/nokogiri/include/libxml2/libxml/debugXML.h CHANGED
@@ -25,39 +25,39 @@ extern "C" {
25
25
  /*
26
26
  * The standard Dump routines.
27
27
  */
28
- XMLPUBFUN void XMLCALL
28
+ XMLPUBFUN void
29
29
  xmlDebugDumpString (FILE *output,
30
30
  const xmlChar *str);
31
- XMLPUBFUN void XMLCALL
31
+ XMLPUBFUN void
32
32
  xmlDebugDumpAttr (FILE *output,
33
33
  xmlAttrPtr attr,
34
34
  int depth);
35
- XMLPUBFUN void XMLCALL
35
+ XMLPUBFUN void
36
36
  xmlDebugDumpAttrList (FILE *output,
37
37
  xmlAttrPtr attr,
38
38
  int depth);
39
- XMLPUBFUN void XMLCALL
39
+ XMLPUBFUN void
40
40
  xmlDebugDumpOneNode (FILE *output,
41
41
  xmlNodePtr node,
42
42
  int depth);
43
- XMLPUBFUN void XMLCALL
43
+ XMLPUBFUN void
44
44
  xmlDebugDumpNode (FILE *output,
45
45
  xmlNodePtr node,
46
46
  int depth);
47
- XMLPUBFUN void XMLCALL
47
+ XMLPUBFUN void
48
48
  xmlDebugDumpNodeList (FILE *output,
49
49
  xmlNodePtr node,
50
50
  int depth);
51
- XMLPUBFUN void XMLCALL
51
+ XMLPUBFUN void
52
52
  xmlDebugDumpDocumentHead(FILE *output,
53
53
  xmlDocPtr doc);
54
- XMLPUBFUN void XMLCALL
54
+ XMLPUBFUN void
55
55
  xmlDebugDumpDocument (FILE *output,
56
56
  xmlDocPtr doc);
57
- XMLPUBFUN void XMLCALL
57
+ XMLPUBFUN void
58
58
  xmlDebugDumpDTD (FILE *output,
59
59
  xmlDtdPtr dtd);
60
- XMLPUBFUN void XMLCALL
60
+ XMLPUBFUN void
61
61
  xmlDebugDumpEntities (FILE *output,
62
62
  xmlDocPtr doc);
63
63
 
@@ -67,7 +67,7 @@ XMLPUBFUN void XMLCALL
67
67
  * *
68
68
  ****************************************************************/
69
69
 
70
- XMLPUBFUN int XMLCALL
70
+ XMLPUBFUN int
71
71
  xmlDebugCheckDocument (FILE * output,
72
72
  xmlDocPtr doc);
73
73
 
@@ -77,12 +77,12 @@ XMLPUBFUN int XMLCALL
77
77
  * *
78
78
  ****************************************************************/
79
79
 
80
- XMLPUBFUN void XMLCALL
80
+ XMLPUBFUN void
81
81
  xmlLsOneNode (FILE *output, xmlNodePtr node);
82
- XMLPUBFUN int XMLCALL
82
+ XMLPUBFUN int
83
83
  xmlLsCountNode (xmlNodePtr node);
84
84
 
85
- XMLPUBFUN const char * XMLCALL
85
+ XMLPUBFUN const char *
86
86
  xmlBoolToText (int boolval);
87
87
 
88
88
  /****************************************************************
@@ -136,63 +136,63 @@ typedef int (* xmlShellCmd) (xmlShellCtxtPtr ctxt,
136
136
  xmlNodePtr node,
137
137
  xmlNodePtr node2);
138
138
 
139
- XMLPUBFUN void XMLCALL
139
+ XMLPUBFUN void
140
140
  xmlShellPrintXPathError (int errorType,
141
141
  const char *arg);
142
- XMLPUBFUN void XMLCALL
142
+ XMLPUBFUN void
143
143
  xmlShellPrintXPathResult(xmlXPathObjectPtr list);
144
- XMLPUBFUN int XMLCALL
144
+ XMLPUBFUN int
145
145
  xmlShellList (xmlShellCtxtPtr ctxt,
146
146
  char *arg,
147
147
  xmlNodePtr node,
148
148
  xmlNodePtr node2);
149
- XMLPUBFUN int XMLCALL
149
+ XMLPUBFUN int
150
150
  xmlShellBase (xmlShellCtxtPtr ctxt,
151
151
  char *arg,
152
152
  xmlNodePtr node,
153
153
  xmlNodePtr node2);
154
- XMLPUBFUN int XMLCALL
154
+ XMLPUBFUN int
155
155
  xmlShellDir (xmlShellCtxtPtr ctxt,
156
156
  char *arg,
157
157
  xmlNodePtr node,
158
158
  xmlNodePtr node2);
159
- XMLPUBFUN int XMLCALL
159
+ XMLPUBFUN int
160
160
  xmlShellLoad (xmlShellCtxtPtr ctxt,
161
161
  char *filename,
162
162
  xmlNodePtr node,
163
163
  xmlNodePtr node2);
164
164
  #ifdef LIBXML_OUTPUT_ENABLED
165
- XMLPUBFUN void XMLCALL
165
+ XMLPUBFUN void
166
166
  xmlShellPrintNode (xmlNodePtr node);
167
- XMLPUBFUN int XMLCALL
167
+ XMLPUBFUN int
168
168
  xmlShellCat (xmlShellCtxtPtr ctxt,
169
169
  char *arg,
170
170
  xmlNodePtr node,
171
171
  xmlNodePtr node2);
172
- XMLPUBFUN int XMLCALL
172
+ XMLPUBFUN int
173
173
  xmlShellWrite (xmlShellCtxtPtr ctxt,
174
174
  char *filename,
175
175
  xmlNodePtr node,
176
176
  xmlNodePtr node2);
177
- XMLPUBFUN int XMLCALL
177
+ XMLPUBFUN int
178
178
  xmlShellSave (xmlShellCtxtPtr ctxt,
179
179
  char *filename,
180
180
  xmlNodePtr node,
181
181
  xmlNodePtr node2);
182
182
  #endif /* LIBXML_OUTPUT_ENABLED */
183
183
  #ifdef LIBXML_VALID_ENABLED
184
- XMLPUBFUN int XMLCALL
184
+ XMLPUBFUN int
185
185
  xmlShellValidate (xmlShellCtxtPtr ctxt,
186
186
  char *dtd,
187
187
  xmlNodePtr node,
188
188
  xmlNodePtr node2);
189
189
  #endif /* LIBXML_VALID_ENABLED */
190
- XMLPUBFUN int XMLCALL
190
+ XMLPUBFUN int
191
191
  xmlShellDu (xmlShellCtxtPtr ctxt,
192
192
  char *arg,
193
193
  xmlNodePtr tree,
194
194
  xmlNodePtr node2);
195
- XMLPUBFUN int XMLCALL
195
+ XMLPUBFUN int
196
196
  xmlShellPwd (xmlShellCtxtPtr ctxt,
197
197
  char *buffer,
198
198
  xmlNodePtr node,
@@ -201,7 +201,7 @@ XMLPUBFUN int XMLCALL
201
201
  /*
202
202
  * The Shell interface.
203
203
  */
204
- XMLPUBFUN void XMLCALL
204
+ XMLPUBFUN void
205
205
  xmlShell (xmlDocPtr doc,
206
206
  char *filename,
207
207
  xmlShellReadlineFunc input,
data/ext/nokogiri/include/libxml2/libxml/dict.h CHANGED
@@ -28,51 +28,51 @@ typedef xmlDict *xmlDictPtr;
28
28
  * Initializer
29
29
  */
30
30
  XML_DEPRECATED
31
- XMLPUBFUN int XMLCALL xmlInitializeDict(void);
31
+ XMLPUBFUN int xmlInitializeDict(void);
32
32
 
33
33
  /*
34
34
  * Constructor and destructor.
35
35
  */
36
- XMLPUBFUN xmlDictPtr XMLCALL
36
+ XMLPUBFUN xmlDictPtr
37
37
  xmlDictCreate (void);
38
- XMLPUBFUN size_t XMLCALL
38
+ XMLPUBFUN size_t
39
39
  xmlDictSetLimit (xmlDictPtr dict,
40
40
  size_t limit);
41
- XMLPUBFUN size_t XMLCALL
41
+ XMLPUBFUN size_t
42
42
  xmlDictGetUsage (xmlDictPtr dict);
43
- XMLPUBFUN xmlDictPtr XMLCALL
43
+ XMLPUBFUN xmlDictPtr
44
44
  xmlDictCreateSub(xmlDictPtr sub);
45
- XMLPUBFUN int XMLCALL
45
+ XMLPUBFUN int
46
46
  xmlDictReference(xmlDictPtr dict);
47
- XMLPUBFUN void XMLCALL
47
+ XMLPUBFUN void
48
48
  xmlDictFree (xmlDictPtr dict);
49
49
 
50
50
  /*
51
51
  * Lookup of entry in the dictionary.
52
52
  */
53
- XMLPUBFUN const xmlChar * XMLCALL
53
+ XMLPUBFUN const xmlChar *
54
54
  xmlDictLookup (xmlDictPtr dict,
55
55
  const xmlChar *name,
56
56
  int len);
57
- XMLPUBFUN const xmlChar * XMLCALL
57
+ XMLPUBFUN const xmlChar *
58
58
  xmlDictExists (xmlDictPtr dict,
59
59
  const xmlChar *name,
60
60
  int len);
61
- XMLPUBFUN const xmlChar * XMLCALL
61
+ XMLPUBFUN const xmlChar *
62
62
  xmlDictQLookup (xmlDictPtr dict,
63
63
  const xmlChar *prefix,
64
64
  const xmlChar *name);
65
- XMLPUBFUN int XMLCALL
65
+ XMLPUBFUN int
66
66
  xmlDictOwns (xmlDictPtr dict,
67
67
  const xmlChar *str);
68
- XMLPUBFUN int XMLCALL
68
+ XMLPUBFUN int
69
69
  xmlDictSize (xmlDictPtr dict);
70
70
 
71
71
  /*
72
72
  * Cleanup function
73
73
  */
74
74
  XML_DEPRECATED
75
- XMLPUBFUN void XMLCALL
75
+ XMLPUBFUN void
76
76
  xmlDictCleanup (void);
77
77
 
78
78
  #ifdef __cplusplus
data/ext/nokogiri/include/libxml2/libxml/encoding.h CHANGED
@@ -154,18 +154,18 @@ extern "C" {
154
154
  * Interfaces for encoding handlers.
155
155
  */
156
156
  XML_DEPRECATED
157
- XMLPUBFUN void XMLCALL
157
+ XMLPUBFUN void
158
158
  xmlInitCharEncodingHandlers (void);
159
159
  XML_DEPRECATED
160
- XMLPUBFUN void XMLCALL
160
+ XMLPUBFUN void
161
161
  xmlCleanupCharEncodingHandlers (void);
162
- XMLPUBFUN void XMLCALL
162
+ XMLPUBFUN void
163
163
  xmlRegisterCharEncodingHandler (xmlCharEncodingHandlerPtr handler);
164
- XMLPUBFUN xmlCharEncodingHandlerPtr XMLCALL
164
+ XMLPUBFUN xmlCharEncodingHandlerPtr
165
165
  xmlGetCharEncodingHandler (xmlCharEncoding enc);
166
- XMLPUBFUN xmlCharEncodingHandlerPtr XMLCALL
166
+ XMLPUBFUN xmlCharEncodingHandlerPtr
167
167
  xmlFindCharEncodingHandler (const char *name);
168
- XMLPUBFUN xmlCharEncodingHandlerPtr XMLCALL
168
+ XMLPUBFUN xmlCharEncodingHandlerPtr
169
169
  xmlNewCharEncodingHandler (const char *name,
170
170
  xmlCharEncodingInputFunc input,
171
171
  xmlCharEncodingOutputFunc output);
@@ -173,54 +173,55 @@ XMLPUBFUN xmlCharEncodingHandlerPtr XMLCALL
173
173
  /*
174
174
  * Interfaces for encoding names and aliases.
175
175
  */
176
- XMLPUBFUN int XMLCALL
176
+ XMLPUBFUN int
177
177
  xmlAddEncodingAlias (const char *name,
178
178
  const char *alias);
179
- XMLPUBFUN int XMLCALL
179
+ XMLPUBFUN int
180
180
  xmlDelEncodingAlias (const char *alias);
181
- XMLPUBFUN const char * XMLCALL
181
+ XMLPUBFUN const char *
182
182
  xmlGetEncodingAlias (const char *alias);
183
- XMLPUBFUN void XMLCALL
183
+ XMLPUBFUN void
184
184
  xmlCleanupEncodingAliases (void);
185
- XMLPUBFUN xmlCharEncoding XMLCALL
185
+ XMLPUBFUN xmlCharEncoding
186
186
  xmlParseCharEncoding (const char *name);
187
- XMLPUBFUN const char * XMLCALL
187
+ XMLPUBFUN const char *
188
188
  xmlGetCharEncodingName (xmlCharEncoding enc);
189
189
 
190
190
  /*
191
191
  * Interfaces directly used by the parsers.
192
192
  */
193
- XMLPUBFUN xmlCharEncoding XMLCALL
193
+ XMLPUBFUN xmlCharEncoding
194
194
  xmlDetectCharEncoding (const unsigned char *in,
195
195
  int len);
196
196
 
197
- XMLPUBFUN int XMLCALL
197
+ XMLPUBFUN int
198
198
  xmlCharEncOutFunc (xmlCharEncodingHandler *handler,
199
199
  xmlBufferPtr out,
200
200
  xmlBufferPtr in);
201
201
 
202
- XMLPUBFUN int XMLCALL
202
+ XMLPUBFUN int
203
203
  xmlCharEncInFunc (xmlCharEncodingHandler *handler,
204
204
  xmlBufferPtr out,
205
205
  xmlBufferPtr in);
206
- XMLPUBFUN int XMLCALL
206
+ XML_DEPRECATED
207
+ XMLPUBFUN int
207
208
  xmlCharEncFirstLine (xmlCharEncodingHandler *handler,
208
209
  xmlBufferPtr out,
209
210
  xmlBufferPtr in);
210
- XMLPUBFUN int XMLCALL
211
+ XMLPUBFUN int
211
212
  xmlCharEncCloseFunc (xmlCharEncodingHandler *handler);
212
213
 
213
214
  /*
214
215
  * Export a few useful functions
215
216
  */
216
217
  #ifdef LIBXML_OUTPUT_ENABLED
217
- XMLPUBFUN int XMLCALL
218
+ XMLPUBFUN int
218
219
  UTF8Toisolat1 (unsigned char *out,
219
220
  int *outlen,
220
221
  const unsigned char *in,
221
222
  int *inlen);
222
223
  #endif /* LIBXML_OUTPUT_ENABLED */
223
- XMLPUBFUN int XMLCALL
224
+ XMLPUBFUN int
224
225
  isolat1ToUTF8 (unsigned char *out,
225
226
  int *outlen,
226
227
  const unsigned char *in,
data/ext/nokogiri/include/libxml2/libxml/entities.h CHANGED
@@ -56,10 +56,8 @@ struct _xmlEntity {
56
56
  struct _xmlEntity *nexte; /* unused */
57
57
  const xmlChar *URI; /* the full URI as computed */
58
58
  int owner; /* does the entity own the childrens */
59
- int checked; /* was the entity content checked */
60
- /* this is also used to count entities
61
- * references done from that entity
62
- * and if it contains '<' */
59
+ int flags; /* various flags */
60
+ unsigned long expandedSize; /* expanded size */
63
61
  };
64
62
 
65
63
  /*
@@ -76,72 +74,72 @@ typedef xmlEntitiesTable *xmlEntitiesTablePtr;
76
74
 
77
75
  #ifdef LIBXML_LEGACY_ENABLED
78
76
  XML_DEPRECATED
79
- XMLPUBFUN void XMLCALL
77
+ XMLPUBFUN void
80
78
  xmlInitializePredefinedEntities (void);
81
79
  #endif /* LIBXML_LEGACY_ENABLED */
82
80
 
83
- XMLPUBFUN xmlEntityPtr XMLCALL
81
+ XMLPUBFUN xmlEntityPtr
84
82
  xmlNewEntity (xmlDocPtr doc,
85
83
  const xmlChar *name,
86
84
  int type,
87
85
  const xmlChar *ExternalID,
88
86
  const xmlChar *SystemID,
89
87
  const xmlChar *content);
90
- XMLPUBFUN xmlEntityPtr XMLCALL
88
+ XMLPUBFUN xmlEntityPtr
91
89
  xmlAddDocEntity (xmlDocPtr doc,
92
90
  const xmlChar *name,
93
91
  int type,
94
92
  const xmlChar *ExternalID,
95
93
  const xmlChar *SystemID,
96
94
  const xmlChar *content);
97
- XMLPUBFUN xmlEntityPtr XMLCALL
95
+ XMLPUBFUN xmlEntityPtr
98
96
  xmlAddDtdEntity (xmlDocPtr doc,
99
97
  const xmlChar *name,
100
98
  int type,
101
99
  const xmlChar *ExternalID,
102
100
  const xmlChar *SystemID,
103
101
  const xmlChar *content);
104
- XMLPUBFUN xmlEntityPtr XMLCALL
102
+ XMLPUBFUN xmlEntityPtr
105
103
  xmlGetPredefinedEntity (const xmlChar *name);
106
- XMLPUBFUN xmlEntityPtr XMLCALL
104
+ XMLPUBFUN xmlEntityPtr
107
105
  xmlGetDocEntity (const xmlDoc *doc,
108
106
  const xmlChar *name);
109
- XMLPUBFUN xmlEntityPtr XMLCALL
107
+ XMLPUBFUN xmlEntityPtr
110
108
  xmlGetDtdEntity (xmlDocPtr doc,
111
109
  const xmlChar *name);
112
- XMLPUBFUN xmlEntityPtr XMLCALL
110
+ XMLPUBFUN xmlEntityPtr
113
111
  xmlGetParameterEntity (xmlDocPtr doc,
114
112
  const xmlChar *name);
115
113
  #ifdef LIBXML_LEGACY_ENABLED
116
114
  XML_DEPRECATED
117
- XMLPUBFUN const xmlChar * XMLCALL
115
+ XMLPUBFUN const xmlChar *
118
116
  xmlEncodeEntities (xmlDocPtr doc,
119
117
  const xmlChar *input);
120
118
  #endif /* LIBXML_LEGACY_ENABLED */
121
- XMLPUBFUN xmlChar * XMLCALL
119
+ XMLPUBFUN xmlChar *
122
120
  xmlEncodeEntitiesReentrant(xmlDocPtr doc,
123
121
  const xmlChar *input);
124
- XMLPUBFUN xmlChar * XMLCALL
122
+ XMLPUBFUN xmlChar *
125
123
  xmlEncodeSpecialChars (const xmlDoc *doc,
126
124
  const xmlChar *input);
127
- XMLPUBFUN xmlEntitiesTablePtr XMLCALL
125
+ XMLPUBFUN xmlEntitiesTablePtr
128
126
  xmlCreateEntitiesTable (void);
129
127
  #ifdef LIBXML_TREE_ENABLED
130
- XMLPUBFUN xmlEntitiesTablePtr XMLCALL
128
+ XMLPUBFUN xmlEntitiesTablePtr
131
129
  xmlCopyEntitiesTable (xmlEntitiesTablePtr table);
132
130
  #endif /* LIBXML_TREE_ENABLED */
133
- XMLPUBFUN void XMLCALL
131
+ XMLPUBFUN void
134
132
  xmlFreeEntitiesTable (xmlEntitiesTablePtr table);
135
133
  #ifdef LIBXML_OUTPUT_ENABLED
136
- XMLPUBFUN void XMLCALL
134
+ XMLPUBFUN void
137
135
  xmlDumpEntitiesTable (xmlBufferPtr buf,
138
136
  xmlEntitiesTablePtr table);
139
- XMLPUBFUN void XMLCALL
137
+ XMLPUBFUN void
140
138
  xmlDumpEntityDecl (xmlBufferPtr buf,
141
139
  xmlEntityPtr ent);
142
140
  #endif /* LIBXML_OUTPUT_ENABLED */
143
141
  #ifdef LIBXML_LEGACY_ENABLED
144
- XMLPUBFUN void XMLCALL
142
+ XMLPUBFUN void
145
143
  xmlCleanupPredefinedEntities(void);
146
144
  #endif /* LIBXML_LEGACY_ENABLED */
147
145