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.

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.so +0 -0
  88. data/lib/nokogiri/3.0/nokogiri.so +0 -0
  89. data/lib/nokogiri/3.1/nokogiri.so +0 -0
  90. data/lib/nokogiri/3.2/nokogiri.so +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 +3 -3
  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
@@ -40,6 +40,13 @@ XMLPUBVAR unsigned int xmlParserMaxDepth;
40
40
  */
41
41
  #define XML_MAX_TEXT_LENGTH 10000000
42
42
 
43
+ /**
44
+ * XML_MAX_HUGE_LENGTH:
45
+ *
46
+ * Maximum size allowed when XML_PARSE_HUGE is set.
47
+ */
48
+ #define XML_MAX_HUGE_LENGTH 1000000000
49
+
43
50
  /**
44
51
  * XML_MAX_NAME_LENGTH:
45
52
  *
@@ -278,34 +285,6 @@ XMLPUBVAR unsigned int xmlParserMaxDepth;
278
285
  */
279
286
  #define IS_PUBIDCHAR_CH(c) xmlIsPubidChar_ch(c)
280
287
 
281
- /**
282
- * SKIP_EOL:
283
- * @p: and UTF8 string pointer
284
- *
285
- * Skips the end of line chars.
286
- */
287
- #define SKIP_EOL(p) \
288
- if (*(p) == 0x13) { p++ ; if (*(p) == 0x10) p++; } \
289
- if (*(p) == 0x10) { p++ ; if (*(p) == 0x13) p++; }
290
-
291
- /**
292
- * MOVETO_ENDTAG:
293
- * @p: and UTF8 string pointer
294
- *
295
- * Skips to the next '>' char.
296
- */
297
- #define MOVETO_ENDTAG(p) \
298
- while ((*p) && (*(p) != '>')) (p)++
299
-
300
- /**
301
- * MOVETO_STARTTAG:
302
- * @p: and UTF8 string pointer
303
- *
304
- * Skips to the next '<' char.
305
- */
306
- #define MOVETO_STARTTAG(p) \
307
- while ((*p) && (*(p) != '<')) (p)++
308
-
309
288
  /**
310
289
  * Global variables used for predefined strings.
311
290
  */
@@ -316,71 +295,62 @@ XMLPUBVAR const xmlChar xmlStringComment[];
316
295
  /*
317
296
  * Function to finish the work of the macros where needed.
318
297
  */
319
- XMLPUBFUN int XMLCALL xmlIsLetter (int c);
298
+ XMLPUBFUN int xmlIsLetter (int c);
320
299
 
321
300
  /**
322
301
  * Parser context.
323
302
  */
324
- XMLPUBFUN xmlParserCtxtPtr XMLCALL
303
+ XMLPUBFUN xmlParserCtxtPtr
325
304
  xmlCreateFileParserCtxt (const char *filename);
326
- XMLPUBFUN xmlParserCtxtPtr XMLCALL
305
+ XMLPUBFUN xmlParserCtxtPtr
327
306
  xmlCreateURLParserCtxt (const char *filename,
328
307
  int options);
329
- XMLPUBFUN xmlParserCtxtPtr XMLCALL
308
+ XMLPUBFUN xmlParserCtxtPtr
330
309
  xmlCreateMemoryParserCtxt(const char *buffer,
331
310
  int size);
332
- XMLPUBFUN xmlParserCtxtPtr XMLCALL
311
+ XMLPUBFUN xmlParserCtxtPtr
333
312
  xmlCreateEntityParserCtxt(const xmlChar *URL,
334
313
  const xmlChar *ID,
335
314
  const xmlChar *base);
336
- XMLPUBFUN int XMLCALL
315
+ XMLPUBFUN int
337
316
  xmlSwitchEncoding (xmlParserCtxtPtr ctxt,
338
317
  xmlCharEncoding enc);
339
- XMLPUBFUN int XMLCALL
318
+ XMLPUBFUN int
340
319
  xmlSwitchToEncoding (xmlParserCtxtPtr ctxt,
341
320
  xmlCharEncodingHandlerPtr handler);
342
321
  XML_DEPRECATED
343
- XMLPUBFUN int XMLCALL
322
+ XMLPUBFUN int
344
323
  xmlSwitchInputEncoding (xmlParserCtxtPtr ctxt,
345
324
  xmlParserInputPtr input,
346
325
  xmlCharEncodingHandlerPtr handler);
347
326
 
348
- #ifdef IN_LIBXML
349
- /* internal error reporting */
350
- XMLPUBFUN void XMLCALL
351
- __xmlErrEncoding (xmlParserCtxtPtr ctxt,
352
- xmlParserErrors xmlerr,
353
- const char *msg,
354
- const xmlChar * str1,
355
- const xmlChar * str2) LIBXML_ATTR_FORMAT(3,0);
356
- #endif
357
-
358
327
  /**
359
328
  * Input Streams.
360
329
  */
