nokogiri 1.16.7-x64-mingw-ucrt → 1.17.0-x64-mingw-ucrt
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +11 -21
- data/README.md +4 -0
- data/dependencies.yml +6 -6
- data/ext/nokogiri/extconf.rb +191 -137
- data/ext/nokogiri/gumbo.c +69 -53
- data/ext/nokogiri/html4_document.c +10 -4
- data/ext/nokogiri/html4_element_description.c +18 -18
- data/ext/nokogiri/html4_sax_parser.c +40 -0
- data/ext/nokogiri/html4_sax_parser_context.c +48 -58
- data/ext/nokogiri/html4_sax_push_parser.c +25 -24
- data/ext/nokogiri/include/libexslt/exsltconfig.h +3 -3
- data/ext/nokogiri/include/libxml2/libxml/HTMLparser.h +12 -19
- data/ext/nokogiri/include/libxml2/libxml/c14n.h +1 -12
- data/ext/nokogiri/include/libxml2/libxml/debugXML.h +1 -1
- data/ext/nokogiri/include/libxml2/libxml/encoding.h +9 -0
- data/ext/nokogiri/include/libxml2/libxml/entities.h +12 -1
- data/ext/nokogiri/include/libxml2/libxml/hash.h +19 -0
- data/ext/nokogiri/include/libxml2/libxml/list.h +2 -2
- data/ext/nokogiri/include/libxml2/libxml/nanohttp.h +17 -0
- data/ext/nokogiri/include/libxml2/libxml/parser.h +60 -54
- data/ext/nokogiri/include/libxml2/libxml/parserInternals.h +9 -1
- data/ext/nokogiri/include/libxml2/libxml/pattern.h +6 -0
- data/ext/nokogiri/include/libxml2/libxml/tree.h +32 -12
- data/ext/nokogiri/include/libxml2/libxml/uri.h +11 -0
- data/ext/nokogiri/include/libxml2/libxml/valid.h +29 -2
- data/ext/nokogiri/include/libxml2/libxml/xinclude.h +7 -0
- data/ext/nokogiri/include/libxml2/libxml/xmlIO.h +21 -4
- data/ext/nokogiri/include/libxml2/libxml/xmlerror.h +14 -0
- data/ext/nokogiri/include/libxml2/libxml/xmlexports.h +111 -15
- data/ext/nokogiri/include/libxml2/libxml/xmlmemory.h +8 -45
- data/ext/nokogiri/include/libxml2/libxml/xmlreader.h +2 -0
- data/ext/nokogiri/include/libxml2/libxml/xmlsave.h +5 -0
- data/ext/nokogiri/include/libxml2/libxml/xmlunicode.h +165 -1
- data/ext/nokogiri/include/libxml2/libxml/xmlversion.h +7 -171
- data/ext/nokogiri/include/libxml2/libxml/xmlwriter.h +1 -0
- data/ext/nokogiri/include/libxml2/libxml/xpath.h +4 -0
- data/ext/nokogiri/include/libxslt/xsltInternals.h +3 -0
- data/ext/nokogiri/include/libxslt/xsltconfig.h +4 -37
- data/ext/nokogiri/libxml2_polyfill.c +114 -0
- data/ext/nokogiri/nokogiri.c +9 -2
- data/ext/nokogiri/nokogiri.h +18 -33
- data/ext/nokogiri/xml_attr.c +1 -1
- data/ext/nokogiri/xml_cdata.c +2 -10
- data/ext/nokogiri/xml_comment.c +3 -8
- data/ext/nokogiri/xml_document.c +163 -156
- data/ext/nokogiri/xml_document_fragment.c +10 -25
- data/ext/nokogiri/xml_dtd.c +1 -1
- data/ext/nokogiri/xml_element_content.c +9 -9
- data/ext/nokogiri/xml_encoding_handler.c +4 -4
- data/ext/nokogiri/xml_namespace.c +6 -6
- data/ext/nokogiri/xml_node.c +137 -105
- data/ext/nokogiri/xml_node_set.c +46 -44
- data/ext/nokogiri/xml_reader.c +54 -58
- data/ext/nokogiri/xml_relax_ng.c +35 -56
- data/ext/nokogiri/xml_sax_parser.c +156 -88
- data/ext/nokogiri/xml_sax_parser_context.c +213 -131
- data/ext/nokogiri/xml_sax_push_parser.c +68 -49
- data/ext/nokogiri/xml_schema.c +50 -85
- data/ext/nokogiri/xml_syntax_error.c +19 -11
- data/ext/nokogiri/xml_text.c +2 -4
- data/ext/nokogiri/xml_xpath_context.c +2 -2
- data/ext/nokogiri/xslt_stylesheet.c +8 -8
- data/lib/nokogiri/3.1/nokogiri.so +0 -0
- data/lib/nokogiri/3.2/nokogiri.so +0 -0
- data/lib/nokogiri/3.3/nokogiri.so +0 -0
- data/lib/nokogiri/class_resolver.rb +1 -1
- data/lib/nokogiri/css/node.rb +6 -2
- data/lib/nokogiri/css/parser.rb +6 -4
- data/lib/nokogiri/css/parser.y +2 -2
- data/lib/nokogiri/css/parser_extras.rb +6 -66
- data/lib/nokogiri/css/selector_cache.rb +38 -0
- data/lib/nokogiri/css/tokenizer.rb +4 -4
- data/lib/nokogiri/css/tokenizer.rex +9 -8
- data/lib/nokogiri/css/xpath_visitor.rb +42 -6
- data/lib/nokogiri/css.rb +86 -20
- data/lib/nokogiri/decorators/slop.rb +3 -5
- data/lib/nokogiri/encoding_handler.rb +2 -2
- data/lib/nokogiri/html4/document.rb +44 -23
- data/lib/nokogiri/html4/document_fragment.rb +124 -12
- data/lib/nokogiri/html4/encoding_reader.rb +1 -1
- data/lib/nokogiri/html4/sax/parser.rb +23 -38
- data/lib/nokogiri/html4/sax/parser_context.rb +4 -9
- data/lib/nokogiri/html4.rb +9 -14
- data/lib/nokogiri/html5/builder.rb +40 -0
- data/lib/nokogiri/html5/document.rb +61 -30
- data/lib/nokogiri/html5/document_fragment.rb +130 -20
- data/lib/nokogiri/html5/node.rb +4 -4
- data/lib/nokogiri/html5.rb +114 -72
- data/lib/nokogiri/version/constant.rb +1 -1
- data/lib/nokogiri/xml/builder.rb +8 -1
- data/lib/nokogiri/xml/document.rb +70 -26
- data/lib/nokogiri/xml/document_fragment.rb +84 -13
- data/lib/nokogiri/xml/node.rb +82 -11
- data/lib/nokogiri/xml/node_set.rb +9 -7
- data/lib/nokogiri/xml/parse_options.rb +1 -1
- data/lib/nokogiri/xml/pp/node.rb +6 -1
- data/lib/nokogiri/xml/reader.rb +46 -13
- data/lib/nokogiri/xml/relax_ng.rb +57 -20
- data/lib/nokogiri/xml/sax/document.rb +174 -83
- data/lib/nokogiri/xml/sax/parser.rb +115 -41
- data/lib/nokogiri/xml/sax/parser_context.rb +116 -8
- data/lib/nokogiri/xml/sax/push_parser.rb +3 -0
- data/lib/nokogiri/xml/sax.rb +48 -0
- data/lib/nokogiri/xml/schema.rb +112 -45
- data/lib/nokogiri/xml/searchable.rb +6 -8
- data/lib/nokogiri/xml/syntax_error.rb +22 -0
- data/lib/nokogiri/xml.rb +13 -24
- data/lib/nokogiri/xslt.rb +3 -9
- data/lib/xsd/xmlparser/nokogiri.rb +3 -4
- metadata +8 -5
- data/ext/nokogiri/libxml2_backwards_compat.c +0 -121
@@ -10,12 +10,14 @@
|
|
10
10
|
#ifndef __XML_IO_H__
|
11
11
|
#define __XML_IO_H__
|
12
12
|
|
13
|
+
/** DOC_DISABLE */
|
13
14
|
#include <stdio.h>
|
14
15
|
#include <libxml/xmlversion.h>
|
15
16
|
#include <libxml/encoding.h>
|
16
17
|
#define XML_TREE_INTERNALS
|
17
18
|
#include <libxml/tree.h>
|
18
19
|
#undef XML_TREE_INTERNALS
|
20
|
+
/** DOC_ENABLE */
|
19
21
|
|
20
22
|
#ifdef __cplusplus
|
21
23
|
extern "C" {
|
@@ -323,12 +325,14 @@ xmlOutputBufferPtr
|
|
323
325
|
|
324
326
|
#ifdef LIBXML_HTTP_ENABLED
|
325
327
|
/* This function only exists if HTTP support built into the library */
|
328
|
+
XML_DEPRECATED
|
326
329
|
XMLPUBFUN void
|
327
330
|
xmlRegisterHTTPPostCallbacks (void );
|
328
331
|
#endif /* LIBXML_HTTP_ENABLED */
|
329
332
|
|
330
333
|
#endif /* LIBXML_OUTPUT_ENABLED */
|
331
334
|
|
335
|
+
XML_DEPRECATED
|
332
336
|
XMLPUBFUN xmlParserInputPtr
|
333
337
|
xmlCheckHTTPInput (xmlParserCtxtPtr ctxt,
|
334
338
|
xmlParserInputPtr ret);
|
@@ -341,26 +345,28 @@ XMLPUBFUN xmlParserInputPtr
|
|
341
345
|
const char *ID,
|
342
346
|
xmlParserCtxtPtr ctxt);
|
343
347
|
|
344
|
-
|
345
|
-
* xmlNormalizeWindowsPath is obsolete, don't use it.
|
346
|
-
* Check xmlCanonicPath in uri.h for a better alternative.
|
347
|
-
*/
|
348
|
+
XML_DEPRECATED
|
348
349
|
XMLPUBFUN xmlChar *
|
349
350
|
xmlNormalizeWindowsPath (const xmlChar *path);
|
350
351
|
|
352
|
+
XML_DEPRECATED
|
351
353
|
XMLPUBFUN int
|
352
354
|
xmlCheckFilename (const char *path);
|
353
355
|
/**
|
354
356
|
* Default 'file://' protocol callbacks
|
355
357
|
*/
|
358
|
+
XML_DEPRECATED
|
356
359
|
XMLPUBFUN int
|
357
360
|
xmlFileMatch (const char *filename);
|
361
|
+
XML_DEPRECATED
|
358
362
|
XMLPUBFUN void *
|
359
363
|
xmlFileOpen (const char *filename);
|
364
|
+
XML_DEPRECATED
|
360
365
|
XMLPUBFUN int
|
361
366
|
xmlFileRead (void * context,
|
362
367
|
char * buffer,
|
363
368
|
int len);
|
369
|
+
XML_DEPRECATED
|
364
370
|
XMLPUBFUN int
|
365
371
|
xmlFileClose (void * context);
|
366
372
|
|
@@ -368,19 +374,24 @@ XMLPUBFUN int
|
|
368
374
|
* Default 'http://' protocol callbacks
|
369
375
|
*/
|
370
376
|
#ifdef LIBXML_HTTP_ENABLED
|
377
|
+
XML_DEPRECATED
|
371
378
|
XMLPUBFUN int
|
372
379
|
xmlIOHTTPMatch (const char *filename);
|
380
|
+
XML_DEPRECATED
|
373
381
|
XMLPUBFUN void *
|
374
382
|
xmlIOHTTPOpen (const char *filename);
|
375
383
|
#ifdef LIBXML_OUTPUT_ENABLED
|
384
|
+
XML_DEPRECATED
|
376
385
|
XMLPUBFUN void *
|
377
386
|
xmlIOHTTPOpenW (const char * post_uri,
|
378
387
|
int compression );
|
379
388
|
#endif /* LIBXML_OUTPUT_ENABLED */
|
389
|
+
XML_DEPRECATED
|
380
390
|
XMLPUBFUN int
|
381
391
|
xmlIOHTTPRead (void * context,
|
382
392
|
char * buffer,
|
383
393
|
int len);
|
394
|
+
XML_DEPRECATED
|
384
395
|
XMLPUBFUN int
|
385
396
|
xmlIOHTTPClose (void * context);
|
386
397
|
#endif /* LIBXML_HTTP_ENABLED */
|
@@ -389,14 +400,18 @@ XMLPUBFUN int
|
|
389
400
|
* Default 'ftp://' protocol callbacks
|
390
401
|
*/
|
391
402
|
#if defined(LIBXML_FTP_ENABLED)
|
403
|
+
XML_DEPRECATED
|
392
404
|
XMLPUBFUN int
|
393
405
|
xmlIOFTPMatch (const char *filename);
|
406
|
+
XML_DEPRECATED
|
394
407
|
XMLPUBFUN void *
|
395
408
|
xmlIOFTPOpen (const char *filename);
|
409
|
+
XML_DEPRECATED
|
396
410
|
XMLPUBFUN int
|
397
411
|
xmlIOFTPRead (void * context,
|
398
412
|
char * buffer,
|
399
413
|
int len);
|
414
|
+
XML_DEPRECATED
|
400
415
|
XMLPUBFUN int
|
401
416
|
xmlIOFTPClose (void * context);
|
402
417
|
#endif /* defined(LIBXML_FTP_ENABLED) */
|
@@ -407,9 +422,11 @@ XMLPUBFUN xmlParserInputBufferCreateFilenameFunc
|
|
407
422
|
XMLPUBFUN xmlOutputBufferCreateFilenameFunc
|
408
423
|
xmlOutputBufferCreateFilenameDefault(
|
409
424
|
xmlOutputBufferCreateFilenameFunc func);
|
425
|
+
XML_DEPRECATED
|
410
426
|
XMLPUBFUN xmlOutputBufferCreateFilenameFunc
|
411
427
|
xmlThrDefOutputBufferCreateFilenameDefault(
|
412
428
|
xmlOutputBufferCreateFilenameFunc func);
|
429
|
+
XML_DEPRECATED
|
413
430
|
XMLPUBFUN xmlParserInputBufferCreateFilenameFunc
|
414
431
|
xmlThrDefParserInputBufferCreateFilenameDefault(
|
415
432
|
xmlParserInputBufferCreateFilenameFunc func);
|
@@ -211,6 +211,11 @@ typedef enum {
|
|
211
211
|
XML_ERR_USER_STOP, /* 111 */
|
212
212
|
XML_ERR_COMMENT_ABRUPTLY_ENDED, /* 112 */
|
213
213
|
XML_WAR_ENCODING_MISMATCH, /* 113 */
|
214
|
+
XML_ERR_RESOURCE_LIMIT, /* 114 */
|
215
|
+
XML_ERR_ARGUMENT, /* 115 */
|
216
|
+
XML_ERR_SYSTEM, /* 116 */
|
217
|
+
XML_ERR_REDECL_PREDEF_ENTITY, /* 117 */
|
218
|
+
XML_ERR_INT_SUBSET_NOT_FINISHED, /* 118 */
|
214
219
|
XML_NS_ERR_XML_NAMESPACE = 200,
|
215
220
|
XML_NS_ERR_UNDEFINED_NAMESPACE, /* 201 */
|
216
221
|
XML_NS_ERR_QNAME, /* 202 */
|
@@ -473,6 +478,7 @@ typedef enum {
|
|
473
478
|
XML_IO_EADDRINUSE, /* 1554 */
|
474
479
|
XML_IO_EALREADY, /* 1555 */
|
475
480
|
XML_IO_EAFNOSUPPORT, /* 1556 */
|
481
|
+
XML_IO_UNSUPPORTED_PROTOCOL, /* 1557 */
|
476
482
|
XML_XINCLUDE_RECURSION=1600,
|
477
483
|
XML_XINCLUDE_PARSE_VALUE, /* 1601 */
|
478
484
|
XML_XINCLUDE_ENTITY_DEF_MISMATCH, /* 1602 */
|
@@ -886,6 +892,7 @@ XML_GLOBALS_ERROR
|
|
886
892
|
XMLPUBFUN void
|
887
893
|
xmlSetGenericErrorFunc (void *ctx,
|
888
894
|
xmlGenericErrorFunc handler);
|
895
|
+
XML_DEPRECATED
|
889
896
|
XMLPUBFUN void
|
890
897
|
xmlThrDefSetGenericErrorFunc(void *ctx,
|
891
898
|
xmlGenericErrorFunc handler);
|
@@ -896,6 +903,7 @@ XMLPUBFUN void
|
|
896
903
|
XMLPUBFUN void
|
897
904
|
xmlSetStructuredErrorFunc (void *ctx,
|
898
905
|
xmlStructuredErrorFunc handler);
|
906
|
+
XML_DEPRECATED
|
899
907
|
XMLPUBFUN void
|
900
908
|
xmlThrDefSetStructuredErrorFunc(void *ctx,
|
901
909
|
xmlStructuredErrorFunc handler);
|
@@ -919,11 +927,17 @@ XMLPUBFUN void
|
|
919
927
|
xmlParserValidityWarning (void *ctx,
|
920
928
|
const char *msg,
|
921
929
|
...) LIBXML_ATTR_FORMAT(2,3);
|
930
|
+
/** DOC_DISABLE */
|
922
931
|
struct _xmlParserInput;
|
932
|
+
/** DOC_ENABLE */
|
923
933
|
XMLPUBFUN void
|
924
934
|
xmlParserPrintFileInfo (struct _xmlParserInput *input);
|
925
935
|
XMLPUBFUN void
|
926
936
|
xmlParserPrintFileContext (struct _xmlParserInput *input);
|
937
|
+
XMLPUBFUN void
|
938
|
+
xmlFormatError (const xmlError *err,
|
939
|
+
xmlGenericErrorFunc channel,
|
940
|
+
void *data);
|
927
941
|
|
928
942
|
/*
|
929
943
|
* Extended error information routines
|
@@ -9,6 +9,11 @@
|
|
9
9
|
#define __XML_EXPORTS_H__
|
10
10
|
|
11
11
|
/** DOC_DISABLE */
|
12
|
+
|
13
|
+
/*
|
14
|
+
* Symbol visibility
|
15
|
+
*/
|
16
|
+
|
12
17
|
#if defined(_WIN32) || defined(__CYGWIN__)
|
13
18
|
#ifdef LIBXML_STATIC
|
14
19
|
#define XMLPUBLIC
|
@@ -20,30 +25,121 @@
|
|
20
25
|
#else /* not Windows */
|
21
26
|
#define XMLPUBLIC
|
22
27
|
#endif /* platform switch */
|
23
|
-
/** DOC_ENABLE */
|
24
28
|
|
25
|
-
/*
|
26
|
-
* XMLPUBFUN:
|
27
|
-
*
|
28
|
-
* Macro which declares an exportable function
|
29
|
-
*/
|
30
29
|
#define XMLPUBFUN XMLPUBLIC
|
31
30
|
|
32
|
-
/**
|
33
|
-
* XMLPUBVAR:
|
34
|
-
*
|
35
|
-
* Macro which declares an exportable variable
|
36
|
-
*/
|
37
31
|
#define XMLPUBVAR XMLPUBLIC extern
|
38
32
|
|
39
|
-
/** DOC_DISABLE */
|
40
33
|
/* Compatibility */
|
41
34
|
#define XMLCALL
|
42
35
|
#define XMLCDECL
|
43
|
-
#
|
44
|
-
#define LIBXML_DLL_IMPORT XMLPUBVAR
|
36
|
+
#ifndef LIBXML_DLL_IMPORT
|
37
|
+
#define LIBXML_DLL_IMPORT XMLPUBVAR
|
38
|
+
#endif
|
39
|
+
|
40
|
+
/*
|
41
|
+
* Attributes
|
42
|
+
*/
|
43
|
+
|
44
|
+
#ifndef ATTRIBUTE_UNUSED
|
45
|
+
#if __GNUC__ * 100 + __GNUC_MINOR__ >= 207 || defined(__clang__)
|
46
|
+
#define ATTRIBUTE_UNUSED __attribute__((unused))
|
47
|
+
#else
|
48
|
+
#define ATTRIBUTE_UNUSED
|
49
|
+
#endif
|
50
|
+
#endif
|
51
|
+
|
52
|
+
#if !defined(__clang__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 403)
|
53
|
+
#define LIBXML_ATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x)))
|
54
|
+
#else
|
55
|
+
#define LIBXML_ATTR_ALLOC_SIZE(x)
|
56
|
+
#endif
|
57
|
+
|
58
|
+
#if __GNUC__ * 100 + __GNUC_MINOR__ >= 303
|
59
|
+
#define LIBXML_ATTR_FORMAT(fmt,args) \
|
60
|
+
__attribute__((__format__(__printf__,fmt,args)))
|
61
|
+
#else
|
62
|
+
#define LIBXML_ATTR_FORMAT(fmt,args)
|
63
|
+
#endif
|
64
|
+
|
65
|
+
#ifndef XML_DEPRECATED
|
66
|
+
#if defined(IN_LIBXML)
|
67
|
+
#define XML_DEPRECATED
|
68
|
+
#elif __GNUC__ * 100 + __GNUC_MINOR__ >= 301
|
69
|
+
#define XML_DEPRECATED __attribute__((deprecated))
|
70
|
+
#elif defined(_MSC_VER) && _MSC_VER >= 1400
|
71
|
+
/* Available since Visual Studio 2005 */
|
72
|
+
#define XML_DEPRECATED __declspec(deprecated)
|
73
|
+
#else
|
74
|
+
#define XML_DEPRECATED
|
75
|
+
#endif
|
76
|
+
#endif
|
77
|
+
|
78
|
+
/*
|
79
|
+
* Warnings pragmas, should be moved from public headers
|
80
|
+
*/
|
81
|
+
|
82
|
+
#if defined(__LCC__)
|
83
|
+
|
84
|
+
#define XML_IGNORE_FPTR_CAST_WARNINGS
|
85
|
+
#define XML_POP_WARNINGS \
|
86
|
+
_Pragma("diag_default 1215")
|
87
|
+
|
88
|
+
#elif defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
|
89
|
+
|
90
|
+
#if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 800)
|
91
|
+
#define XML_IGNORE_FPTR_CAST_WARNINGS \
|
92
|
+
_Pragma("GCC diagnostic push") \
|
93
|
+
_Pragma("GCC diagnostic ignored \"-Wpedantic\"") \
|
94
|
+
_Pragma("GCC diagnostic ignored \"-Wcast-function-type\"")
|
95
|
+
#else
|
96
|
+
#define XML_IGNORE_FPTR_CAST_WARNINGS \
|
97
|
+
_Pragma("GCC diagnostic push") \
|
98
|
+
_Pragma("GCC diagnostic ignored \"-Wpedantic\"")
|
99
|
+
#endif
|
100
|
+
#define XML_POP_WARNINGS \
|
101
|
+
_Pragma("GCC diagnostic pop")
|
102
|
+
|
103
|
+
#elif defined(_MSC_VER) && _MSC_VER >= 1400
|
104
|
+
|
105
|
+
#define XML_IGNORE_FPTR_CAST_WARNINGS __pragma(warning(push))
|
106
|
+
#define XML_POP_WARNINGS __pragma(warning(pop))
|
107
|
+
|
108
|
+
#else
|
109
|
+
|
110
|
+
#define XML_IGNORE_FPTR_CAST_WARNINGS
|
111
|
+
#define XML_POP_WARNINGS
|
112
|
+
|
113
|
+
#endif
|
114
|
+
|
115
|
+
/*
|
116
|
+
* Accessors for globals
|
117
|
+
*/
|
118
|
+
|
119
|
+
#define XML_NO_ATTR
|
120
|
+
|
121
|
+
#ifdef LIBXML_THREAD_ENABLED
|
122
|
+
#define XML_DECLARE_GLOBAL(name, type, attrs) \
|
123
|
+
attrs XMLPUBFUN type *__##name(void);
|
124
|
+
#define XML_GLOBAL_MACRO(name) (*__##name())
|
125
|
+
#else
|
126
|
+
#define XML_DECLARE_GLOBAL(name, type, attrs) \
|
127
|
+
attrs XMLPUBVAR type name;
|
128
|
+
#endif
|
129
|
+
|
130
|
+
/*
|
131
|
+
* Originally declared in xmlversion.h which is generated
|
132
|
+
*/
|
133
|
+
|
134
|
+
#ifdef __cplusplus
|
135
|
+
extern "C" {
|
136
|
+
#endif
|
137
|
+
|
138
|
+
XMLPUBFUN void xmlCheckVersion(int version);
|
139
|
+
|
140
|
+
#ifdef __cplusplus
|
141
|
+
}
|
45
142
|
#endif
|
46
|
-
/** DOC_ENABLE */
|
47
143
|
|
48
144
|
#endif /* __XML_EXPORTS_H__ */
|
49
145
|
|
@@ -147,12 +147,16 @@ XMLPUBFUN int
|
|
147
147
|
xmlMemUsed (void);
|
148
148
|
XMLPUBFUN int
|
149
149
|
xmlMemBlocks (void);
|
150
|
+
XML_DEPRECATED
|
150
151
|
XMLPUBFUN void
|
151
152
|
xmlMemDisplay (FILE *fp);
|
153
|
+
XML_DEPRECATED
|
152
154
|
XMLPUBFUN void
|
153
155
|
xmlMemDisplayLast(FILE *fp, long nbBytes);
|
156
|
+
XML_DEPRECATED
|
154
157
|
XMLPUBFUN void
|
155
158
|
xmlMemShow (FILE *fp, int nr);
|
159
|
+
XML_DEPRECATED
|
156
160
|
XMLPUBFUN void
|
157
161
|
xmlMemoryDump (void);
|
158
162
|
XMLPUBFUN void *
|
@@ -163,60 +167,19 @@ XMLPUBFUN void
|
|
163
167
|
xmlMemFree (void *ptr);
|
164
168
|
XMLPUBFUN char *
|
165
169
|
xmlMemoryStrdup (const char *str);
|
170
|
+
XML_DEPRECATED
|
166
171
|
XMLPUBFUN void *
|
167
172
|
xmlMallocLoc (size_t size, const char *file, int line) LIBXML_ATTR_ALLOC_SIZE(1);
|
173
|
+
XML_DEPRECATED
|
168
174
|
XMLPUBFUN void *
|
169
175
|
xmlReallocLoc (void *ptr, size_t size, const char *file, int line);
|
176
|
+
XML_DEPRECATED
|
170
177
|
XMLPUBFUN void *
|
171
178
|
xmlMallocAtomicLoc (size_t size, const char *file, int line) LIBXML_ATTR_ALLOC_SIZE(1);
|
179
|
+
XML_DEPRECATED
|
172
180
|
XMLPUBFUN char *
|
173
181
|
xmlMemStrdupLoc (const char *str, const char *file, int line);
|
174
182
|
|
175
|
-
|
176
|
-
/** DOC_DISABLE */
|
177
|
-
#ifdef DEBUG_MEMORY_LOCATION
|
178
|
-
/**
|
179
|
-
* xmlMalloc:
|
180
|
-
* @size: number of bytes to allocate
|
181
|
-
*
|
182
|
-
* Wrapper for the malloc() function used in the XML library.
|
183
|
-
*
|
184
|
-
* Returns the pointer to the allocated area or NULL in case of error.
|
185
|
-
*/
|
186
|
-
#define xmlMalloc(size) xmlMallocLoc((size), __FILE__, __LINE__)
|
187
|
-
/**
|
188
|
-
* xmlMallocAtomic:
|
189
|
-
* @size: number of bytes to allocate
|
190
|
-
*
|
191
|
-
* Wrapper for the malloc() function used in the XML library for allocation
|
192
|
-
* of block not containing pointers to other areas.
|
193
|
-
*
|
194
|
-
* Returns the pointer to the allocated area or NULL in case of error.
|
195
|
-
*/
|
196
|
-
#define xmlMallocAtomic(size) xmlMallocAtomicLoc((size), __FILE__, __LINE__)
|
197
|
-
/**
|
198
|
-
* xmlRealloc:
|
199
|
-
* @ptr: pointer to the existing allocated area
|
200
|
-
* @size: number of bytes to allocate
|
201
|
-
*
|
202
|
-
* Wrapper for the realloc() function used in the XML library.
|
203
|
-
*
|
204
|
-
* Returns the pointer to the allocated area or NULL in case of error.
|
205
|
-
*/
|
206
|
-
#define xmlRealloc(ptr, size) xmlReallocLoc((ptr), (size), __FILE__, __LINE__)
|
207
|
-
/**
|
208
|
-
* xmlMemStrdup:
|
209
|
-
* @str: pointer to the existing string
|
210
|
-
*
|
211
|
-
* Wrapper for the strdup() function, xmlStrdup() is usually preferred.
|
212
|
-
*
|
213
|
-
* Returns the pointer to the allocated area or NULL in case of error.
|
214
|
-
*/
|
215
|
-
#define xmlMemStrdup(str) xmlMemStrdupLoc((str), __FILE__, __LINE__)
|
216
|
-
|
217
|
-
#endif /* DEBUG_MEMORY_LOCATION */
|
218
|
-
/** DOC_ENABLE */
|
219
|
-
|
220
183
|
#ifdef __cplusplus
|
221
184
|
}
|
222
185
|
#endif /* __cplusplus */
|
@@ -73,6 +73,8 @@ XMLPUBFUN int
|
|
73
73
|
xmlSaveFlush (xmlSaveCtxtPtr ctxt);
|
74
74
|
XMLPUBFUN int
|
75
75
|
xmlSaveClose (xmlSaveCtxtPtr ctxt);
|
76
|
+
XMLPUBFUN int
|
77
|
+
xmlSaveFinish (xmlSaveCtxtPtr ctxt);
|
76
78
|
XMLPUBFUN int
|
77
79
|
xmlSaveSetEscape (xmlSaveCtxtPtr ctxt,
|
78
80
|
xmlCharEncodingOutputFunc escape);
|
@@ -80,10 +82,13 @@ XMLPUBFUN int
|
|
80
82
|
xmlSaveSetAttrEscape (xmlSaveCtxtPtr ctxt,
|
81
83
|
xmlCharEncodingOutputFunc escape);
|
82
84
|
|
85
|
+
XML_DEPRECATED
|
83
86
|
XMLPUBFUN int
|
84
87
|
xmlThrDefIndentTreeOutput(int v);
|
88
|
+
XML_DEPRECATED
|
85
89
|
XMLPUBFUN const char *
|
86
90
|
xmlThrDefTreeIndentString(const char * v);
|
91
|
+
XML_DEPRECATED
|
87
92
|
XMLPUBFUN int
|
88
93
|
xmlThrDefSaveNoEmptyTags(int v);
|
89
94
|
|