nokogiri 1.13.8-arm64-darwin → 1.13.10-arm64-darwin
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of nokogiri might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/dependencies.yml +8 -8
- data/ext/nokogiri/extconf.rb +16 -3
- data/ext/nokogiri/include/libexslt/exsltconfig.h +1 -1
- data/ext/nokogiri/include/libexslt/exsltexports.h +32 -109
- data/ext/nokogiri/include/libxml2/libxml/SAX.h +36 -5
- data/ext/nokogiri/include/libxml2/libxml/SAX2.h +3 -9
- data/ext/nokogiri/include/libxml2/libxml/dict.h +2 -0
- data/ext/nokogiri/include/libxml2/libxml/encoding.h +5 -18
- data/ext/nokogiri/include/libxml2/libxml/entities.h +2 -0
- data/ext/nokogiri/include/libxml2/libxml/globals.h +3 -12
- data/ext/nokogiri/include/libxml2/libxml/nanoftp.h +25 -2
- data/ext/nokogiri/include/libxml2/libxml/parser.h +4 -3
- data/ext/nokogiri/include/libxml2/libxml/parserInternals.h +12 -0
- data/ext/nokogiri/include/libxml2/libxml/relaxng.h +1 -0
- data/ext/nokogiri/include/libxml2/libxml/schematron.h +1 -1
- data/ext/nokogiri/include/libxml2/libxml/threads.h +2 -0
- data/ext/nokogiri/include/libxml2/libxml/tree.h +5 -4
- data/ext/nokogiri/include/libxml2/libxml/valid.h +12 -7
- data/ext/nokogiri/include/libxml2/libxml/xmlerror.h +1 -0
- data/ext/nokogiri/include/libxml2/libxml/xmlmemory.h +2 -0
- data/ext/nokogiri/include/libxml2/libxml/xmlschemastypes.h +1 -0
- data/ext/nokogiri/include/libxml2/libxml/xmlversion.h +33 -15
- data/ext/nokogiri/include/libxml2/libxml/xpath.h +11 -0
- data/ext/nokogiri/include/libxml2/libxml/xpointer.h +23 -0
- data/ext/nokogiri/include/libxslt/xsltconfig.h +5 -6
- data/ext/nokogiri/include/libxslt/xsltexports.h +32 -110
- data/ext/nokogiri/include/libxslt/xsltlocale.h +1 -1
- data/ext/nokogiri/include/libxslt/xsltutils.h +0 -3
- data/ext/nokogiri/nokogiri.h +1 -0
- data/ext/nokogiri/xml_document.c +5 -1
- data/ext/nokogiri/xml_namespace.c +41 -5
- data/ext/nokogiri/xml_node.c +1 -1
- data/ext/nokogiri/xml_reader.c +4 -0
- data/ext/nokogiri/xml_xpath_context.c +3 -0
- data/lib/nokogiri/2.6/nokogiri.bundle +0 -0
- data/lib/nokogiri/2.7/nokogiri.bundle +0 -0
- data/lib/nokogiri/3.0/nokogiri.bundle +0 -0
- data/lib/nokogiri/3.1/nokogiri.bundle +0 -0
- data/lib/nokogiri/version/constant.rb +1 -1
- metadata +16 -3
- data/ext/nokogiri/include/libxml2/libxml/DOCBparser.h +0 -96
@@ -1,7 +1,8 @@
|
|
1
1
|
/*
|
2
2
|
* Summary: minimal FTP implementation
|
3
3
|
* Description: minimal FTP implementation allowing to fetch resources
|
4
|
-
* like external subset.
|
4
|
+
* like external subset. This module is DEPRECATED, do not
|
5
|
+
* use any of its functions.
|
5
6
|
*
|
6
7
|
* Copy: See Copyright for the status of this software.
|
7
8
|
*
|
@@ -16,7 +17,7 @@
|
|
16
17
|
#ifdef LIBXML_FTP_ENABLED
|
17
18
|
|
18
19
|
/* Needed for portability to Windows 64 bits */
|
19
|
-
#if defined(_WIN32)
|
20
|
+
#if defined(_WIN32)
|
20
21
|
#include <winsock2.h>
|
21
22
|
#else
|
22
23
|
/**
|
@@ -78,40 +79,52 @@ typedef void (*ftpDataCallback) (void *userData,
|
|
78
79
|
/*
|
79
80
|
* Init
|
80
81
|
*/
|
82
|
+
XML_DEPRECATED
|
81
83
|
XMLPUBFUN void XMLCALL
|
82
84
|
xmlNanoFTPInit (void);
|
85
|
+
XML_DEPRECATED
|
83
86
|
XMLPUBFUN void XMLCALL
|
84
87
|
xmlNanoFTPCleanup (void);
|
85
88
|
|
86
89
|
/*
|
87
90
|
* Creating/freeing contexts.
|
88
91
|
*/
|
92
|
+
XML_DEPRECATED
|
89
93
|
XMLPUBFUN void * XMLCALL
|
90
94
|
xmlNanoFTPNewCtxt (const char *URL);
|
95
|
+
XML_DEPRECATED
|
91
96
|
XMLPUBFUN void XMLCALL
|
92
97
|
xmlNanoFTPFreeCtxt (void * ctx);
|
98
|
+
XML_DEPRECATED
|
93
99
|
XMLPUBFUN void * XMLCALL
|
94
100
|
xmlNanoFTPConnectTo (const char *server,
|
95
101
|
int port);
|
96
102
|
/*
|
97
103
|
* Opening/closing session connections.
|
98
104
|
*/
|
105
|
+
XML_DEPRECATED
|
99
106
|
XMLPUBFUN void * XMLCALL
|
100
107
|
xmlNanoFTPOpen (const char *URL);
|
108
|
+
XML_DEPRECATED
|
101
109
|
XMLPUBFUN int XMLCALL
|
102
110
|
xmlNanoFTPConnect (void *ctx);
|
111
|
+
XML_DEPRECATED
|
103
112
|
XMLPUBFUN int XMLCALL
|
104
113
|
xmlNanoFTPClose (void *ctx);
|
114
|
+
XML_DEPRECATED
|
105
115
|
XMLPUBFUN int XMLCALL
|
106
116
|
xmlNanoFTPQuit (void *ctx);
|
117
|
+
XML_DEPRECATED
|
107
118
|
XMLPUBFUN void XMLCALL
|
108
119
|
xmlNanoFTPScanProxy (const char *URL);
|
120
|
+
XML_DEPRECATED
|
109
121
|
XMLPUBFUN void XMLCALL
|
110
122
|
xmlNanoFTPProxy (const char *host,
|
111
123
|
int port,
|
112
124
|
const char *user,
|
113
125
|
const char *passwd,
|
114
126
|
int type);
|
127
|
+
XML_DEPRECATED
|
115
128
|
XMLPUBFUN int XMLCALL
|
116
129
|
xmlNanoFTPUpdateURL (void *ctx,
|
117
130
|
const char *URL);
|
@@ -119,38 +132,48 @@ XMLPUBFUN int XMLCALL
|
|
119
132
|
/*
|
120
133
|
* Rather internal commands.
|
121
134
|
*/
|
135
|
+
XML_DEPRECATED
|
122
136
|
XMLPUBFUN int XMLCALL
|
123
137
|
xmlNanoFTPGetResponse (void *ctx);
|
138
|
+
XML_DEPRECATED
|
124
139
|
XMLPUBFUN int XMLCALL
|
125
140
|
xmlNanoFTPCheckResponse (void *ctx);
|
126
141
|
|
127
142
|
/*
|
128
143
|
* CD/DIR/GET handlers.
|
129
144
|
*/
|
145
|
+
XML_DEPRECATED
|
130
146
|
XMLPUBFUN int XMLCALL
|
131
147
|
xmlNanoFTPCwd (void *ctx,
|
132
148
|
const char *directory);
|
149
|
+
XML_DEPRECATED
|
133
150
|
XMLPUBFUN int XMLCALL
|
134
151
|
xmlNanoFTPDele (void *ctx,
|
135
152
|
const char *file);
|
136
153
|
|
154
|
+
XML_DEPRECATED
|
137
155
|
XMLPUBFUN SOCKET XMLCALL
|
138
156
|
xmlNanoFTPGetConnection (void *ctx);
|
157
|
+
XML_DEPRECATED
|
139
158
|
XMLPUBFUN int XMLCALL
|
140
159
|
xmlNanoFTPCloseConnection(void *ctx);
|
160
|
+
XML_DEPRECATED
|
141
161
|
XMLPUBFUN int XMLCALL
|
142
162
|
xmlNanoFTPList (void *ctx,
|
143
163
|
ftpListCallback callback,
|
144
164
|
void *userData,
|
145
165
|
const char *filename);
|
166
|
+
XML_DEPRECATED
|
146
167
|
XMLPUBFUN SOCKET XMLCALL
|
147
168
|
xmlNanoFTPGetSocket (void *ctx,
|
148
169
|
const char *filename);
|
170
|
+
XML_DEPRECATED
|
149
171
|
XMLPUBFUN int XMLCALL
|
150
172
|
xmlNanoFTPGet (void *ctx,
|
151
173
|
ftpDataCallback callback,
|
152
174
|
void *userData,
|
153
175
|
const char *filename);
|
176
|
+
XML_DEPRECATED
|
154
177
|
XMLPUBFUN int XMLCALL
|
155
178
|
xmlNanoFTPRead (void *ctx,
|
156
179
|
void *dest,
|
@@ -10,8 +10,6 @@
|
|
10
10
|
#ifndef __XML_PARSER_H__
|
11
11
|
#define __XML_PARSER_H__
|
12
12
|
|
13
|
-
#include <stdarg.h>
|
14
|
-
|
15
13
|
#include <libxml/xmlversion.h>
|
16
14
|
#include <libxml/tree.h>
|
17
15
|
#include <libxml/dict.h>
|
@@ -192,7 +190,7 @@ struct _xmlParserCtxt {
|
|
192
190
|
const xmlChar *version; /* the XML version string */
|
193
191
|
const xmlChar *encoding; /* the declared encoding, if any */
|
194
192
|
int standalone; /* standalone document */
|
195
|
-
int html; /* an HTML(1)
|
193
|
+
int html; /* an HTML(1) document
|
196
194
|
* 3 is HTML after <head>
|
197
195
|
* 10 is HTML after <body>
|
198
196
|
*/
|
@@ -996,13 +994,16 @@ XMLPUBFUN xmlParserCtxtPtr XMLCALL
|
|
996
994
|
/*
|
997
995
|
* Reading/setting optional parsing features.
|
998
996
|
*/
|
997
|
+
XML_DEPRECATED
|
999
998
|
XMLPUBFUN int XMLCALL
|
1000
999
|
xmlGetFeaturesList (int *len,
|
1001
1000
|
const char **result);
|
1001
|
+
XML_DEPRECATED
|
1002
1002
|
XMLPUBFUN int XMLCALL
|
1003
1003
|
xmlGetFeature (xmlParserCtxtPtr ctxt,
|
1004
1004
|
const char *name,
|
1005
1005
|
void *result);
|
1006
|
+
XML_DEPRECATED
|
1006
1007
|
XMLPUBFUN int XMLCALL
|
1007
1008
|
xmlSetFeature (xmlParserCtxtPtr ctxt,
|
1008
1009
|
const char *name,
|
@@ -339,6 +339,7 @@ XMLPUBFUN int XMLCALL
|
|
339
339
|
XMLPUBFUN int XMLCALL
|
340
340
|
xmlSwitchToEncoding (xmlParserCtxtPtr ctxt,
|
341
341
|
xmlCharEncodingHandlerPtr handler);
|
342
|
+
XML_DEPRECATED
|
342
343
|
XMLPUBFUN int XMLCALL
|
343
344
|
xmlSwitchInputEncoding (xmlParserCtxtPtr ctxt,
|
344
345
|
xmlParserInputPtr input,
|
@@ -574,6 +575,7 @@ XMLPUBFUN void XMLCALL xmlParserInputShrink (xmlParserInputPtr in);
|
|
574
575
|
/*
|
575
576
|
* Actually comes from the HTML parser but launched from the init stuff.
|
576
577
|
*/
|
578
|
+
XML_DEPRECATED
|
577
579
|
XMLPUBFUN void XMLCALL htmlInitAutoClose (void);
|
578
580
|
XMLPUBFUN htmlParserCtxtPtr XMLCALL htmlCreateFileParserCtxt(const char *filename,
|
579
581
|
const char *encoding);
|
@@ -597,25 +599,34 @@ typedef void (*xmlEntityReferenceFunc) (xmlEntityPtr ent,
|
|
597
599
|
xmlNodePtr firstNode,
|
598
600
|
xmlNodePtr lastNode);
|
599
601
|
|
602
|
+
XML_DEPRECATED
|
600
603
|
XMLPUBFUN void XMLCALL xmlSetEntityReferenceFunc (xmlEntityReferenceFunc func);
|
601
604
|
|
605
|
+
XML_DEPRECATED
|
602
606
|
XMLPUBFUN xmlChar * XMLCALL
|
603
607
|
xmlParseQuotedString (xmlParserCtxtPtr ctxt);
|
608
|
+
XML_DEPRECATED
|
604
609
|
XMLPUBFUN void XMLCALL
|
605
610
|
xmlParseNamespace (xmlParserCtxtPtr ctxt);
|
611
|
+
XML_DEPRECATED
|
606
612
|
XMLPUBFUN xmlChar * XMLCALL
|
607
613
|
xmlNamespaceParseNSDef (xmlParserCtxtPtr ctxt);
|
614
|
+
XML_DEPRECATED
|
608
615
|
XMLPUBFUN xmlChar * XMLCALL
|
609
616
|
xmlScanName (xmlParserCtxtPtr ctxt);
|
617
|
+
XML_DEPRECATED
|
610
618
|
XMLPUBFUN xmlChar * XMLCALL
|
611
619
|
xmlNamespaceParseNCName (xmlParserCtxtPtr ctxt);
|
620
|
+
XML_DEPRECATED
|
612
621
|
XMLPUBFUN void XMLCALL xmlParserHandleReference(xmlParserCtxtPtr ctxt);
|
622
|
+
XML_DEPRECATED
|
613
623
|
XMLPUBFUN xmlChar * XMLCALL
|
614
624
|
xmlNamespaceParseQName (xmlParserCtxtPtr ctxt,
|
615
625
|
xmlChar **prefix);
|
616
626
|
/**
|
617
627
|
* Entities
|
618
628
|
*/
|
629
|
+
XML_DEPRECATED
|
619
630
|
XMLPUBFUN xmlChar * XMLCALL
|
620
631
|
xmlDecodeEntities (xmlParserCtxtPtr ctxt,
|
621
632
|
int len,
|
@@ -623,6 +634,7 @@ XMLPUBFUN xmlChar * XMLCALL
|
|
623
634
|
xmlChar end,
|
624
635
|
xmlChar end2,
|
625
636
|
xmlChar end3);
|
637
|
+
XML_DEPRECATED
|
626
638
|
XMLPUBFUN void XMLCALL
|
627
639
|
xmlHandleEntity (xmlParserCtxtPtr ctxt,
|
628
640
|
xmlEntityPtr entity);
|
@@ -57,6 +57,7 @@ XMLPUBFUN void XMLCALL
|
|
57
57
|
/*
|
58
58
|
* Library wide APIs.
|
59
59
|
*/
|
60
|
+
XML_DEPRECATED
|
60
61
|
XMLPUBFUN void XMLCALL
|
61
62
|
xmlInitThreads (void);
|
62
63
|
XMLPUBFUN void XMLCALL
|
@@ -67,6 +68,7 @@ XMLPUBFUN int XMLCALL
|
|
67
68
|
xmlGetThreadId (void);
|
68
69
|
XMLPUBFUN int XMLCALL
|
69
70
|
xmlIsMainThread (void);
|
71
|
+
XML_DEPRECATED
|
70
72
|
XMLPUBFUN void XMLCALL
|
71
73
|
xmlCleanupThreads(void);
|
72
74
|
XMLPUBFUN xmlGlobalStatePtr XMLCALL
|
@@ -177,11 +177,11 @@ typedef enum {
|
|
177
177
|
XML_NAMESPACE_DECL= 18,
|
178
178
|
XML_XINCLUDE_START= 19,
|
179
179
|
XML_XINCLUDE_END= 20
|
180
|
-
|
181
|
-
,XML_DOCB_DOCUMENT_NODE= 21
|
182
|
-
#endif
|
180
|
+
/* XML_DOCB_DOCUMENT_NODE= 21 */ /* removed */
|
183
181
|
} xmlElementType;
|
184
182
|
|
183
|
+
/* For backward compatibility */
|
184
|
+
#define XML_DOCB_DOCUMENT_NODE 21
|
185
185
|
|
186
186
|
/**
|
187
187
|
* xmlNotation:
|
@@ -659,7 +659,7 @@ struct _xmlDOMWrapCtxt {
|
|
659
659
|
defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || \
|
660
660
|
defined (LIBXML_HTML_ENABLED) || defined(LIBXML_SAX1_ENABLED) || \
|
661
661
|
defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || \
|
662
|
-
defined(
|
662
|
+
defined(LIBXML_LEGACY_ENABLED)
|
663
663
|
XMLPUBFUN int XMLCALL
|
664
664
|
xmlValidateNCName (const xmlChar *value,
|
665
665
|
int space);
|
@@ -763,6 +763,7 @@ XMLPUBFUN xmlDtdPtr XMLCALL
|
|
763
763
|
XMLPUBFUN void XMLCALL
|
764
764
|
xmlFreeDtd (xmlDtdPtr cur);
|
765
765
|
#ifdef LIBXML_LEGACY_ENABLED
|
766
|
+
XML_DEPRECATED
|
766
767
|
XMLPUBFUN xmlNsPtr XMLCALL
|
767
768
|
xmlNewGlobalNs (xmlDocPtr doc,
|
768
769
|
const xmlChar *href,
|
@@ -60,17 +60,17 @@ typedef void (XMLCDECL *xmlValidityWarningFunc) (void *ctx,
|
|
60
60
|
|
61
61
|
#ifdef IN_LIBXML
|
62
62
|
/**
|
63
|
-
*
|
63
|
+
* XML_VCTXT_DTD_VALIDATED:
|
64
64
|
*
|
65
|
-
*
|
65
|
+
* Set after xmlValidateDtdFinal was called.
|
66
66
|
*/
|
67
|
-
#define
|
67
|
+
#define XML_VCTXT_DTD_VALIDATED (1u << 0)
|
68
68
|
/**
|
69
|
-
*
|
69
|
+
* XML_VCTXT_USE_PCTXT:
|
70
70
|
*
|
71
|
-
*
|
71
|
+
* Set if the validation context is part of a parser context.
|
72
72
|
*/
|
73
|
-
#define
|
73
|
+
#define XML_VCTXT_USE_PCTXT (1u << 1)
|
74
74
|
#endif
|
75
75
|
|
76
76
|
/*
|
@@ -90,7 +90,7 @@ struct _xmlValidCtxt {
|
|
90
90
|
int nodeMax; /* Max depth of the parsing stack */
|
91
91
|
xmlNodePtr *nodeTab; /* array of nodes */
|
92
92
|
|
93
|
-
unsigned int
|
93
|
+
unsigned int flags; /* internal flags */
|
94
94
|
xmlDocPtr doc; /* the document */
|
95
95
|
int valid; /* temporary validity check result */
|
96
96
|
|
@@ -283,20 +283,25 @@ XMLPUBFUN int XMLCALL
|
|
283
283
|
xmlAttrPtr attr);
|
284
284
|
|
285
285
|
/* IDREFs */
|
286
|
+
XML_DEPRECATED
|
286
287
|
XMLPUBFUN xmlRefPtr XMLCALL
|
287
288
|
xmlAddRef (xmlValidCtxtPtr ctxt,
|
288
289
|
xmlDocPtr doc,
|
289
290
|
const xmlChar *value,
|
290
291
|
xmlAttrPtr attr);
|
292
|
+
XML_DEPRECATED
|
291
293
|
XMLPUBFUN void XMLCALL
|
292
294
|
xmlFreeRefTable (xmlRefTablePtr table);
|
295
|
+
XML_DEPRECATED
|
293
296
|
XMLPUBFUN int XMLCALL
|
294
297
|
xmlIsRef (xmlDocPtr doc,
|
295
298
|
xmlNodePtr elem,
|
296
299
|
xmlAttrPtr attr);
|
300
|
+
XML_DEPRECATED
|
297
301
|
XMLPUBFUN int XMLCALL
|
298
302
|
xmlRemoveRef (xmlDocPtr doc,
|
299
303
|
xmlAttrPtr attr);
|
304
|
+
XML_DEPRECATED
|
300
305
|
XMLPUBFUN xmlListPtr XMLCALL
|
301
306
|
xmlGetRefs (xmlDocPtr doc,
|
302
307
|
const xmlChar *ID);
|
@@ -260,6 +260,7 @@ typedef enum {
|
|
260
260
|
XML_DTD_DUP_TOKEN, /* 541 */
|
261
261
|
XML_HTML_STRUCURE_ERROR = 800,
|
262
262
|
XML_HTML_UNKNOWN_TAG, /* 801 */
|
263
|
+
XML_HTML_INCORRECTLY_OPENED_COMMENT, /* 802 */
|
263
264
|
XML_RNGP_ANYNAME_ATTR_ANCESTOR = 1000,
|
264
265
|
XML_RNGP_ATTR_CONFLICT, /* 1001 */
|
265
266
|
XML_RNGP_ATTRIBUTE_CHILDREN, /* 1002 */
|
@@ -126,12 +126,14 @@ XMLPUBFUN int XMLCALL
|
|
126
126
|
/*
|
127
127
|
* Initialization of the memory layer.
|
128
128
|
*/
|
129
|
+
XML_DEPRECATED
|
129
130
|
XMLPUBFUN int XMLCALL
|
130
131
|
xmlInitMemory (void);
|
131
132
|
|
132
133
|
/*
|
133
134
|
* Cleanup of the memory layer.
|
134
135
|
*/
|
136
|
+
XML_DEPRECATED
|
135
137
|
XMLPUBFUN void XMLCALL
|
136
138
|
xmlCleanupMemory (void);
|
137
139
|
/*
|
@@ -29,21 +29,21 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
|
|
29
29
|
*
|
30
30
|
* the version string like "1.2.3"
|
31
31
|
*/
|
32
|
-
#define LIBXML_DOTTED_VERSION "2.
|
32
|
+
#define LIBXML_DOTTED_VERSION "2.10.3"
|
33
33
|
|
34
34
|
/**
|
35
35
|
* LIBXML_VERSION:
|
36
36
|
*
|
37
37
|
* the version number: 1.2.3 value is 10203
|
38
38
|
*/
|
39
|
-
#define LIBXML_VERSION
|
39
|
+
#define LIBXML_VERSION 21003
|
40
40
|
|
41
41
|
/**
|
42
42
|
* LIBXML_VERSION_STRING:
|
43
43
|
*
|
44
44
|
* the version number string, 1.2.3 value is "10203"
|
45
45
|
*/
|
46
|
-
#define LIBXML_VERSION_STRING "
|
46
|
+
#define LIBXML_VERSION_STRING "21003"
|
47
47
|
|
48
48
|
/**
|
49
49
|
* LIBXML_VERSION_EXTRA:
|
@@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
|
|
58
58
|
* Macro to check that the libxml version in use is compatible with
|
59
59
|
* the version the software has been compiled against
|
60
60
|
*/
|
61
|
-
#define LIBXML_TEST_VERSION xmlCheckVersion(
|
61
|
+
#define LIBXML_TEST_VERSION xmlCheckVersion(21003);
|
62
62
|
|
63
63
|
#ifndef VMS
|
64
64
|
#if 0
|
@@ -171,7 +171,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
|
|
171
171
|
*
|
172
172
|
* Whether the FTP support is configured in
|
173
173
|
*/
|
174
|
-
#if
|
174
|
+
#if 0
|
175
175
|
#define LIBXML_FTP_ENABLED
|
176
176
|
#endif
|
177
177
|
|
@@ -207,7 +207,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
|
|
207
207
|
*
|
208
208
|
* Whether the deprecated APIs are compiled in for compatibility
|
209
209
|
*/
|
210
|
-
#if
|
210
|
+
#if 0
|
211
211
|
#define LIBXML_LEGACY_ENABLED
|
212
212
|
#endif
|
213
213
|
|
@@ -229,15 +229,6 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
|
|
229
229
|
#define LIBXML_CATALOG_ENABLED
|
230
230
|
#endif
|
231
231
|
|
232
|
-
/**
|
233
|
-
* LIBXML_DOCB_ENABLED:
|
234
|
-
*
|
235
|
-
* Whether the SGML Docbook support is configured in
|
236
|
-
*/
|
237
|
-
#if 1
|
238
|
-
#define LIBXML_DOCB_ENABLED
|
239
|
-
#endif
|
240
|
-
|
241
232
|
/**
|
242
233
|
* LIBXML_XPATH_ENABLED:
|
243
234
|
*
|
@@ -256,6 +247,15 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
|
|
256
247
|
#define LIBXML_XPTR_ENABLED
|
257
248
|
#endif
|
258
249
|
|
250
|
+
/**
|
251
|
+
* LIBXML_XPTR_LOCS_ENABLED:
|
252
|
+
*
|
253
|
+
* Whether support for XPointer locations is configured in
|
254
|
+
*/
|
255
|
+
#if 0
|
256
|
+
#define LIBXML_XPTR_LOCS_ENABLED
|
257
|
+
#endif
|
258
|
+
|
259
259
|
/**
|
260
260
|
* LIBXML_XINCLUDE_ENABLED:
|
261
261
|
*
|
@@ -456,6 +456,15 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
|
|
456
456
|
# define LIBXML_ATTR_FORMAT(fmt,args)
|
457
457
|
#endif
|
458
458
|
|
459
|
+
#ifndef XML_DEPRECATED
|
460
|
+
# ifdef IN_LIBXML
|
461
|
+
# define XML_DEPRECATED
|
462
|
+
# else
|
463
|
+
/* Available since at least GCC 3.1 */
|
464
|
+
# define XML_DEPRECATED __attribute__((deprecated))
|
465
|
+
# endif
|
466
|
+
#endif
|
467
|
+
|
459
468
|
#else /* ! __GNUC__ */
|
460
469
|
/**
|
461
470
|
* ATTRIBUTE_UNUSED:
|
@@ -475,6 +484,15 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
|
|
475
484
|
* Macro used to indicate to GCC the parameter are printf like
|
476
485
|
*/
|
477
486
|
#define LIBXML_ATTR_FORMAT(fmt,args)
|
487
|
+
/**
|
488
|
+
* XML_DEPRECATED:
|
489
|
+
*
|
490
|
+
* Macro used to indicate that a function, variable, type or struct member
|
491
|
+
* is deprecated.
|
492
|
+
*/
|
493
|
+
#ifndef XML_DEPRECATED
|
494
|
+
#define XML_DEPRECATED
|
495
|
+
#endif
|
478
496
|
#endif /* __GNUC__ */
|
479
497
|
|
480
498
|
#ifdef __cplusplus
|
@@ -104,13 +104,23 @@ typedef enum {
|
|
104
104
|
XPATH_BOOLEAN = 2,
|
105
105
|
XPATH_NUMBER = 3,
|
106
106
|
XPATH_STRING = 4,
|
107
|
+
#ifdef LIBXML_XPTR_LOCS_ENABLED
|
107
108
|
XPATH_POINT = 5,
|
108
109
|
XPATH_RANGE = 6,
|
109
110
|
XPATH_LOCATIONSET = 7,
|
111
|
+
#endif
|
110
112
|
XPATH_USERS = 8,
|
111
113
|
XPATH_XSLT_TREE = 9 /* An XSLT value tree, non modifiable */
|
112
114
|
} xmlXPathObjectType;
|
113
115
|
|
116
|
+
#ifndef LIBXML_XPTR_LOCS_ENABLED
|
117
|
+
/** DOC_DISABLE */
|
118
|
+
#define XPATH_POINT 5
|
119
|
+
#define XPATH_RANGE 6
|
120
|
+
#define XPATH_LOCATIONSET 7
|
121
|
+
/** DOC_ENABLE */
|
122
|
+
#endif
|
123
|
+
|
114
124
|
typedef struct _xmlXPathObject xmlXPathObject;
|
115
125
|
typedef xmlXPathObject *xmlXPathObjectPtr;
|
116
126
|
struct _xmlXPathObject {
|
@@ -549,6 +559,7 @@ XMLPUBFUN void XMLCALL
|
|
549
559
|
xmlXPathFreeCompExpr (xmlXPathCompExprPtr comp);
|
550
560
|
#endif /* LIBXML_XPATH_ENABLED */
|
551
561
|
#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
|
562
|
+
XML_DEPRECATED
|
552
563
|
XMLPUBFUN void XMLCALL
|
553
564
|
xmlXPathInit (void);
|
554
565
|
XMLPUBFUN int XMLCALL
|
@@ -28,6 +28,7 @@
|
|
28
28
|
extern "C" {
|
29
29
|
#endif
|
30
30
|
|
31
|
+
#ifdef LIBXML_XPTR_LOCS_ENABLED
|
31
32
|
/*
|
32
33
|
* A Location Set
|
33
34
|
*/
|
@@ -43,51 +44,68 @@ struct _xmlLocationSet {
|
|
43
44
|
* Handling of location sets.
|
44
45
|
*/
|
45
46
|
|
47
|
+
XML_DEPRECATED
|
46
48
|
XMLPUBFUN xmlLocationSetPtr XMLCALL
|
47
49
|
xmlXPtrLocationSetCreate (xmlXPathObjectPtr val);
|
50
|
+
XML_DEPRECATED
|
48
51
|
XMLPUBFUN void XMLCALL
|
49
52
|
xmlXPtrFreeLocationSet (xmlLocationSetPtr obj);
|
53
|
+
XML_DEPRECATED
|
50
54
|
XMLPUBFUN xmlLocationSetPtr XMLCALL
|
51
55
|
xmlXPtrLocationSetMerge (xmlLocationSetPtr val1,
|
52
56
|
xmlLocationSetPtr val2);
|
57
|
+
XML_DEPRECATED
|
53
58
|
XMLPUBFUN xmlXPathObjectPtr XMLCALL
|
54
59
|
xmlXPtrNewRange (xmlNodePtr start,
|
55
60
|
int startindex,
|
56
61
|
xmlNodePtr end,
|
57
62
|
int endindex);
|
63
|
+
XML_DEPRECATED
|
58
64
|
XMLPUBFUN xmlXPathObjectPtr XMLCALL
|
59
65
|
xmlXPtrNewRangePoints (xmlXPathObjectPtr start,
|
60
66
|
xmlXPathObjectPtr end);
|
67
|
+
XML_DEPRECATED
|
61
68
|
XMLPUBFUN xmlXPathObjectPtr XMLCALL
|
62
69
|
xmlXPtrNewRangeNodePoint (xmlNodePtr start,
|
63
70
|
xmlXPathObjectPtr end);
|
71
|
+
XML_DEPRECATED
|
64
72
|
XMLPUBFUN xmlXPathObjectPtr XMLCALL
|
65
73
|
xmlXPtrNewRangePointNode (xmlXPathObjectPtr start,
|
66
74
|
xmlNodePtr end);
|
75
|
+
XML_DEPRECATED
|
67
76
|
XMLPUBFUN xmlXPathObjectPtr XMLCALL
|
68
77
|
xmlXPtrNewRangeNodes (xmlNodePtr start,
|
69
78
|
xmlNodePtr end);
|
79
|
+
XML_DEPRECATED
|
70
80
|
XMLPUBFUN xmlXPathObjectPtr XMLCALL
|
71
81
|
xmlXPtrNewLocationSetNodes (xmlNodePtr start,
|
72
82
|
xmlNodePtr end);
|
83
|
+
XML_DEPRECATED
|
73
84
|
XMLPUBFUN xmlXPathObjectPtr XMLCALL
|
74
85
|
xmlXPtrNewLocationSetNodeSet(xmlNodeSetPtr set);
|
86
|
+
XML_DEPRECATED
|
75
87
|
XMLPUBFUN xmlXPathObjectPtr XMLCALL
|
76
88
|
xmlXPtrNewRangeNodeObject (xmlNodePtr start,
|
77
89
|
xmlXPathObjectPtr end);
|
90
|
+
XML_DEPRECATED
|
78
91
|
XMLPUBFUN xmlXPathObjectPtr XMLCALL
|
79
92
|
xmlXPtrNewCollapsedRange (xmlNodePtr start);
|
93
|
+
XML_DEPRECATED
|
80
94
|
XMLPUBFUN void XMLCALL
|
81
95
|
xmlXPtrLocationSetAdd (xmlLocationSetPtr cur,
|
82
96
|
xmlXPathObjectPtr val);
|
97
|
+
XML_DEPRECATED
|
83
98
|
XMLPUBFUN xmlXPathObjectPtr XMLCALL
|
84
99
|
xmlXPtrWrapLocationSet (xmlLocationSetPtr val);
|
100
|
+
XML_DEPRECATED
|
85
101
|
XMLPUBFUN void XMLCALL
|
86
102
|
xmlXPtrLocationSetDel (xmlLocationSetPtr cur,
|
87
103
|
xmlXPathObjectPtr val);
|
104
|
+
XML_DEPRECATED
|
88
105
|
XMLPUBFUN void XMLCALL
|
89
106
|
xmlXPtrLocationSetRemove (xmlLocationSetPtr cur,
|
90
107
|
int val);
|
108
|
+
#endif /* LIBXML_XPTR_LOCS_ENABLED */
|
91
109
|
|
92
110
|
/*
|
93
111
|
* Functions.
|
@@ -99,13 +117,18 @@ XMLPUBFUN xmlXPathContextPtr XMLCALL
|
|
99
117
|
XMLPUBFUN xmlXPathObjectPtr XMLCALL
|
100
118
|
xmlXPtrEval (const xmlChar *str,
|
101
119
|
xmlXPathContextPtr ctx);
|
120
|
+
#ifdef LIBXML_XPTR_LOCS_ENABLED
|
121
|
+
XML_DEPRECATED
|
102
122
|
XMLPUBFUN void XMLCALL
|
103
123
|
xmlXPtrRangeToFunction (xmlXPathParserContextPtr ctxt,
|
104
124
|
int nargs);
|
125
|
+
XML_DEPRECATED
|
105
126
|
XMLPUBFUN xmlNodePtr XMLCALL
|
106
127
|
xmlXPtrBuildNodeList (xmlXPathObjectPtr obj);
|
128
|
+
XML_DEPRECATED
|
107
129
|
XMLPUBFUN void XMLCALL
|
108
130
|
xmlXPtrEvalRangePredicate (xmlXPathParserContextPtr ctxt);
|
131
|
+
#endif /* LIBXML_XPTR_LOCS_ENABLED */
|
109
132
|
#ifdef __cplusplus
|
110
133
|
}
|
111
134
|
#endif
|
@@ -20,26 +20,26 @@ extern "C" {
|
|
20
20
|
*
|
21
21
|
* the version string like "1.2.3"
|
22
22
|
*/
|
23
|
-
#define LIBXSLT_DOTTED_VERSION "1.1.
|
23
|
+
#define LIBXSLT_DOTTED_VERSION "1.1.37"
|
24
24
|
|
25
25
|
/**
|
26
26
|
* LIBXSLT_VERSION:
|
27
27
|
*
|
28
28
|
* the version number: 1.2.3 value is 10203
|
29
29
|
*/
|
30
|
-
#define LIBXSLT_VERSION
|
30
|
+
#define LIBXSLT_VERSION 10137
|
31
31
|
|
32
32
|
/**
|
33
33
|
* LIBXSLT_VERSION_STRING:
|
34
34
|
*
|
35
35
|
* the version number string, 1.2.3 value is "10203"
|
36
36
|
*/
|
37
|
-
#define LIBXSLT_VERSION_STRING "
|
37
|
+
#define LIBXSLT_VERSION_STRING "10137"
|
38
38
|
|
39
39
|
/**
|
40
40
|
* LIBXSLT_VERSION_EXTRA:
|
41
41
|
*
|
42
|
-
* extra version information, used to show a
|
42
|
+
* extra version information, used to show a Git commit description
|
43
43
|
*/
|
44
44
|
#define LIBXSLT_VERSION_EXTRA ""
|
45
45
|
|
@@ -86,7 +86,6 @@ extern "C" {
|
|
86
86
|
#define XSLT_NEED_TRIO
|
87
87
|
#endif
|
88
88
|
#ifdef __VMS
|
89
|
-
#define HAVE_MATH_H 1
|
90
89
|
#define HAVE_SYS_STAT_H 1
|
91
90
|
#ifndef XSLT_NEED_TRIO
|
92
91
|
#define XSLT_NEED_TRIO
|
@@ -133,7 +132,7 @@ extern "C" {
|
|
133
132
|
#ifndef WITH_MODULES
|
134
133
|
#define WITH_MODULES
|
135
134
|
#endif
|
136
|
-
#define LIBXSLT_DEFAULT_PLUGINS_PATH() "/home/flavorjones/code/oss/nokogiri/ports/
|
135
|
+
#define LIBXSLT_DEFAULT_PLUGINS_PATH() "/home/flavorjones/code/oss/nokogiri/ports/x86_64-darwin/libxslt/1.1.37/lib/libxslt-plugins"
|
137
136
|
#endif
|
138
137
|
|
139
138
|
/**
|