361
- XMLPUBFUN xmlParserInputPtr XMLCALL
330
+ XMLPUBFUN xmlParserInputPtr
362
331
  xmlNewStringInputStream (xmlParserCtxtPtr ctxt,
363
332
  const xmlChar *buffer);
364
- XMLPUBFUN xmlParserInputPtr XMLCALL
333
+ XML_DEPRECATED
334
+ XMLPUBFUN xmlParserInputPtr
365
335
  xmlNewEntityInputStream (xmlParserCtxtPtr ctxt,
366
336
  xmlEntityPtr entity);
367
- XMLPUBFUN int XMLCALL
337
+ XMLPUBFUN int
368
338
  xmlPushInput (xmlParserCtxtPtr ctxt,
369
339
  xmlParserInputPtr input);
370
- XMLPUBFUN xmlChar XMLCALL
340
+ XMLPUBFUN xmlChar
371
341
  xmlPopInput (xmlParserCtxtPtr ctxt);
372
- XMLPUBFUN void XMLCALL
342
+ XMLPUBFUN void
373
343
  xmlFreeInputStream (xmlParserInputPtr input);
374
- XMLPUBFUN xmlParserInputPtr XMLCALL
344
+ XMLPUBFUN xmlParserInputPtr
375
345
  xmlNewInputFromFile (xmlParserCtxtPtr ctxt,
376
346
  const char *filename);
377
- XMLPUBFUN xmlParserInputPtr XMLCALL
347
+ XMLPUBFUN xmlParserInputPtr
378
348
  xmlNewInputStream (xmlParserCtxtPtr ctxt);
379
349
 
380
350
  /**
381
351
  * Namespaces.
382
352
  */
383
- XMLPUBFUN xmlChar * XMLCALL
353
+ XMLPUBFUN xmlChar *
384
354
  xmlSplitQName (xmlParserCtxtPtr ctxt,
385
355
  const xmlChar *name,
386
356
  xmlChar **prefix);
@@ -388,109 +358,151 @@ XMLPUBFUN xmlChar * XMLCALL
388
358
  /**
389
359
  * Generic production rules.
390
360
  */
391
- XMLPUBFUN const xmlChar * XMLCALL
361
+ XML_DEPRECATED
362
+ XMLPUBFUN const xmlChar *
392
363
  xmlParseName (xmlParserCtxtPtr ctxt);
393
- XMLPUBFUN xmlChar * XMLCALL
364
+ XML_DEPRECATED
365
+ XMLPUBFUN xmlChar *
394
366
  xmlParseNmtoken (xmlParserCtxtPtr ctxt);
395
- XMLPUBFUN xmlChar * XMLCALL
367
+ XML_DEPRECATED
368
+ XMLPUBFUN xmlChar *
396
369
  xmlParseEntityValue (xmlParserCtxtPtr ctxt,
397
370
  xmlChar **orig);
398
- XMLPUBFUN xmlChar * XMLCALL
371
+ XML_DEPRECATED
372
+ XMLPUBFUN xmlChar *
399
373
  xmlParseAttValue (xmlParserCtxtPtr ctxt);
400
- XMLPUBFUN xmlChar * XMLCALL
374
+ XML_DEPRECATED
375
+ XMLPUBFUN xmlChar *
401
376
  xmlParseSystemLiteral (xmlParserCtxtPtr ctxt);
402
- XMLPUBFUN xmlChar * XMLCALL
377
+ XML_DEPRECATED
378
+ XMLPUBFUN xmlChar *
403
379
  xmlParsePubidLiteral (xmlParserCtxtPtr ctxt);
404
- XMLPUBFUN void XMLCALL
380
+ XML_DEPRECATED
381
+ XMLPUBFUN void
405
382
  xmlParseCharData (xmlParserCtxtPtr ctxt,
406
383
  int cdata);
407
- XMLPUBFUN xmlChar * XMLCALL
384
+ XML_DEPRECATED
385
+ XMLPUBFUN xmlChar *
408
386
  xmlParseExternalID (xmlParserCtxtPtr ctxt,
409
387
  xmlChar **publicID,
410
388
  int strict);
411
- XMLPUBFUN void XMLCALL
389
+ XML_DEPRECATED
390
+ XMLPUBFUN void
412
391
  xmlParseComment (xmlParserCtxtPtr ctxt);
413
- XMLPUBFUN const xmlChar * XMLCALL
392
+ XML_DEPRECATED
393
+ XMLPUBFUN const xmlChar *
414
394
  xmlParsePITarget (xmlParserCtxtPtr ctxt);
