nokogiri 1.14.5-x86-linux → 1.15.0-x86-linux
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.
- checksums.yaml +4 -4
- data/Gemfile +9 -8
- data/dependencies.yml +6 -6
- data/ext/nokogiri/extconf.rb +66 -22
- data/ext/nokogiri/html4_document.c +1 -2
- data/ext/nokogiri/html4_element_description.c +19 -14
- data/ext/nokogiri/html4_sax_parser_context.c +10 -16
- data/ext/nokogiri/html4_sax_push_parser.c +2 -2
- data/ext/nokogiri/include/libexslt/exsltconfig.h +3 -3
- data/ext/nokogiri/include/libxml2/libxml/HTMLparser.h +52 -38
- data/ext/nokogiri/include/libxml2/libxml/HTMLtree.h +18 -18
- data/ext/nokogiri/include/libxml2/libxml/SAX.h +36 -36
- data/ext/nokogiri/include/libxml2/libxml/SAX2.h +37 -36
- data/ext/nokogiri/include/libxml2/libxml/c14n.h +4 -4
- data/ext/nokogiri/include/libxml2/libxml/catalog.h +36 -36
- data/ext/nokogiri/include/libxml2/libxml/chvalid.h +9 -9
- data/ext/nokogiri/include/libxml2/libxml/debugXML.h +28 -28
- data/ext/nokogiri/include/libxml2/libxml/dict.h +13 -13
- data/ext/nokogiri/include/libxml2/libxml/encoding.h +20 -19
- data/ext/nokogiri/include/libxml2/libxml/entities.h +19 -21
- data/ext/nokogiri/include/libxml2/libxml/globals.h +89 -59
- data/ext/nokogiri/include/libxml2/libxml/hash.h +25 -25
- data/ext/nokogiri/include/libxml2/libxml/list.h +26 -26
- data/ext/nokogiri/include/libxml2/libxml/nanoftp.h +22 -22
- data/ext/nokogiri/include/libxml2/libxml/nanohttp.h +17 -17
- data/ext/nokogiri/include/libxml2/libxml/parser.h +100 -79
- data/ext/nokogiri/include/libxml2/libxml/parserInternals.h +149 -143
- data/ext/nokogiri/include/libxml2/libxml/pattern.h +15 -15
- data/ext/nokogiri/include/libxml2/libxml/relaxng.h +26 -26
- data/ext/nokogiri/include/libxml2/libxml/schemasInternals.h +2 -2
- data/ext/nokogiri/include/libxml2/libxml/schematron.h +18 -18
- data/ext/nokogiri/include/libxml2/libxml/threads.h +23 -20
- data/ext/nokogiri/include/libxml2/libxml/tree.h +166 -164
- data/ext/nokogiri/include/libxml2/libxml/uri.h +15 -15
- data/ext/nokogiri/include/libxml2/libxml/valid.h +72 -87
- data/ext/nokogiri/include/libxml2/libxml/xinclude.h +10 -10
- data/ext/nokogiri/include/libxml2/libxml/xlink.h +5 -5
- data/ext/nokogiri/include/libxml2/libxml/xmlIO.h +60 -59
- data/ext/nokogiri/include/libxml2/libxml/xmlautomata.h +21 -21
- data/ext/nokogiri/include/libxml2/libxml/xmlerror.h +18 -46
- data/ext/nokogiri/include/libxml2/libxml/xmlexports.h +14 -41
- data/ext/nokogiri/include/libxml2/libxml/xmlmemory.h +26 -24
- data/ext/nokogiri/include/libxml2/libxml/xmlmodule.h +4 -4
- data/ext/nokogiri/include/libxml2/libxml/xmlreader.h +87 -87
- data/ext/nokogiri/include/libxml2/libxml/xmlregexp.h +30 -30
- data/ext/nokogiri/include/libxml2/libxml/xmlsave.h +10 -10
- data/ext/nokogiri/include/libxml2/libxml/xmlschemas.h +30 -30
- data/ext/nokogiri/include/libxml2/libxml/xmlschemastypes.h +34 -34
- data/ext/nokogiri/include/libxml2/libxml/xmlstring.h +30 -30
- data/ext/nokogiri/include/libxml2/libxml/xmlunicode.h +166 -166
- data/ext/nokogiri/include/libxml2/libxml/xmlversion.h +50 -27
- data/ext/nokogiri/include/libxml2/libxml/xmlwriter.h +80 -80
- data/ext/nokogiri/include/libxml2/libxml/xpath.h +41 -41
- data/ext/nokogiri/include/libxml2/libxml/xpathInternals.h +117 -117
- data/ext/nokogiri/include/libxml2/libxml/xpointer.h +21 -21
- data/ext/nokogiri/include/libxslt/attributes.h +1 -0
- data/ext/nokogiri/include/libxslt/variables.h +3 -3
- data/ext/nokogiri/include/libxslt/xsltInternals.h +14 -4
- data/ext/nokogiri/include/libxslt/xsltconfig.h +4 -4
- data/ext/nokogiri/include/libxslt/xsltlocale.h +14 -54
- data/ext/nokogiri/include/libxslt/xsltutils.h +35 -2
- data/ext/nokogiri/nokogiri.c +46 -24
- data/ext/nokogiri/nokogiri.h +13 -2
- data/ext/nokogiri/xml_attr.c +1 -1
- data/ext/nokogiri/xml_cdata.c +10 -2
- data/ext/nokogiri/xml_comment.c +1 -1
- data/ext/nokogiri/xml_document.c +102 -22
- data/ext/nokogiri/xml_document_fragment.c +1 -1
- data/ext/nokogiri/xml_dtd.c +1 -1
- data/ext/nokogiri/xml_element_content.c +32 -29
- data/ext/nokogiri/xml_element_decl.c +5 -5
- data/ext/nokogiri/xml_encoding_handler.c +12 -4
- data/ext/nokogiri/xml_entity_reference.c +1 -1
- data/ext/nokogiri/xml_namespace.c +11 -12
- data/ext/nokogiri/xml_node.c +7 -7
- data/ext/nokogiri/xml_node_set.c +125 -105
- data/ext/nokogiri/xml_processing_instruction.c +1 -1
- data/ext/nokogiri/xml_reader.c +37 -28
- data/ext/nokogiri/xml_relax_ng.c +65 -78
- data/ext/nokogiri/xml_sax_parser.c +24 -5
- data/ext/nokogiri/xml_sax_parser_context.c +46 -25
- data/ext/nokogiri/xml_sax_push_parser.c +29 -8
- data/ext/nokogiri/xml_schema.c +90 -116
- data/ext/nokogiri/xml_text.c +10 -2
- data/ext/nokogiri/xml_xpath_context.c +156 -83
- data/ext/nokogiri/xslt_stylesheet.c +103 -50
- data/lib/nokogiri/2.7/nokogiri.so +0 -0
- data/lib/nokogiri/3.0/nokogiri.so +0 -0
- data/lib/nokogiri/3.1/nokogiri.so +0 -0
- data/lib/nokogiri/3.2/nokogiri.so +0 -0
- data/lib/nokogiri/css/xpath_visitor.rb +2 -2
- data/lib/nokogiri/extension.rb +1 -1
- data/lib/nokogiri/html4/document_fragment.rb +1 -1
- data/lib/nokogiri/html4/element_description_defaults.rb +1821 -353
- data/lib/nokogiri/html5/document_fragment.rb +1 -1
- data/lib/nokogiri/html5/node.rb +5 -0
- data/lib/nokogiri/html5.rb +5 -2
- data/lib/nokogiri/jruby/nokogiri_jars.rb +3 -3
- data/lib/nokogiri/version/constant.rb +1 -1
- data/lib/nokogiri/xml/attribute_decl.rb +4 -2
- data/lib/nokogiri/xml/document_fragment.rb +1 -1
- data/lib/nokogiri/xml/element_content.rb +10 -2
- data/lib/nokogiri/xml/element_decl.rb +4 -2
- data/lib/nokogiri/xml/entity_decl.rb +4 -2
- data/lib/nokogiri/xml/node/save_options.rb +8 -0
- data/lib/nokogiri/xml/node.rb +22 -13
- data/lib/nokogiri/xml/pp/node.rb +23 -12
- data/lib/nokogiri/xml/sax/document.rb +1 -1
- data/lib/nokogiri/xml/searchable.rb +18 -10
- data/lib/nokogiri/xslt.rb +73 -3
- data/lib/nokogiri.rb +12 -4
- data/lib/xsd/xmlparser/nokogiri.rb +1 -1
- metadata +2 -2
@@ -31,7 +31,7 @@ extern "C" {
|
|
31
31
|
*
|
32
32
|
* Returns 1 if yes and 0 if another Input module should be used
|
33
33
|
*/
|
34
|
-
typedef int (
|
34
|
+
typedef int (*xmlInputMatchCallback) (char const *filename);
|
35
35
|
/**
|
36
36
|
* xmlInputOpenCallback:
|
37
37
|
* @filename: the filename or URI
|
@@ -40,7 +40,7 @@ typedef int (XMLCALL *xmlInputMatchCallback) (char const *filename);
|
|
40
40
|
*
|
41
41
|
* Returns an Input context or NULL in case or error
|
42
42
|
*/
|
43
|
-
typedef void * (
|
43
|
+
typedef void * (*xmlInputOpenCallback) (char const *filename);
|
44
44
|
/**
|
45
45
|
* xmlInputReadCallback:
|
46
46
|
* @context: an Input context
|
@@ -51,7 +51,7 @@ typedef void * (XMLCALL *xmlInputOpenCallback) (char const *filename);
|
|
51
51
|
*
|
52
52
|
* Returns the number of bytes read or -1 in case of error
|
53
53
|
*/
|
54
|
-
typedef int (
|
54
|
+
typedef int (*xmlInputReadCallback) (void * context, char * buffer, int len);
|
55
55
|
/**
|
56
56
|
* xmlInputCloseCallback:
|
57
57
|
* @context: an Input context
|
@@ -60,7 +60,7 @@ typedef int (XMLCALL *xmlInputReadCallback) (void * context, char * buffer, int
|
|
60
60
|
*
|
61
61
|
* Returns 0 or -1 in case of error
|
62
62
|
*/
|
63
|
-
typedef int (
|
63
|
+
typedef int (*xmlInputCloseCallback) (void * context);
|
64
64
|
|
65
65
|
#ifdef LIBXML_OUTPUT_ENABLED
|
66
66
|
/*
|
@@ -77,7 +77,7 @@ typedef int (XMLCALL *xmlInputCloseCallback) (void * context);
|
|
77
77
|
*
|
78
78
|
* Returns 1 if yes and 0 if another Output module should be used
|
79
79
|
*/
|
80
|
-
typedef int (
|
80
|
+
typedef int (*xmlOutputMatchCallback) (char const *filename);
|
81
81
|
/**
|
82
82
|
* xmlOutputOpenCallback:
|
83
83
|
* @filename: the filename or URI
|
@@ -86,7 +86,7 @@ typedef int (XMLCALL *xmlOutputMatchCallback) (char const *filename);
|
|
86
86
|
*
|
87
87
|
* Returns an Output context or NULL in case or error
|
88
88
|
*/
|
89
|
-
typedef void * (
|
89
|
+
typedef void * (*xmlOutputOpenCallback) (char const *filename);
|
90
90
|
/**
|
91
91
|
* xmlOutputWriteCallback:
|
92
92
|
* @context: an Output context
|
@@ -97,7 +97,7 @@ typedef void * (XMLCALL *xmlOutputOpenCallback) (char const *filename);
|
|
97
97
|
*
|
98
98
|
* Returns the number of bytes written or -1 in case of error
|
99
99
|
*/
|
100
|
-
typedef int (
|
100
|
+
typedef int (*xmlOutputWriteCallback) (void * context, const char * buffer,
|
101
101
|
int len);
|
102
102
|
/**
|
103
103
|
* xmlOutputCloseCallback:
|
@@ -107,7 +107,7 @@ typedef int (XMLCALL *xmlOutputWriteCallback) (void * context, const char * buff
|
|
107
107
|
*
|
108
108
|
* Returns 0 or -1 in case of error
|
109
109
|
*/
|
110
|
-
typedef int (
|
110
|
+
typedef int (*xmlOutputCloseCallback) (void * context);
|
111
111
|
#endif /* LIBXML_OUTPUT_ENABLED */
|
112
112
|
|
113
113
|
#ifdef __cplusplus
|
@@ -155,53 +155,54 @@ struct _xmlOutputBuffer {
|
|
155
155
|
/*
|
156
156
|
* Interfaces for input
|
157
157
|
*/
|
158
|
-
XMLPUBFUN void
|
158
|
+
XMLPUBFUN void
|
159
159
|
xmlCleanupInputCallbacks (void);
|
160
160
|
|
161
|
-
XMLPUBFUN int
|
161
|
+
XMLPUBFUN int
|
162
162
|
xmlPopInputCallbacks (void);
|
163
163
|
|
164
|
-
XMLPUBFUN void
|
164
|
+
XMLPUBFUN void
|
165
165
|
xmlRegisterDefaultInputCallbacks (void);
|
166
|
-
XMLPUBFUN xmlParserInputBufferPtr
|
166
|
+
XMLPUBFUN xmlParserInputBufferPtr
|
167
167
|
xmlAllocParserInputBuffer (xmlCharEncoding enc);
|
168
168
|
|
169
|
-
XMLPUBFUN xmlParserInputBufferPtr
|
169
|
+
XMLPUBFUN xmlParserInputBufferPtr
|
170
170
|
xmlParserInputBufferCreateFilename (const char *URI,
|
171
171
|
xmlCharEncoding enc);
|
172
|
-
XMLPUBFUN xmlParserInputBufferPtr
|
172
|
+
XMLPUBFUN xmlParserInputBufferPtr
|
173
173
|
xmlParserInputBufferCreateFile (FILE *file,
|
174
174
|
xmlCharEncoding enc);
|
175
|
-
XMLPUBFUN xmlParserInputBufferPtr
|
175
|
+
XMLPUBFUN xmlParserInputBufferPtr
|
176
176
|
xmlParserInputBufferCreateFd (int fd,
|
177
177
|
xmlCharEncoding enc);
|
178
|
-
XMLPUBFUN xmlParserInputBufferPtr
|
178
|
+
XMLPUBFUN xmlParserInputBufferPtr
|
179
179
|
xmlParserInputBufferCreateMem (const char *mem, int size,
|
180
180
|
xmlCharEncoding enc);
|
181
|
-
|
181
|
+
XML_DEPRECATED
|
182
|
+
XMLPUBFUN xmlParserInputBufferPtr
|
182
183
|
xmlParserInputBufferCreateStatic (const char *mem, int size,
|
183
184
|
xmlCharEncoding enc);
|
184
|
-
XMLPUBFUN xmlParserInputBufferPtr
|
185
|
+
XMLPUBFUN xmlParserInputBufferPtr
|
185
186
|
xmlParserInputBufferCreateIO (xmlInputReadCallback ioread,
|
186
187
|
xmlInputCloseCallback ioclose,
|
187
188
|
void *ioctx,
|
188
189
|
xmlCharEncoding enc);
|
189
|
-
XMLPUBFUN int
|
190
|
+
XMLPUBFUN int
|
190
191
|
xmlParserInputBufferRead (xmlParserInputBufferPtr in,
|
191
192
|
int len);
|
192
|
-
XMLPUBFUN int
|
193
|
+
XMLPUBFUN int
|
193
194
|
xmlParserInputBufferGrow (xmlParserInputBufferPtr in,
|
194
195
|
int len);
|
195
|
-
XMLPUBFUN int
|
196
|
+
XMLPUBFUN int
|
196
197
|
xmlParserInputBufferPush (xmlParserInputBufferPtr in,
|
197
198
|
int len,
|
198
199
|
const char *buf);
|
199
|
-
XMLPUBFUN void
|
200
|
+
XMLPUBFUN void
|
200
201
|
xmlFreeParserInputBuffer (xmlParserInputBufferPtr in);
|
201
|
-
XMLPUBFUN char *
|
202
|
+
XMLPUBFUN char *
|
202
203
|
xmlParserGetDirectory (const char *filename);
|
203
204
|
|
204
|
-
XMLPUBFUN int
|
205
|
+
XMLPUBFUN int
|
205
206
|
xmlRegisterInputCallbacks (xmlInputMatchCallback matchFunc,
|
206
207
|
xmlInputOpenCallback openFunc,
|
207
208
|
xmlInputReadCallback readFunc,
|
@@ -215,62 +216,62 @@ xmlParserInputBufferPtr
|
|
215
216
|
/*
|
216
217
|
* Interfaces for output
|
217
218
|
*/
|
218
|
-
XMLPUBFUN void
|
219
|
+
XMLPUBFUN void
|
219
220
|
xmlCleanupOutputCallbacks (void);
|
220
|
-
XMLPUBFUN int
|
221
|
+
XMLPUBFUN int
|
221
222
|
xmlPopOutputCallbacks (void);
|
222
|
-
XMLPUBFUN void
|
223
|
+
XMLPUBFUN void
|
223
224
|
xmlRegisterDefaultOutputCallbacks(void);
|
224
|
-
XMLPUBFUN xmlOutputBufferPtr
|
225
|
+
XMLPUBFUN xmlOutputBufferPtr
|
225
226
|
xmlAllocOutputBuffer (xmlCharEncodingHandlerPtr encoder);
|
226
227
|
|
227
|
-
XMLPUBFUN xmlOutputBufferPtr
|
228
|
+
XMLPUBFUN xmlOutputBufferPtr
|
228
229
|
xmlOutputBufferCreateFilename (const char *URI,
|
229
230
|
xmlCharEncodingHandlerPtr encoder,
|
230
231
|
int compression);
|
231
232
|
|
232
|
-
XMLPUBFUN xmlOutputBufferPtr
|
233
|
+
XMLPUBFUN xmlOutputBufferPtr
|
233
234
|
xmlOutputBufferCreateFile (FILE *file,
|
234
235
|
xmlCharEncodingHandlerPtr encoder);
|
235
236
|
|
236
|
-
XMLPUBFUN xmlOutputBufferPtr
|
237
|
+
XMLPUBFUN xmlOutputBufferPtr
|
237
238
|
xmlOutputBufferCreateBuffer (xmlBufferPtr buffer,
|
238
239
|
xmlCharEncodingHandlerPtr encoder);
|
239
240
|
|
240
|
-
XMLPUBFUN xmlOutputBufferPtr
|
241
|
+
XMLPUBFUN xmlOutputBufferPtr
|
241
242
|
xmlOutputBufferCreateFd (int fd,
|
242
243
|
xmlCharEncodingHandlerPtr encoder);
|
243
244
|
|
244
|
-
XMLPUBFUN xmlOutputBufferPtr
|
245
|
+
XMLPUBFUN xmlOutputBufferPtr
|
245
246
|
xmlOutputBufferCreateIO (xmlOutputWriteCallback iowrite,
|
246
247
|
xmlOutputCloseCallback ioclose,
|
247
248
|
void *ioctx,
|
248
249
|
xmlCharEncodingHandlerPtr encoder);
|
249
250
|
|
250
251
|
/* Couple of APIs to get the output without digging into the buffers */
|
251
|
-
XMLPUBFUN const xmlChar *
|
252
|
+
XMLPUBFUN const xmlChar *
|
252
253
|
xmlOutputBufferGetContent (xmlOutputBufferPtr out);
|
253
|
-
XMLPUBFUN size_t
|
254
|
+
XMLPUBFUN size_t
|
254
255
|
xmlOutputBufferGetSize (xmlOutputBufferPtr out);
|
255
256
|
|
256
|
-
XMLPUBFUN int
|
257
|
+
XMLPUBFUN int
|
257
258
|
xmlOutputBufferWrite (xmlOutputBufferPtr out,
|
258
259
|
int len,
|
259
260
|
const char *buf);
|
260
|
-
XMLPUBFUN int
|
261
|
+
XMLPUBFUN int
|
261
262
|
xmlOutputBufferWriteString (xmlOutputBufferPtr out,
|
262
263
|
const char *str);
|
263
|
-
XMLPUBFUN int
|
264
|
+
XMLPUBFUN int
|
264
265
|
xmlOutputBufferWriteEscape (xmlOutputBufferPtr out,
|
265
266
|
const xmlChar *str,
|
266
267
|
xmlCharEncodingOutputFunc escaping);
|
267
268
|
|
268
|
-
XMLPUBFUN int
|
269
|
+
XMLPUBFUN int
|
269
270
|
xmlOutputBufferFlush (xmlOutputBufferPtr out);
|
270
|
-
XMLPUBFUN int
|
271
|
+
XMLPUBFUN int
|
271
272
|
xmlOutputBufferClose (xmlOutputBufferPtr out);
|
272
273
|
|
273
|
-
XMLPUBFUN int
|
274
|
+
XMLPUBFUN int
|
274
275
|
xmlRegisterOutputCallbacks (xmlOutputMatchCallback matchFunc,
|
275
276
|
xmlOutputOpenCallback openFunc,
|
276
277
|
xmlOutputWriteCallback writeFunc,
|
@@ -283,20 +284,20 @@ xmlOutputBufferPtr
|
|
283
284
|
|
284
285
|
#ifdef LIBXML_HTTP_ENABLED
|
285
286
|
/* This function only exists if HTTP support built into the library */
|
286
|
-
XMLPUBFUN void
|
287
|
+
XMLPUBFUN void
|
287
288
|
xmlRegisterHTTPPostCallbacks (void );
|
288
289
|
#endif /* LIBXML_HTTP_ENABLED */
|
289
290
|
|
290
291
|
#endif /* LIBXML_OUTPUT_ENABLED */
|
291
292
|
|
292
|
-
XMLPUBFUN xmlParserInputPtr
|
293
|
+
XMLPUBFUN xmlParserInputPtr
|
293
294
|
xmlCheckHTTPInput (xmlParserCtxtPtr ctxt,
|
294
295
|
xmlParserInputPtr ret);
|
295
296
|
|
296
297
|
/*
|
297
298
|
* A predefined entity loader disabling network accesses
|
298
299
|
*/
|
299
|
-
XMLPUBFUN xmlParserInputPtr
|
300
|
+
XMLPUBFUN xmlParserInputPtr
|
300
301
|
xmlNoNetExternalEntityLoader (const char *URL,
|
301
302
|
const char *ID,
|
302
303
|
xmlParserCtxtPtr ctxt);
|
@@ -305,43 +306,43 @@ XMLPUBFUN xmlParserInputPtr XMLCALL
|
|
305
306
|
* xmlNormalizeWindowsPath is obsolete, don't use it.
|
306
307
|
* Check xmlCanonicPath in uri.h for a better alternative.
|
307
308
|
*/
|
308
|
-
XMLPUBFUN xmlChar *
|
309
|
+
XMLPUBFUN xmlChar *
|
309
310
|
xmlNormalizeWindowsPath (const xmlChar *path);
|
310
311
|
|
311
|
-
XMLPUBFUN int
|
312
|
+
XMLPUBFUN int
|
312
313
|
xmlCheckFilename (const char *path);
|
313
314
|
/**
|
314
315
|
* Default 'file://' protocol callbacks
|
315
316
|
*/
|
316
|
-
XMLPUBFUN int
|
317
|
+
XMLPUBFUN int
|
317
318
|
xmlFileMatch (const char *filename);
|
318
|
-
XMLPUBFUN void *
|
319
|
+
XMLPUBFUN void *
|
319
320
|
xmlFileOpen (const char *filename);
|
320
|
-
XMLPUBFUN int
|
321
|
+
XMLPUBFUN int
|
321
322
|
xmlFileRead (void * context,
|
322
323
|
char * buffer,
|
323
324
|
int len);
|
324
|
-
XMLPUBFUN int
|
325
|
+
XMLPUBFUN int
|
325
326
|
xmlFileClose (void * context);
|
326
327
|
|
327
328
|
/**
|
328
329
|
* Default 'http://' protocol callbacks
|
329
330
|
*/
|
330
331
|
#ifdef LIBXML_HTTP_ENABLED
|
331
|
-
XMLPUBFUN int
|
332
|
+
XMLPUBFUN int
|
332
333
|
xmlIOHTTPMatch (const char *filename);
|
333
|
-
XMLPUBFUN void *
|
334
|
+
XMLPUBFUN void *
|
334
335
|
xmlIOHTTPOpen (const char *filename);
|
335
336
|
#ifdef LIBXML_OUTPUT_ENABLED
|
336
|
-
XMLPUBFUN void *
|
337
|
+
XMLPUBFUN void *
|
337
338
|
xmlIOHTTPOpenW (const char * post_uri,
|
338
339
|
int compression );
|
339
340
|
#endif /* LIBXML_OUTPUT_ENABLED */
|
340
|
-
XMLPUBFUN int
|
341
|
+
XMLPUBFUN int
|
341
342
|
xmlIOHTTPRead (void * context,
|
342
343
|
char * buffer,
|
343
344
|
int len);
|
344
|
-
XMLPUBFUN int
|
345
|
+
XMLPUBFUN int
|
345
346
|
xmlIOHTTPClose (void * context);
|
346
347
|
#endif /* LIBXML_HTTP_ENABLED */
|
347
348
|
|
@@ -349,15 +350,15 @@ XMLPUBFUN int XMLCALL
|
|
349
350
|
* Default 'ftp://' protocol callbacks
|
350
351
|
*/
|
351
352
|
#ifdef LIBXML_FTP_ENABLED
|
352
|
-
XMLPUBFUN int
|
353
|
+
XMLPUBFUN int
|
353
354
|
xmlIOFTPMatch (const char *filename);
|
354
|
-
XMLPUBFUN void *
|
355
|
+
XMLPUBFUN void *
|
355
356
|
xmlIOFTPOpen (const char *filename);
|
356
|
-
XMLPUBFUN int
|
357
|
+
XMLPUBFUN int
|
357
358
|
xmlIOFTPRead (void * context,
|
358
359
|
char * buffer,
|
359
360
|
int len);
|
360
|
-
XMLPUBFUN int
|
361
|
+
XMLPUBFUN int
|
361
362
|
xmlIOFTPClose (void * context);
|
362
363
|
#endif /* LIBXML_FTP_ENABLED */
|
363
364
|
|
@@ -11,11 +11,11 @@
|
|
11
11
|
#define __XML_AUTOMATA_H__
|
12
12
|
|
13
13
|
#include <libxml/xmlversion.h>
|
14
|
-
#include <libxml/tree.h>
|
15
14
|
|
16
15
|
#ifdef LIBXML_REGEXP_ENABLED
|
17
16
|
#ifdef LIBXML_AUTOMATA_ENABLED
|
18
|
-
|
17
|
+
|
18
|
+
#include <libxml/xmlstring.h>
|
19
19
|
|
20
20
|
#ifdef __cplusplus
|
21
21
|
extern "C" {
|
@@ -40,32 +40,32 @@ typedef xmlAutomataState *xmlAutomataStatePtr;
|
|
40
40
|
/*
|
41
41
|
* Building API
|
42
42
|
*/
|
43
|
-
XMLPUBFUN xmlAutomataPtr
|
43
|
+
XMLPUBFUN xmlAutomataPtr
|
44
44
|
xmlNewAutomata (void);
|
45
|
-
XMLPUBFUN void
|
45
|
+
XMLPUBFUN void
|
46
46
|
xmlFreeAutomata (xmlAutomataPtr am);
|
47
47
|
|
48
|
-
XMLPUBFUN xmlAutomataStatePtr
|
48
|
+
XMLPUBFUN xmlAutomataStatePtr
|
49
49
|
xmlAutomataGetInitState (xmlAutomataPtr am);
|
50
|
-
XMLPUBFUN int
|
50
|
+
XMLPUBFUN int
|
51
51
|
xmlAutomataSetFinalState (xmlAutomataPtr am,
|
52
52
|
xmlAutomataStatePtr state);
|
53
|
-
XMLPUBFUN xmlAutomataStatePtr
|
53
|
+
XMLPUBFUN xmlAutomataStatePtr
|
54
54
|
xmlAutomataNewState (xmlAutomataPtr am);
|
55
|
-
XMLPUBFUN xmlAutomataStatePtr
|
55
|
+
XMLPUBFUN xmlAutomataStatePtr
|
56
56
|
xmlAutomataNewTransition (xmlAutomataPtr am,
|
57
57
|
xmlAutomataStatePtr from,
|
58
58
|
xmlAutomataStatePtr to,
|
59
59
|
const xmlChar *token,
|
60
60
|
void *data);
|
61
|
-
XMLPUBFUN xmlAutomataStatePtr
|
61
|
+
XMLPUBFUN xmlAutomataStatePtr
|
62
62
|
xmlAutomataNewTransition2 (xmlAutomataPtr am,
|
63
63
|
xmlAutomataStatePtr from,
|
64
64
|
xmlAutomataStatePtr to,
|
65
65
|
const xmlChar *token,
|
66
66
|
const xmlChar *token2,
|
67
67
|
void *data);
|
68
|
-
XMLPUBFUN xmlAutomataStatePtr
|
68
|
+
XMLPUBFUN xmlAutomataStatePtr
|
69
69
|
xmlAutomataNewNegTrans (xmlAutomataPtr am,
|
70
70
|
xmlAutomataStatePtr from,
|
71
71
|
xmlAutomataStatePtr to,
|
@@ -73,7 +73,7 @@ XMLPUBFUN xmlAutomataStatePtr XMLCALL
|
|
73
73
|
const xmlChar *token2,
|
74
74
|
void *data);
|
75
75
|
|
76
|
-
XMLPUBFUN xmlAutomataStatePtr
|
76
|
+
XMLPUBFUN xmlAutomataStatePtr
|
77
77
|
xmlAutomataNewCountTrans (xmlAutomataPtr am,
|
78
78
|
xmlAutomataStatePtr from,
|
79
79
|
xmlAutomataStatePtr to,
|
@@ -81,7 +81,7 @@ XMLPUBFUN xmlAutomataStatePtr XMLCALL
|
|
81
81
|
int min,
|
82
82
|
int max,
|
83
83
|
void *data);
|
84
|
-
XMLPUBFUN xmlAutomataStatePtr
|
84
|
+
XMLPUBFUN xmlAutomataStatePtr
|
85
85
|
xmlAutomataNewCountTrans2 (xmlAutomataPtr am,
|
86
86
|
xmlAutomataStatePtr from,
|
87
87
|
xmlAutomataStatePtr to,
|
@@ -90,7 +90,7 @@ XMLPUBFUN xmlAutomataStatePtr XMLCALL
|
|
90
90
|
int min,
|
91
91
|
int max,
|
92
92
|
void *data);
|
93
|
-
XMLPUBFUN xmlAutomataStatePtr
|
93
|
+
XMLPUBFUN xmlAutomataStatePtr
|
94
94
|
xmlAutomataNewOnceTrans (xmlAutomataPtr am,
|
95
95
|
xmlAutomataStatePtr from,
|
96
96
|
xmlAutomataStatePtr to,
|
@@ -98,7 +98,7 @@ XMLPUBFUN xmlAutomataStatePtr XMLCALL
|
|
98
98
|
int min,
|
99
99
|
int max,
|
100
100
|
void *data);
|
101
|
-
XMLPUBFUN xmlAutomataStatePtr
|
101
|
+
XMLPUBFUN xmlAutomataStatePtr
|
102
102
|
xmlAutomataNewOnceTrans2 (xmlAutomataPtr am,
|
103
103
|
xmlAutomataStatePtr from,
|
104
104
|
xmlAutomataStatePtr to,
|
@@ -107,33 +107,33 @@ XMLPUBFUN xmlAutomataStatePtr XMLCALL
|
|
107
107
|
int min,
|
108
108
|
int max,
|
109
109
|
void *data);
|
110
|
-
XMLPUBFUN xmlAutomataStatePtr
|
110
|
+
XMLPUBFUN xmlAutomataStatePtr
|
111
111
|
xmlAutomataNewAllTrans (xmlAutomataPtr am,
|
112
112
|
xmlAutomataStatePtr from,
|
113
113
|
xmlAutomataStatePtr to,
|
114
114
|
int lax);
|
115
|
-
XMLPUBFUN xmlAutomataStatePtr
|
115
|
+
XMLPUBFUN xmlAutomataStatePtr
|
116
116
|
xmlAutomataNewEpsilon (xmlAutomataPtr am,
|
117
117
|
xmlAutomataStatePtr from,
|
118
118
|
xmlAutomataStatePtr to);
|
119
|
-
XMLPUBFUN xmlAutomataStatePtr
|
119
|
+
XMLPUBFUN xmlAutomataStatePtr
|
120
120
|
xmlAutomataNewCountedTrans (xmlAutomataPtr am,
|
121
121
|
xmlAutomataStatePtr from,
|
122
122
|
xmlAutomataStatePtr to,
|
123
123
|
int counter);
|
124
|
-
XMLPUBFUN xmlAutomataStatePtr
|
124
|
+
XMLPUBFUN xmlAutomataStatePtr
|
125
125
|
xmlAutomataNewCounterTrans (xmlAutomataPtr am,
|
126
126
|
xmlAutomataStatePtr from,
|
127
127
|
xmlAutomataStatePtr to,
|
128
128
|
int counter);
|
129
|
-
XMLPUBFUN int
|
129
|
+
XMLPUBFUN int
|
130
130
|
xmlAutomataNewCounter (xmlAutomataPtr am,
|
131
131
|
int min,
|
132
132
|
int max);
|
133
133
|
|
134
|
-
XMLPUBFUN
|
134
|
+
XMLPUBFUN struct _xmlRegexp *
|
135
135
|
xmlAutomataCompile (xmlAutomataPtr am);
|
136
|
-
XMLPUBFUN int
|
136
|
+
XMLPUBFUN int
|
137
137
|
xmlAutomataIsDeterminist (xmlAutomataPtr am);
|
138
138
|
|
139
139
|
#ifdef __cplusplus
|
@@ -844,7 +844,7 @@ typedef enum {
|
|
844
844
|
* Signature of the function to use when there is an error and
|
845
845
|
* no parsing or validity context available .
|
846
846
|
*/
|
847
|
-
typedef void (
|
847
|
+
typedef void (*xmlGenericErrorFunc) (void *ctx,
|
848
848
|
const char *msg,
|
849
849
|
...) LIBXML_ATTR_FORMAT(2,3);
|
850
850
|
/**
|
@@ -855,92 +855,64 @@ typedef void (XMLCDECL *xmlGenericErrorFunc) (void *ctx,
|
|
855
855
|
* Signature of the function to use when there is an error and
|
856
856
|
* the module handles the new error reporting mechanism.
|
857
857
|
*/
|
858
|
-
typedef void (
|
858
|
+
typedef void (*xmlStructuredErrorFunc) (void *userData, xmlErrorPtr error);
|
859
859
|
|
860
860
|
/*
|
861
861
|
* Use the following function to reset the two global variables
|
862
862
|
* xmlGenericError and xmlGenericErrorContext.
|
863
863
|
*/
|
864
|
-
XMLPUBFUN void
|
864
|
+
XMLPUBFUN void
|
865
865
|
xmlSetGenericErrorFunc (void *ctx,
|
866
866
|
xmlGenericErrorFunc handler);
|
867
|
-
|
867
|
+
XML_DEPRECATED
|
868
|
+
XMLPUBFUN void
|
868
869
|
initGenericErrorDefaultFunc (xmlGenericErrorFunc *handler);
|
869
870
|
|
870
|
-
XMLPUBFUN void
|
871
|
+
XMLPUBFUN void
|
871
872
|
xmlSetStructuredErrorFunc (void *ctx,
|
872
873
|
xmlStructuredErrorFunc handler);
|
873
874
|
/*
|
874
875
|
* Default message routines used by SAX and Valid context for error
|
875
876
|
* and warning reporting.
|
876
877
|
*/
|
877
|
-
XMLPUBFUN void
|
878
|
+
XMLPUBFUN void
|
878
879
|
xmlParserError (void *ctx,
|
879
880
|
const char *msg,
|
880
881
|
...) LIBXML_ATTR_FORMAT(2,3);
|
881
|
-
XMLPUBFUN void
|
882
|
+
XMLPUBFUN void
|
882
883
|
xmlParserWarning (void *ctx,
|
883
884
|
const char *msg,
|
884
885
|
...) LIBXML_ATTR_FORMAT(2,3);
|
885
|
-
XMLPUBFUN void
|
886
|
+
XMLPUBFUN void
|
886
887
|
xmlParserValidityError (void *ctx,
|
887
888
|
const char *msg,
|
888
889
|
...) LIBXML_ATTR_FORMAT(2,3);
|
889
|
-
XMLPUBFUN void
|
890
|
+
XMLPUBFUN void
|
890
891
|
xmlParserValidityWarning (void *ctx,
|
891
892
|
const char *msg,
|
892
893
|
...) LIBXML_ATTR_FORMAT(2,3);
|
893
|
-
XMLPUBFUN void
|
894
|
+
XMLPUBFUN void
|
894
895
|
xmlParserPrintFileInfo (xmlParserInputPtr input);
|
895
|
-
XMLPUBFUN void
|
896
|
+
XMLPUBFUN void
|
896
897
|
xmlParserPrintFileContext (xmlParserInputPtr input);
|
897
898
|
|
898
899
|
/*
|
899
900
|
* Extended error information routines
|
900
901
|
*/
|
901
|
-
XMLPUBFUN xmlErrorPtr
|
902
|
+
XMLPUBFUN xmlErrorPtr
|
902
903
|
xmlGetLastError (void);
|
903
|
-
XMLPUBFUN void
|
904
|
+
XMLPUBFUN void
|
904
905
|
xmlResetLastError (void);
|
905
|
-
XMLPUBFUN xmlErrorPtr
|
906
|
+
XMLPUBFUN xmlErrorPtr
|
906
907
|
xmlCtxtGetLastError (void *ctx);
|
907
|
-
XMLPUBFUN void
|
908
|
+
XMLPUBFUN void
|
908
909
|
xmlCtxtResetLastError (void *ctx);
|
909
|
-
XMLPUBFUN void
|
910
|
+
XMLPUBFUN void
|
910
911
|
xmlResetError (xmlErrorPtr err);
|
911
|
-
XMLPUBFUN int
|
912
|
+
XMLPUBFUN int
|
912
913
|
xmlCopyError (xmlErrorPtr from,
|
913
914
|
xmlErrorPtr to);
|
914
915
|
|
915
|
-
#ifdef IN_LIBXML
|
916
|
-
/*
|
917
|
-
* Internal callback reporting routine
|
918
|
-
*/
|
919
|
-
XMLPUBFUN void XMLCALL
|
920
|
-
__xmlRaiseError (xmlStructuredErrorFunc schannel,
|
921
|
-
xmlGenericErrorFunc channel,
|
922
|
-
void *data,
|
923
|
-
void *ctx,
|
924
|
-
void *node,
|
925
|
-
int domain,
|
926
|
-
int code,
|
927
|
-
xmlErrorLevel level,
|
928
|
-
const char *file,
|
929
|
-
int line,
|
930
|
-
const char *str1,
|
931
|
-
const char *str2,
|
932
|
-
const char *str3,
|
933
|
-
int int1,
|
934
|
-
int col,
|
935
|
-
const char *msg,
|
936
|
-
...) LIBXML_ATTR_FORMAT(16,17);
|
937
|
-
XMLPUBFUN void XMLCALL
|
938
|
-
__xmlSimpleError (int domain,
|
939
|
-
int code,
|
940
|
-
xmlNodePtr node,
|
941
|
-
const char *msg,
|
942
|
-
const char *extra) LIBXML_ATTR_FORMAT(4,0);
|
943
|
-
#endif
|
944
916
|
#ifdef __cplusplus
|
945
917
|
}
|
946
918
|
#endif
|
@@ -8,50 +8,19 @@
|
|
8
8
|
#ifndef __XML_EXPORTS_H__
|
9
9
|
#define __XML_EXPORTS_H__
|
10
10
|
|
11
|
-
#if defined(_WIN32) || defined(__CYGWIN__)
|
12
11
|
/** DOC_DISABLE */
|
13
|
-
|
14
|
-
#ifdef LIBXML_STATIC
|
15
|
-
|
16
|
-
#elif defined(IN_LIBXML)
|
17
|
-
|
18
|
-
#else
|
19
|
-
|
20
|
-
#endif
|
21
|
-
|
22
|
-
#if defined(LIBXML_FASTCALL)
|
23
|
-
#define XMLCALL __fastcall
|
24
|
-
#else
|
25
|
-
#define XMLCALL __cdecl
|
26
|
-
#endif
|
27
|
-
#define XMLCDECL __cdecl
|
28
|
-
|
29
|
-
/** DOC_ENABLE */
|
12
|
+
#if defined(_WIN32) || defined(__CYGWIN__)
|
13
|
+
#ifdef LIBXML_STATIC
|
14
|
+
#define XMLPUBLIC
|
15
|
+
#elif defined(IN_LIBXML)
|
16
|
+
#define XMLPUBLIC __declspec(dllexport)
|
17
|
+
#else
|
18
|
+
#define XMLPUBLIC __declspec(dllimport)
|
19
|
+
#endif
|
30
20
|
#else /* not Windows */
|
31
|
-
|
32
|
-
/**
|
33
|
-
* XMLPUBLIC:
|
34
|
-
*
|
35
|
-
* Macro which declares a public symbol
|
36
|
-
*/
|
37
|
-
#define XMLPUBLIC
|
38
|
-
|
39
|
-
/**
|
40
|
-
* XMLCALL:
|
41
|
-
*
|
42
|
-
* Macro which declares the calling convention for exported functions
|
43
|
-
*/
|
44
|
-
#define XMLCALL
|
45
|
-
|
46
|
-
/**
|
47
|
-
* XMLCDECL:
|
48
|
-
*
|
49
|
-
* Macro which declares the calling convention for exported functions that
|
50
|
-
* use '...'.
|
51
|
-
*/
|
52
|
-
#define XMLCDECL
|
53
|
-
|
21
|
+
#define XMLPUBLIC
|
54
22
|
#endif /* platform switch */
|
23
|
+
/** DOC_ENABLE */
|
55
24
|
|
56
25
|
/*
|
57
26
|
* XMLPUBFUN:
|
@@ -67,10 +36,14 @@
|
|
67
36
|
*/
|
68
37
|
#define XMLPUBVAR XMLPUBLIC extern
|
69
38
|
|
39
|
+
/** DOC_DISABLE */
|
70
40
|
/* Compatibility */
|
41
|
+
#define XMLCALL
|
42
|
+
#define XMLCDECL
|
71
43
|
#if !defined(LIBXML_DLL_IMPORT)
|
72
44
|
#define LIBXML_DLL_IMPORT XMLPUBVAR
|
73
45
|
#endif
|
46
|
+
/** DOC_ENABLE */
|
74
47
|
|
75
48
|
#endif /* __XML_EXPORTS_H__ */
|
76
49
|
|