415
- XMLPUBFUN void XMLCALL
395
+ XML_DEPRECATED
396
+ XMLPUBFUN void
416
397
  xmlParsePI (xmlParserCtxtPtr ctxt);
417
- XMLPUBFUN void XMLCALL
398
+ XML_DEPRECATED
399
+ XMLPUBFUN void
418
400
  xmlParseNotationDecl (xmlParserCtxtPtr ctxt);
419
- XMLPUBFUN void XMLCALL
401
+ XML_DEPRECATED
402
+ XMLPUBFUN void
420
403
  xmlParseEntityDecl (xmlParserCtxtPtr ctxt);
421
- XMLPUBFUN int XMLCALL
404
+ XML_DEPRECATED
405
+ XMLPUBFUN int
422
406
  xmlParseDefaultDecl (xmlParserCtxtPtr ctxt,
423
407
  xmlChar **value);
424
- XMLPUBFUN xmlEnumerationPtr XMLCALL
408
+ XML_DEPRECATED
409
+ XMLPUBFUN xmlEnumerationPtr
425
410
  xmlParseNotationType (xmlParserCtxtPtr ctxt);
426
- XMLPUBFUN xmlEnumerationPtr XMLCALL
411
+ XML_DEPRECATED
412
+ XMLPUBFUN xmlEnumerationPtr
427
413
  xmlParseEnumerationType (xmlParserCtxtPtr ctxt);
428
- XMLPUBFUN int XMLCALL
414
+ XML_DEPRECATED
415
+ XMLPUBFUN int
429
416
  xmlParseEnumeratedType (xmlParserCtxtPtr ctxt,
430
417
  xmlEnumerationPtr *tree);
431
- XMLPUBFUN int XMLCALL
418
+ XML_DEPRECATED
419
+ XMLPUBFUN int
432
420
  xmlParseAttributeType (xmlParserCtxtPtr ctxt,
433
421
  xmlEnumerationPtr *tree);
434
- XMLPUBFUN void XMLCALL
422
+ XML_DEPRECATED
423
+ XMLPUBFUN void
435
424
  xmlParseAttributeListDecl(xmlParserCtxtPtr ctxt);
436
- XMLPUBFUN xmlElementContentPtr XMLCALL
425
+ XML_DEPRECATED
426
+ XMLPUBFUN xmlElementContentPtr
437
427
  xmlParseElementMixedContentDecl
438
428
  (xmlParserCtxtPtr ctxt,
439
429
  int inputchk);
440
- XMLPUBFUN xmlElementContentPtr XMLCALL
430
+ XML_DEPRECATED
431
+ XMLPUBFUN xmlElementContentPtr
441
432
  xmlParseElementChildrenContentDecl
442
433
  (xmlParserCtxtPtr ctxt,
443
434
  int inputchk);
444
- XMLPUBFUN int XMLCALL
435
+ XML_DEPRECATED
436
+ XMLPUBFUN int
445
437
  xmlParseElementContentDecl(xmlParserCtxtPtr ctxt,
446
438
  const xmlChar *name,
447
439
  xmlElementContentPtr *result);
448
- XMLPUBFUN int XMLCALL
440
+ XML_DEPRECATED
441
+ XMLPUBFUN int
449
442
  xmlParseElementDecl (xmlParserCtxtPtr ctxt);
450
- XMLPUBFUN void XMLCALL
443
+ XML_DEPRECATED
444
+ XMLPUBFUN void
451
445
  xmlParseMarkupDecl (xmlParserCtxtPtr ctxt);
452
- XMLPUBFUN int XMLCALL
446
+ XML_DEPRECATED
447
+ XMLPUBFUN int
453
448
  xmlParseCharRef (xmlParserCtxtPtr ctxt);
454
- XMLPUBFUN xmlEntityPtr XMLCALL
449
+ XML_DEPRECATED
450
+ XMLPUBFUN xmlEntityPtr
455
451
  xmlParseEntityRef (xmlParserCtxtPtr ctxt);
456
- XMLPUBFUN void XMLCALL
452
+ XML_DEPRECATED
453
+ XMLPUBFUN void
457
454
  xmlParseReference (xmlParserCtxtPtr ctxt);
458
- XMLPUBFUN void XMLCALL
455
+ XML_DEPRECATED
456
+ XMLPUBFUN void
459
457
  xmlParsePEReference (xmlParserCtxtPtr ctxt);
460
- XMLPUBFUN void XMLCALL
458
+ XML_DEPRECATED
459
+ XMLPUBFUN void
461
460
  xmlParseDocTypeDecl (xmlParserCtxtPtr ctxt);
462
461
  #ifdef LIBXML_SAX1_ENABLED
463
- XMLPUBFUN const xmlChar * XMLCALL
462
+ XML_DEPRECATED
463
+ XMLPUBFUN const xmlChar *
464
464
  xmlParseAttribute (xmlParserCtxtPtr ctxt,
465
465
  xmlChar **value);
466
- XMLPUBFUN const xmlChar * XMLCALL
466
+ XML_DEPRECATED
467
+ XMLPUBFUN const xmlChar *
467
468
  xmlParseStartTag (xmlParserCtxtPtr ctxt);
468
- XMLPUBFUN void XMLCALL
469
+ XML_DEPRECATED
470
+ XMLPUBFUN void
469
471
  xmlParseEndTag (xmlParserCtxtPtr ctxt);
470
472
  #endif /* LIBXML_SAX1_ENABLED */
471
- XMLPUBFUN void XMLCALL
473
+ XML_DEPRECATED
474
+ XMLPUBFUN void
472
475
  xmlParseCDSect (xmlParserCtxtPtr ctxt);
473
- XMLPUBFUN void XMLCALL
476
+ XMLPUBFUN void
474
477
  xmlParseContent (xmlParserCtxtPtr ctxt);
475
- XMLPUBFUN void XMLCALL
478
+ XML_DEPRECATED
479
+ XMLPUBFUN void
476
480
  xmlParseElement (xmlParserCtxtPtr ctxt);
477
- XMLPUBFUN xmlChar * XMLCALL
481
+ XML_DEPRECATED
482
+ XMLPUBFUN xmlChar *
478
483
  xmlParseVersionNum (xmlParserCtxtPtr ctxt);
479
- XMLPUBFUN xmlChar * XMLCALL
484
+ XML_DEPRECATED
485
+ XMLPUBFUN xmlChar *
480
486
  xmlParseVersionInfo (xmlParserCtxtPtr ctxt);
481
- XMLPUBFUN xmlChar * XMLCALL
487
+ XML_DEPRECATED
488
+ XMLPUBFUN xmlChar *
482
489
  xmlParseEncName (xmlParserCtxtPtr ctxt);
483
- XMLPUBFUN const xmlChar * XMLCALL
490
+ XML_DEPRECATED
491
+ XMLPUBFUN const xmlChar *
484
492
  xmlParseEncodingDecl (xmlParserCtxtPtr ctxt);
485
- XMLPUBFUN int XMLCALL
493
+ XML_DEPRECATED
494
+ XMLPUBFUN int
486
495
  xmlParseSDDecl (xmlParserCtxtPtr ctxt);
487
- XMLPUBFUN void XMLCALL
496
+ XML_DEPRECATED
497
+ XMLPUBFUN void
488
498
  xmlParseXMLDecl (xmlParserCtxtPtr ctxt);
489
- XMLPUBFUN void XMLCALL
499
+ XML_DEPRECATED
500
+ XMLPUBFUN void
490
501
  xmlParseTextDecl (xmlParserCtxtPtr ctxt);
491
- XMLPUBFUN void XMLCALL
502
+ XML_DEPRECATED
503
+ XMLPUBFUN void
492
504
  xmlParseMisc (xmlParserCtxtPtr ctxt);
493
- XMLPUBFUN void XMLCALL
505
+ XMLPUBFUN void
494
506
  xmlParseExternalSubset (xmlParserCtxtPtr ctxt,
495
507
  const xmlChar *ExternalID,
496
508
  const xmlChar *SystemID);
@@ -519,14 +531,16 @@ XMLPUBFUN void XMLCALL
519
531
  */
520
532
  #define XML_SUBSTITUTE_BOTH 3
521
533
 
522
- XMLPUBFUN xmlChar * XMLCALL
534
+ XML_DEPRECATED
535
+ XMLPUBFUN xmlChar *
523
536
  xmlStringDecodeEntities (xmlParserCtxtPtr ctxt,
524
537
  const xmlChar *str,
525
538
  int what,
526
539
  xmlChar end,
527
540
  xmlChar end2,
528
541
  xmlChar end3);
529
- XMLPUBFUN xmlChar * XMLCALL
542
+ XML_DEPRECATED
543
+ XMLPUBFUN xmlChar *
530
544
  xmlStringLenDecodeEntities (xmlParserCtxtPtr ctxt,
531
545
  const xmlChar *str,
532
546
  int len,
@@ -538,48 +552,49 @@ XMLPUBFUN xmlChar * XMLCALL
538
552
  /*
539
553
  * Generated by MACROS on top of parser.c c.f. PUSH_AND_POP.
540
554
  */
541
- XMLPUBFUN int XMLCALL nodePush (xmlParserCtxtPtr ctxt,
555
+ XML_DEPRECATED
556
+ XMLPUBFUN int nodePush (xmlParserCtxtPtr ctxt,
542
557
  xmlNodePtr value);
543
- XMLPUBFUN xmlNodePtr XMLCALL nodePop (xmlParserCtxtPtr ctxt);
544
- XMLPUBFUN int XMLCALL inputPush (xmlParserCtxtPtr ctxt,
558
+ XML_DEPRECATED
559
+ XMLPUBFUN xmlNodePtr nodePop (xmlParserCtxtPtr ctxt);
560
+ XMLPUBFUN int inputPush (xmlParserCtxtPtr ctxt,
545
561
  xmlParserInputPtr value);
546
- XMLPUBFUN xmlParserInputPtr XMLCALL inputPop (xmlParserCtxtPtr ctxt);
547
- XMLPUBFUN const xmlChar * XMLCALL namePop (xmlParserCtxtPtr ctxt);
548
- XMLPUBFUN int XMLCALL namePush (xmlParserCtxtPtr ctxt,
562
+ XMLPUBFUN xmlParserInputPtr inputPop (xmlParserCtxtPtr ctxt);
563
+ XML_DEPRECATED
564
+ XMLPUBFUN const xmlChar * namePop (xmlParserCtxtPtr ctxt);
565
+ XML_DEPRECATED
566
+ XMLPUBFUN int namePush (xmlParserCtxtPtr ctxt,
549
567
  const xmlChar *value);
550
568
 
551
569
  /*
552
570
  * other commodities shared between parser.c and parserInternals.
553
571
  */
554
- XMLPUBFUN int XMLCALL xmlSkipBlankChars (xmlParserCtxtPtr ctxt);
555
- XMLPUBFUN int XMLCALL xmlStringCurrentChar (xmlParserCtxtPtr ctxt,
572
+ XML_DEPRECATED
573
+ XMLPUBFUN int xmlSkipBlankChars (xmlParserCtxtPtr ctxt);
574
+ XML_DEPRECATED
575
+ XMLPUBFUN int xmlStringCurrentChar (xmlParserCtxtPtr ctxt,
556
576
  const xmlChar *cur,
557
577
  int *len);
558
- XMLPUBFUN void XMLCALL xmlParserHandlePEReference(xmlParserCtxtPtr ctxt);
559
- XMLPUBFUN int XMLCALL xmlCheckLanguageID (const xmlChar *lang);
578
+ XML_DEPRECATED
579
+ XMLPUBFUN void xmlParserHandlePEReference(xmlParserCtxtPtr ctxt);
580
+ XML_DEPRECATED
581
+ XMLPUBFUN int xmlCheckLanguageID (const xmlChar *lang);
560
582
 
561
583
  /*
562
584
  * Really core function shared with HTML parser.
563
585
  */
564
- XMLPUBFUN int XMLCALL xmlCurrentChar (xmlParserCtxtPtr ctxt,
586
+ XML_DEPRECATED
587
+ XMLPUBFUN int xmlCurrentChar (xmlParserCtxtPtr ctxt,
565
588
  int *len);
566
- XMLPUBFUN int XMLCALL xmlCopyCharMultiByte (xmlChar *out,
589
+ XMLPUBFUN int xmlCopyCharMultiByte (xmlChar *out,
567
590
  int val);
568
- XMLPUBFUN int XMLCALL xmlCopyChar (int len,
591
+ XMLPUBFUN int xmlCopyChar (int len,
569
592
  xmlChar *out,
570
593
  int val);
571
- XMLPUBFUN void XMLCALL xmlNextChar (xmlParserCtxtPtr ctxt);
572
- XMLPUBFUN void XMLCALL xmlParserInputShrink (xmlParserInputPtr in);
573
-
574
- #ifdef LIBXML_HTML_ENABLED
575
- /*
576
- * Actually comes from the HTML parser but launched from the init stuff.
577
- */
578
594
  XML_DEPRECATED
579
- XMLPUBFUN void XMLCALL htmlInitAutoClose (void);
580
- XMLPUBFUN htmlParserCtxtPtr XMLCALL htmlCreateFileParserCtxt(const char *filename,
581
- const char *encoding);
582
- #endif
595
+ XMLPUBFUN void xmlNextChar (xmlParserCtxtPtr ctxt);
596
+ XML_DEPRECATED
597
+ XMLPUBFUN void xmlParserInputShrink (xmlParserInputPtr in);
583
598
 
584
599
  /*
585
600
  * Specific function to keep track of entities references
@@ -600,34 +615,34 @@ typedef void (*xmlEntityReferenceFunc) (xmlEntityPtr ent,
600
615
  xmlNodePtr lastNode);
601
616
 
602
617
  XML_DEPRECATED
603
- XMLPUBFUN void XMLCALL xmlSetEntityReferenceFunc (xmlEntityReferenceFunc func);
618
+ XMLPUBFUN void xmlSetEntityReferenceFunc (xmlEntityReferenceFunc func);
604
619
 
605
620
  XML_DEPRECATED
606
- XMLPUBFUN xmlChar * XMLCALL
621
+ XMLPUBFUN xmlChar *
607
622
  xmlParseQuotedString (xmlParserCtxtPtr ctxt);
608
623
  XML_DEPRECATED
609
- XMLPUBFUN void XMLCALL
624
+ XMLPUBFUN void
610
625
  xmlParseNamespace (xmlParserCtxtPtr ctxt);
611
626
  XML_DEPRECATED
612
- XMLPUBFUN xmlChar * XMLCALL
627
+ XMLPUBFUN xmlChar *
613
628
  xmlNamespaceParseNSDef (xmlParserCtxtPtr ctxt);
614
629
  XML_DEPRECATED
615
- XMLPUBFUN xmlChar * XMLCALL
630
+ XMLPUBFUN xmlChar *
616
631
  xmlScanName (xmlParserCtxtPtr ctxt);
617
632
  XML_DEPRECATED
618
- XMLPUBFUN xmlChar * XMLCALL
633
+ XMLPUBFUN xmlChar *
619
634
  xmlNamespaceParseNCName (xmlParserCtxtPtr ctxt);
620
635
  XML_DEPRECATED
621
- XMLPUBFUN void XMLCALL xmlParserHandleReference(xmlParserCtxtPtr ctxt);
636
+ XMLPUBFUN void xmlParserHandleReference(xmlParserCtxtPtr ctxt);
622
637
  XML_DEPRECATED
623
- XMLPUBFUN xmlChar * XMLCALL
638
+ XMLPUBFUN xmlChar *
624
639
  xmlNamespaceParseQName (xmlParserCtxtPtr ctxt,
625
640
  xmlChar **prefix);
626
641
  /**
627
642
  * Entities
628
643
  */
629
644
  XML_DEPRECATED
630
- XMLPUBFUN xmlChar * XMLCALL
645
+ XMLPUBFUN xmlChar *
631
646
  xmlDecodeEntities (xmlParserCtxtPtr ctxt,
632
647
  int len,
633
648
  int what,
@@ -635,21 +650,12 @@ XMLPUBFUN xmlChar * XMLCALL
635
650
  xmlChar end2,
636
651
  xmlChar end3);
637
652
  XML_DEPRECATED
638
- XMLPUBFUN void XMLCALL
653
+ XMLPUBFUN void
639
654
  xmlHandleEntity (xmlParserCtxtPtr ctxt,
640
655
  xmlEntityPtr entity);
641
656
 
642
657
  #endif /* LIBXML_LEGACY_ENABLED */
643
658
 
644
- #ifdef IN_LIBXML
645
- /*
646
- * internal only
647
- */
648
- XMLPUBFUN void XMLCALL
649
- xmlErrMemory (xmlParserCtxtPtr ctxt,
650
- const char *extra);
651
- #endif
652
-
653
659
  #ifdef __cplusplus
654
660
  }
655
661
  #endif
@@ -43,18 +43,18 @@ typedef enum {
43
43
  XML_PATTERN_XSFIELD = 1<<2 /* XPath subset for schema field */
44
44
  } xmlPatternFlags;
45
45
 
46
- XMLPUBFUN void XMLCALL
46
+ XMLPUBFUN void
47
47
  xmlFreePattern (xmlPatternPtr comp);
48
48
 
49
- XMLPUBFUN void XMLCALL
49
+ XMLPUBFUN void
50
50
  xmlFreePatternList (xmlPatternPtr comp);
51
51
 
52
- XMLPUBFUN xmlPatternPtr XMLCALL
52
+ XMLPUBFUN xmlPatternPtr
53
53
  xmlPatterncompile (const xmlChar *pattern,
54
54
  xmlDict *dict,
55
55
  int flags,
56
56
  const xmlChar **namespaces);
57
- XMLPUBFUN int XMLCALL
57
+ XMLPUBFUN int
58
58
  xmlPatternMatch (xmlPatternPtr comp,
59
59
  xmlNodePtr node);
60
60
 
@@ -62,34 +62,34 @@ XMLPUBFUN int XMLCALL
62
62
  typedef struct _xmlStreamCtxt xmlStreamCtxt;
63
63
  typedef xmlStreamCtxt *xmlStreamCtxtPtr;
64
64
 
65
- XMLPUBFUN int XMLCALL
65
+ XMLPUBFUN int
66
66
  xmlPatternStreamable (xmlPatternPtr comp);
67
- XMLPUBFUN int XMLCALL
67
+ XMLPUBFUN int
68
68
  xmlPatternMaxDepth (xmlPatternPtr comp);
69
- XMLPUBFUN int XMLCALL
69
+ XMLPUBFUN int
70
70
  xmlPatternMinDepth (xmlPatternPtr comp);
71
- XMLPUBFUN int XMLCALL
71
+ XMLPUBFUN int
72
72
  xmlPatternFromRoot (xmlPatternPtr comp);
73
- XMLPUBFUN xmlStreamCtxtPtr XMLCALL
73
+ XMLPUBFUN xmlStreamCtxtPtr
74
74
  xmlPatternGetStreamCtxt (xmlPatternPtr comp);
75
- XMLPUBFUN void XMLCALL
75
+ XMLPUBFUN void
76
76
  xmlFreeStreamCtxt (xmlStreamCtxtPtr stream);
77
- XMLPUBFUN int XMLCALL
77
+ XMLPUBFUN int
78
78
  xmlStreamPushNode (xmlStreamCtxtPtr stream,
79
79
  const xmlChar *name,
80
80
  const xmlChar *ns,
81
81
  int nodeType);
82
- XMLPUBFUN int XMLCALL
82
+ XMLPUBFUN int
83
83
  xmlStreamPush (xmlStreamCtxtPtr stream,
84
84
  const xmlChar *name,
85
85
  const xmlChar *ns);
86
- XMLPUBFUN int XMLCALL
86
+ XMLPUBFUN int
87
87
  xmlStreamPushAttr (xmlStreamCtxtPtr stream,
88
88
  const xmlChar *name,
89
89
  const xmlChar *ns);
90
- XMLPUBFUN int XMLCALL
90
+ XMLPUBFUN int
91
91
  xmlStreamPop (xmlStreamCtxtPtr stream);
92
- XMLPUBFUN int XMLCALL
92
+ XMLPUBFUN int
93
93
  xmlStreamWantsAnyNode (xmlStreamCtxtPtr stream);
94
94
  #ifdef __cplusplus
95
95
  }
@@ -32,7 +32,7 @@ typedef xmlRelaxNG *xmlRelaxNGPtr;
32
32
  *
33
33
  * Signature of an error callback from a Relax-NG validation
34
34
  */
35
- typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx,
35
+ typedef void (*xmlRelaxNGValidityErrorFunc) (void *ctx,
36
36
  const char *msg,
37
37
  ...) LIBXML_ATTR_FORMAT(2,3);
38
38
 
@@ -44,7 +44,7 @@ typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx,
44
44
  *
45
45
  * Signature of a warning callback from a Relax-NG validation
46
46
  */
47
- typedef void (XMLCDECL *xmlRelaxNGValidityWarningFunc) (void *ctx,
47
+ typedef void (*xmlRelaxNGValidityWarningFunc) (void *ctx,
48
48
  const char *msg,
49
49
  ...) LIBXML_ATTR_FORMAT(2,3);
50
50
 
@@ -116,95 +116,95 @@ typedef enum {
116
116
  XML_RELAXNGP_CRNG = 2
117
117
  } xmlRelaxNGParserFlag;
118
118
 
119
- XMLPUBFUN int XMLCALL
119
+ XMLPUBFUN int
120
120
  xmlRelaxNGInitTypes (void);
121
121
  XML_DEPRECATED
122
- XMLPUBFUN void XMLCALL
122
+ XMLPUBFUN void
123
123
  xmlRelaxNGCleanupTypes (void);
124
124
 
125
125
  /*
126
126
  * Interfaces for parsing.
127
127
  */
128
- XMLPUBFUN xmlRelaxNGParserCtxtPtr XMLCALL
128
+ XMLPUBFUN xmlRelaxNGParserCtxtPtr
129
129
  xmlRelaxNGNewParserCtxt (const char *URL);
130
- XMLPUBFUN xmlRelaxNGParserCtxtPtr XMLCALL
130
+ XMLPUBFUN xmlRelaxNGParserCtxtPtr
131
131
  xmlRelaxNGNewMemParserCtxt (const char *buffer,
132
132
  int size);
133
- XMLPUBFUN xmlRelaxNGParserCtxtPtr XMLCALL
133
+ XMLPUBFUN xmlRelaxNGParserCtxtPtr
134
134
  xmlRelaxNGNewDocParserCtxt (xmlDocPtr doc);
135
135
 
136
- XMLPUBFUN int XMLCALL
136
+ XMLPUBFUN int
137
137
  xmlRelaxParserSetFlag (xmlRelaxNGParserCtxtPtr ctxt,
138
138
  int flag);
139
139
 
140
- XMLPUBFUN void XMLCALL
140
+ XMLPUBFUN void
141
141
  xmlRelaxNGFreeParserCtxt (xmlRelaxNGParserCtxtPtr ctxt);
142
- XMLPUBFUN void XMLCALL
142
+ XMLPUBFUN void
143
143
  xmlRelaxNGSetParserErrors(xmlRelaxNGParserCtxtPtr ctxt,
144
144
  xmlRelaxNGValidityErrorFunc err,
145
145
  xmlRelaxNGValidityWarningFunc warn,
146
146
  void *ctx);
147
- XMLPUBFUN int XMLCALL
147
+ XMLPUBFUN int
148
148
  xmlRelaxNGGetParserErrors(xmlRelaxNGParserCtxtPtr ctxt,
149
149
  xmlRelaxNGValidityErrorFunc *err,
150
150
  xmlRelaxNGValidityWarningFunc *warn,
151
151
  void **ctx);
152
- XMLPUBFUN void XMLCALL
152
+ XMLPUBFUN void
153
153
  xmlRelaxNGSetParserStructuredErrors(
154
154
  xmlRelaxNGParserCtxtPtr ctxt,
155
155
  xmlStructuredErrorFunc serror,
156
156
  void *ctx);
157
- XMLPUBFUN xmlRelaxNGPtr XMLCALL
157
+ XMLPUBFUN xmlRelaxNGPtr
158
158
  xmlRelaxNGParse (xmlRelaxNGParserCtxtPtr ctxt);
159
- XMLPUBFUN void XMLCALL
159
+ XMLPUBFUN void
160
160
  xmlRelaxNGFree (xmlRelaxNGPtr schema);
161
161
  #ifdef LIBXML_OUTPUT_ENABLED
162
- XMLPUBFUN void XMLCALL
162
+ XMLPUBFUN void
163
163
  xmlRelaxNGDump (FILE *output,
164
164
  xmlRelaxNGPtr schema);
165
- XMLPUBFUN void XMLCALL
165
+ XMLPUBFUN void
166
166
  xmlRelaxNGDumpTree (FILE * output,
167
167
  xmlRelaxNGPtr schema);
168
168
  #endif /* LIBXML_OUTPUT_ENABLED */
169
169
  /*
170
170
  * Interfaces for validating
171
171
  */
172
- XMLPUBFUN void XMLCALL
172
+ XMLPUBFUN void
173
173
  xmlRelaxNGSetValidErrors(xmlRelaxNGValidCtxtPtr ctxt,
174
174
  xmlRelaxNGValidityErrorFunc err,
175
175
  xmlRelaxNGValidityWarningFunc warn,
176
176
  void *ctx);
177
- XMLPUBFUN int XMLCALL
177
+ XMLPUBFUN int
178
178
  xmlRelaxNGGetValidErrors(xmlRelaxNGValidCtxtPtr ctxt,
179
179
  xmlRelaxNGValidityErrorFunc *err,
180
180
  xmlRelaxNGValidityWarningFunc *warn,
181
181
  void **ctx);
182
- XMLPUBFUN void XMLCALL
182
+ XMLPUBFUN void
183
183
  xmlRelaxNGSetValidStructuredErrors(xmlRelaxNGValidCtxtPtr ctxt,
184
184
  xmlStructuredErrorFunc serror, void *ctx);
185
- XMLPUBFUN xmlRelaxNGValidCtxtPtr XMLCALL
185
+ XMLPUBFUN xmlRelaxNGValidCtxtPtr
186
186
  xmlRelaxNGNewValidCtxt (xmlRelaxNGPtr schema);
187
- XMLPUBFUN void XMLCALL
187
+ XMLPUBFUN void
188
188
  xmlRelaxNGFreeValidCtxt (xmlRelaxNGValidCtxtPtr ctxt);
189
- XMLPUBFUN int XMLCALL
189
+ XMLPUBFUN int
190
190
  xmlRelaxNGValidateDoc (xmlRelaxNGValidCtxtPtr ctxt,
191
191
  xmlDocPtr doc);
192
192
  /*
193
193
  * Interfaces for progressive validation when possible
194
194
  */
195
- XMLPUBFUN int XMLCALL
195
+ XMLPUBFUN int
196
196
  xmlRelaxNGValidatePushElement (xmlRelaxNGValidCtxtPtr ctxt,
197
197
  xmlDocPtr doc,
198
198
  xmlNodePtr elem);
199
- XMLPUBFUN int XMLCALL
199
+ XMLPUBFUN int
200
200
  xmlRelaxNGValidatePushCData (xmlRelaxNGValidCtxtPtr ctxt,
201
201
  const xmlChar *data,
202
202
  int len);
203
- XMLPUBFUN int XMLCALL
203
+ XMLPUBFUN int
204
204
  xmlRelaxNGValidatePopElement (xmlRelaxNGValidCtxtPtr ctxt,
205
205
  xmlDocPtr doc,
206
206
  xmlNodePtr elem);
207
- XMLPUBFUN int XMLCALL
207
+ XMLPUBFUN int
208
208
  xmlRelaxNGValidateFullElement (xmlRelaxNGValidCtxtPtr ctxt,
209
209
  xmlDocPtr doc,
210
210
  xmlNodePtr elem);