nokogiri 1.13.8-x86-mingw32 → 1.13.10-x86-mingw32
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of nokogiri might be problematic. Click here for more details.
- 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.so +0 -0
- 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/version/constant.rb +1 -1
- metadata +16 -3
- data/ext/nokogiri/include/libxml2/libxml/DOCBparser.h +0 -96
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5a38e5381e1d6561629e850c2a224f698f718988cc54e92e28af4f3563885b11
|
4
|
+
data.tar.gz: 9312fa1640fbd4e7743162733c5ed8a5947521d3d1ddd5e6a1621b4ef56b9fd3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 714895b6269d041ac6e9a8343ed4d52201d646a651d97e154d0e6eb38d1f8dd915350c1d67b00a09cbadf19cbf63a073fa98cabc214ff86e8c48c155887161ed
|
7
|
+
data.tar.gz: c4ed924b38dde5985ac7c2779d68b19ddedf2bac597d2e44e779e4f0a2a16198e18dffbcfc4355eeb4cee42122ae3a46d531a1f80b84fc9e3af39afa14212724
|
data/dependencies.yml
CHANGED
@@ -1,16 +1,16 @@
|
|
1
1
|
libxml2:
|
2
|
-
version: "2.
|
3
|
-
sha256: "
|
4
|
-
# sha-256 hash provided in https://download.gnome.org/sources/libxml2/2.
|
2
|
+
version: "2.10.3"
|
3
|
+
sha256: "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c"
|
4
|
+
# sha-256 hash provided in https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.3.sha256sum
|
5
5
|
|
6
6
|
libxslt:
|
7
|
-
version: "1.1.
|
8
|
-
sha256: "
|
9
|
-
# sha-256 hash provided in https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.
|
7
|
+
version: "1.1.37"
|
8
|
+
sha256: "3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4"
|
9
|
+
# sha-256 hash provided in https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.37.sha256sum
|
10
10
|
|
11
11
|
zlib:
|
12
|
-
version: "1.2.
|
13
|
-
sha256: "
|
12
|
+
version: "1.2.13"
|
13
|
+
sha256: "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30"
|
14
14
|
# SHA-256 hash provided on http://zlib.net/
|
15
15
|
|
16
16
|
libiconv:
|
data/ext/nokogiri/extconf.rb
CHANGED
@@ -712,9 +712,17 @@ else
|
|
712
712
|
else
|
713
713
|
class << recipe
|
714
714
|
def configure
|
715
|
-
|
716
|
-
|
717
|
-
|
715
|
+
env = {}
|
716
|
+
env["CFLAGS"] = concat_flags(ENV["CFLAGS"], "-fPIC", "-g")
|
717
|
+
env["CHOST"] = host
|
718
|
+
execute("configure", ["./configure", "--static", configure_prefix], { env: env })
|
719
|
+
if darwin?
|
720
|
+
# needed as of zlib 1.2.13
|
721
|
+
Dir.chdir(work_path) do
|
722
|
+
makefile = File.read("Makefile").gsub(/^AR=.*$/, "AR=#{host}-libtool")
|
723
|
+
File.open("Makefile", "w") { |m| m.write(makefile) }
|
724
|
+
end
|
725
|
+
end
|
718
726
|
end
|
719
727
|
end
|
720
728
|
end
|
@@ -839,6 +847,11 @@ else
|
|
839
847
|
recipe.configure_options += ["RANLIB=/usr/bin/ranlib", "AR=/usr/bin/ar"]
|
840
848
|
end
|
841
849
|
|
850
|
+
if windows?
|
851
|
+
cflags = concat_flags(cflags, "-ULIBXSLT_STATIC", "-DIN_LIBXSLT")
|
852
|
+
cflags = concat_flags(cflags, "-ULIBEXSLT_STATIC", "-DIN_LIBEXSLT")
|
853
|
+
end
|
854
|
+
|
842
855
|
recipe.configure_options << if source_dir
|
843
856
|
"--config-cache"
|
844
857
|
else
|
@@ -2,133 +2,56 @@
|
|
2
2
|
* Summary: macros for marking symbols as exportable/importable.
|
3
3
|
*
|
4
4
|
* Copy: See Copyright for the status of this software.
|
5
|
-
*
|
6
|
-
* Author: Igor Zlatkovic <igor@zlatkovic.com>
|
7
5
|
*/
|
8
6
|
|
9
7
|
#ifndef __EXSLT_EXPORTS_H__
|
10
8
|
#define __EXSLT_EXPORTS_H__
|
11
9
|
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
10
|
+
#if defined(_WIN32) || defined(__CYGWIN__)
|
11
|
+
/** DOC_DISABLE */
|
12
|
+
|
13
|
+
#ifdef LIBEXSLT_STATIC
|
14
|
+
#define EXSLTPUBLIC
|
15
|
+
#elif defined(IN_LIBEXSLT)
|
16
|
+
#define EXSLTPUBLIC __declspec(dllexport)
|
17
|
+
#else
|
18
|
+
#define EXSLTPUBLIC __declspec(dllimport)
|
19
|
+
#endif
|
20
|
+
|
21
|
+
#define EXSLTCALL __cdecl
|
22
|
+
|
23
|
+
/** DOC_ENABLE */
|
24
|
+
#else /* not Windows */
|
23
25
|
|
24
26
|
/**
|
25
|
-
*
|
26
|
-
*
|
27
|
-
* Macros which declare an exportable function
|
28
|
-
*/
|
29
|
-
#define EXSLTPUBFUN
|
30
|
-
/**
|
31
|
-
* EXSLTPUBVAR:
|
27
|
+
* EXSLTPUBLIC:
|
32
28
|
*
|
33
|
-
*
|
29
|
+
* Macro which declares a public symbol
|
34
30
|
*/
|
35
|
-
#define
|
31
|
+
#define EXSLTPUBLIC
|
32
|
+
|
36
33
|
/**
|
37
34
|
* EXSLTCALL:
|
38
35
|
*
|
39
|
-
*
|
36
|
+
* Macro which declares the calling convention for exported functions
|
40
37
|
*/
|
41
38
|
#define EXSLTCALL
|
42
39
|
|
43
|
-
|
44
|
-
|
45
|
-
/* Windows platform with MS compiler */
|
46
|
-
#if defined(_WIN32) && defined(_MSC_VER)
|
47
|
-
#undef EXSLTPUBFUN
|
48
|
-
#undef EXSLTPUBVAR
|
49
|
-
#undef EXSLTCALL
|
50
|
-
#if defined(IN_LIBEXSLT) && !defined(LIBEXSLT_STATIC)
|
51
|
-
#define EXSLTPUBFUN __declspec(dllexport)
|
52
|
-
#define EXSLTPUBVAR __declspec(dllexport)
|
53
|
-
#else
|
54
|
-
#define EXSLTPUBFUN
|
55
|
-
#if !defined(LIBEXSLT_STATIC)
|
56
|
-
#define EXSLTPUBVAR __declspec(dllimport) extern
|
57
|
-
#else
|
58
|
-
#define EXSLTPUBVAR extern
|
59
|
-
#endif
|
60
|
-
#endif
|
61
|
-
#define EXSLTCALL __cdecl
|
62
|
-
#if !defined _REENTRANT
|
63
|
-
#define _REENTRANT
|
64
|
-
#endif
|
65
|
-
#endif
|
66
|
-
|
67
|
-
/* Windows platform with Borland compiler */
|
68
|
-
#if defined(_WIN32) && defined(__BORLANDC__)
|
69
|
-
#undef EXSLTPUBFUN
|
70
|
-
#undef EXSLTPUBVAR
|
71
|
-
#undef EXSLTCALL
|
72
|
-
#if defined(IN_LIBEXSLT) && !defined(LIBEXSLT_STATIC)
|
73
|
-
#define EXSLTPUBFUN __declspec(dllexport)
|
74
|
-
#define EXSLTPUBVAR __declspec(dllexport) extern
|
75
|
-
#else
|
76
|
-
#define EXSLTPUBFUN
|
77
|
-
#if !defined(LIBEXSLT_STATIC)
|
78
|
-
#define EXSLTPUBVAR __declspec(dllimport) extern
|
79
|
-
#else
|
80
|
-
#define EXSLTPUBVAR extern
|
81
|
-
#endif
|
82
|
-
#endif
|
83
|
-
#define EXSLTCALL __cdecl
|
84
|
-
#if !defined _REENTRANT
|
85
|
-
#define _REENTRANT
|
86
|
-
#endif
|
87
|
-
#endif
|
40
|
+
#endif /* platform switch */
|
88
41
|
|
89
|
-
/* Windows platform with GNU compiler (Mingw) */
|
90
|
-
#if defined(_WIN32) && defined(__MINGW32__)
|
91
|
-
#undef EXSLTPUBFUN
|
92
|
-
#undef EXSLTPUBVAR
|
93
|
-
#undef EXSLTCALL
|
94
42
|
/*
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
#else
|
101
|
-
#define EXSLTPUBFUN
|
102
|
-
#if !defined(LIBEXSLT_STATIC)
|
103
|
-
#define EXSLTPUBVAR __declspec(dllimport) extern
|
104
|
-
#else
|
105
|
-
#define EXSLTPUBVAR extern
|
106
|
-
#endif
|
107
|
-
#endif
|
108
|
-
#define EXSLTCALL __cdecl
|
109
|
-
#if !defined _REENTRANT
|
110
|
-
#define _REENTRANT
|
111
|
-
#endif
|
112
|
-
#endif
|
43
|
+
* EXSLTPUBFUN:
|
44
|
+
*
|
45
|
+
* Macro which declares an exportable function
|
46
|
+
*/
|
47
|
+
#define EXSLTPUBFUN EXSLTPUBLIC
|
113
48
|
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
#define EXSLTPUBFUN __declspec(dllexport)
|
121
|
-
#define EXSLTPUBVAR __declspec(dllexport)
|
122
|
-
#else
|
123
|
-
#define EXSLTPUBFUN
|
124
|
-
#if !defined(LIBEXSLT_STATIC)
|
125
|
-
#define EXSLTPUBVAR __declspec(dllimport) extern
|
126
|
-
#else
|
127
|
-
#define EXSLTPUBVAR extern
|
128
|
-
#endif
|
129
|
-
#endif
|
130
|
-
#define EXSLTCALL __cdecl
|
131
|
-
#endif
|
49
|
+
/**
|
50
|
+
* EXSLTPUBVAR:
|
51
|
+
*
|
52
|
+
* Macro which declares an exportable variable
|
53
|
+
*/
|
54
|
+
#define EXSLTPUBVAR EXSLTPUBLIC extern
|
132
55
|
|
133
56
|
/* Compatibility */
|
134
57
|
#if !defined(LIBEXSLT_PUBLIC)
|
@@ -16,54 +16,67 @@
|
|
16
16
|
#include <stdlib.h>
|
17
17
|
#include <libxml/xmlversion.h>
|
18
18
|
#include <libxml/parser.h>
|
19
|
-
#include <libxml/xlink.h>
|
20
19
|
|
21
20
|
#ifdef LIBXML_LEGACY_ENABLED
|
22
21
|
|
23
22
|
#ifdef __cplusplus
|
24
23
|
extern "C" {
|
25
24
|
#endif
|
25
|
+
XML_DEPRECATED
|
26
26
|
XMLPUBFUN const xmlChar * XMLCALL
|
27
27
|
getPublicId (void *ctx);
|
28
|
+
XML_DEPRECATED
|
28
29
|
XMLPUBFUN const xmlChar * XMLCALL
|
29
30
|
getSystemId (void *ctx);
|
31
|
+
XML_DEPRECATED
|
30
32
|
XMLPUBFUN void XMLCALL
|
31
33
|
setDocumentLocator (void *ctx,
|
32
34
|
xmlSAXLocatorPtr loc);
|
33
35
|
|
36
|
+
XML_DEPRECATED
|
34
37
|
XMLPUBFUN int XMLCALL
|
35
38
|
getLineNumber (void *ctx);
|
39
|
+
XML_DEPRECATED
|
36
40
|
XMLPUBFUN int XMLCALL
|
37
41
|
getColumnNumber (void *ctx);
|
38
42
|
|
43
|
+
XML_DEPRECATED
|
39
44
|
XMLPUBFUN int XMLCALL
|
40
45
|
isStandalone (void *ctx);
|
46
|
+
XML_DEPRECATED
|
41
47
|
XMLPUBFUN int XMLCALL
|
42
48
|
hasInternalSubset (void *ctx);
|
49
|
+
XML_DEPRECATED
|
43
50
|
XMLPUBFUN int XMLCALL
|
44
51
|
hasExternalSubset (void *ctx);
|
45
52
|
|
53
|
+
XML_DEPRECATED
|
46
54
|
XMLPUBFUN void XMLCALL
|
47
55
|
internalSubset (void *ctx,
|
48
56
|
const xmlChar *name,
|
49
57
|
const xmlChar *ExternalID,
|
50
58
|
const xmlChar *SystemID);
|
59
|
+
XML_DEPRECATED
|
51
60
|
XMLPUBFUN void XMLCALL
|
52
61
|
externalSubset (void *ctx,
|
53
62
|
const xmlChar *name,
|
54
63
|
const xmlChar *ExternalID,
|
55
64
|
const xmlChar *SystemID);
|
65
|
+
XML_DEPRECATED
|
56
66
|
XMLPUBFUN xmlEntityPtr XMLCALL
|
57
67
|
getEntity (void *ctx,
|
58
68
|
const xmlChar *name);
|
69
|
+
XML_DEPRECATED
|
59
70
|
XMLPUBFUN xmlEntityPtr XMLCALL
|
60
71
|
getParameterEntity (void *ctx,
|
61
72
|
const xmlChar *name);
|
73
|
+
XML_DEPRECATED
|
62
74
|
XMLPUBFUN xmlParserInputPtr XMLCALL
|
63
75
|
resolveEntity (void *ctx,
|
64
76
|
const xmlChar *publicId,
|
65
77
|
const xmlChar *systemId);
|
66
78
|
|
79
|
+
XML_DEPRECATED
|
67
80
|
XMLPUBFUN void XMLCALL
|
68
81
|
entityDecl (void *ctx,
|
69
82
|
const xmlChar *name,
|
@@ -71,6 +84,7 @@ XMLPUBFUN void XMLCALL
|
|
71
84
|
const xmlChar *publicId,
|
72
85
|
const xmlChar *systemId,
|
73
86
|
xmlChar *content);
|
87
|
+
XML_DEPRECATED
|
74
88
|
XMLPUBFUN void XMLCALL
|
75
89
|
attributeDecl (void *ctx,
|
76
90
|
const xmlChar *elem,
|
@@ -79,16 +93,19 @@ XMLPUBFUN void XMLCALL
|
|
79
93
|
int def,
|
80
94
|
const xmlChar *defaultValue,
|
81
95
|
xmlEnumerationPtr tree);
|
96
|
+
XML_DEPRECATED
|
82
97
|
XMLPUBFUN void XMLCALL
|
83
98
|
elementDecl (void *ctx,
|
84
99
|
const xmlChar *name,
|
85
100
|
int type,
|
86
101
|
xmlElementContentPtr content);
|
102
|
+
XML_DEPRECATED
|
87
103
|
XMLPUBFUN void XMLCALL
|
88
104
|
notationDecl (void *ctx,
|
89
105
|
const xmlChar *name,
|
90
106
|
const xmlChar *publicId,
|
91
107
|
const xmlChar *systemId);
|
108
|
+
XML_DEPRECATED
|
92
109
|
XMLPUBFUN void XMLCALL
|
93
110
|
unparsedEntityDecl (void *ctx,
|
94
111
|
const xmlChar *name,
|
@@ -96,72 +113,86 @@ XMLPUBFUN void XMLCALL
|
|
96
113
|
const xmlChar *systemId,
|
97
114
|
const xmlChar *notationName);
|
98
115
|
|
116
|
+
XML_DEPRECATED
|
99
117
|
XMLPUBFUN void XMLCALL
|
100
118
|
startDocument (void *ctx);
|
119
|
+
XML_DEPRECATED
|
101
120
|
XMLPUBFUN void XMLCALL
|
102
121
|
endDocument (void *ctx);
|
122
|
+
XML_DEPRECATED
|
103
123
|
XMLPUBFUN void XMLCALL
|
104
124
|
attribute (void *ctx,
|
105
125
|
const xmlChar *fullname,
|
106
126
|
const xmlChar *value);
|
127
|
+
XML_DEPRECATED
|
107
128
|
XMLPUBFUN void XMLCALL
|
108
129
|
startElement (void *ctx,
|
109
130
|
const xmlChar *fullname,
|
110
131
|
const xmlChar **atts);
|
132
|
+
XML_DEPRECATED
|
111
133
|
XMLPUBFUN void XMLCALL
|
112
134
|
endElement (void *ctx,
|
113
135
|
const xmlChar *name);
|
136
|
+
XML_DEPRECATED
|
114
137
|
XMLPUBFUN void XMLCALL
|
115
138
|
reference (void *ctx,
|
116
139
|
const xmlChar *name);
|
140
|
+
XML_DEPRECATED
|
117
141
|
XMLPUBFUN void XMLCALL
|
118
142
|
characters (void *ctx,
|
119
143
|
const xmlChar *ch,
|
120
144
|
int len);
|
145
|
+
XML_DEPRECATED
|
121
146
|
XMLPUBFUN void XMLCALL
|
122
147
|
ignorableWhitespace (void *ctx,
|
123
148
|
const xmlChar *ch,
|
124
149
|
int len);
|
150
|
+
XML_DEPRECATED
|
125
151
|
XMLPUBFUN void XMLCALL
|
126
152
|
processingInstruction (void *ctx,
|
127
153
|
const xmlChar *target,
|
128
154
|
const xmlChar *data);
|
155
|
+
XML_DEPRECATED
|
129
156
|
XMLPUBFUN void XMLCALL
|
130
157
|
globalNamespace (void *ctx,
|
131
158
|
const xmlChar *href,
|
132
159
|
const xmlChar *prefix);
|
160
|
+
XML_DEPRECATED
|
133
161
|
XMLPUBFUN void XMLCALL
|
134
162
|
setNamespace (void *ctx,
|
135
163
|
const xmlChar *name);
|
164
|
+
XML_DEPRECATED
|
136
165
|
XMLPUBFUN xmlNsPtr XMLCALL
|
137
166
|
getNamespace (void *ctx);
|
167
|
+
XML_DEPRECATED
|
138
168
|
XMLPUBFUN int XMLCALL
|
139
169
|
checkNamespace (void *ctx,
|
140
170
|
xmlChar *nameSpace);
|
171
|
+
XML_DEPRECATED
|
141
172
|
XMLPUBFUN void XMLCALL
|
142
173
|
namespaceDecl (void *ctx,
|
143
174
|
const xmlChar *href,
|
144
175
|
const xmlChar *prefix);
|
176
|
+
XML_DEPRECATED
|
145
177
|
XMLPUBFUN void XMLCALL
|
146
178
|
comment (void *ctx,
|
147
179
|
const xmlChar *value);
|
180
|
+
XML_DEPRECATED
|
148
181
|
XMLPUBFUN void XMLCALL
|
149
182
|
cdataBlock (void *ctx,
|
150
183
|
const xmlChar *value,
|
151
184
|
int len);
|
152
185
|
|
153
186
|
#ifdef LIBXML_SAX1_ENABLED
|
187
|
+
XML_DEPRECATED
|
154
188
|
XMLPUBFUN void XMLCALL
|
155
189
|
initxmlDefaultSAXHandler (xmlSAXHandlerV1 *hdlr,
|
156
190
|
int warning);
|
157
191
|
#ifdef LIBXML_HTML_ENABLED
|
192
|
+
XML_DEPRECATED
|
158
193
|
XMLPUBFUN void XMLCALL
|
159
194
|
inithtmlDefaultSAXHandler (xmlSAXHandlerV1 *hdlr);
|
160
195
|
#endif
|
161
|
-
#ifdef LIBXML_DOCB_ENABLED
|
162
|
-
XMLPUBFUN void XMLCALL
|
163
|
-
initdocbDefaultSAXHandler (xmlSAXHandlerV1 *hdlr);
|
164
|
-
#endif
|
165
196
|
#endif /* LIBXML_SAX1_ENABLED */
|
166
197
|
|
167
198
|
#ifdef __cplusplus
|
@@ -16,7 +16,6 @@
|
|
16
16
|
#include <stdlib.h>
|
17
17
|
#include <libxml/xmlversion.h>
|
18
18
|
#include <libxml/parser.h>
|
19
|
-
#include <libxml/xlink.h>
|
20
19
|
|
21
20
|
#ifdef __cplusplus
|
22
21
|
extern "C" {
|
@@ -99,8 +98,7 @@ XMLPUBFUN void XMLCALL
|
|
99
98
|
XMLPUBFUN void XMLCALL
|
100
99
|
xmlSAX2EndDocument (void *ctx);
|
101
100
|
#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || \
|
102
|
-
defined(LIBXML_WRITER_ENABLED) || defined(
|
103
|
-
defined(LIBXML_LEGACY_ENABLED)
|
101
|
+
defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_LEGACY_ENABLED)
|
104
102
|
XMLPUBFUN void XMLCALL
|
105
103
|
xmlSAX2StartElement (void *ctx,
|
106
104
|
const xmlChar *fullname,
|
@@ -161,15 +159,11 @@ XMLPUBFUN void XMLCALL
|
|
161
159
|
#ifdef LIBXML_HTML_ENABLED
|
162
160
|
XMLPUBFUN void XMLCALL
|
163
161
|
xmlSAX2InitHtmlDefaultSAXHandler(xmlSAXHandler *hdlr);
|
162
|
+
XML_DEPRECATED
|
164
163
|
XMLPUBFUN void XMLCALL
|
165
164
|
htmlDefaultSAXHandlerInit (void);
|
166
165
|
#endif
|
167
|
-
|
168
|
-
XMLPUBFUN void XMLCALL
|
169
|
-
xmlSAX2InitDocbDefaultSAXHandler(xmlSAXHandler *hdlr);
|
170
|
-
XMLPUBFUN void XMLCALL
|
171
|
-
docbDefaultSAXHandlerInit (void);
|
172
|
-
#endif
|
166
|
+
XML_DEPRECATED
|
173
167
|
XMLPUBFUN void XMLCALL
|
174
168
|
xmlDefaultSAXHandlerInit (void);
|
175
169
|
#ifdef __cplusplus
|
@@ -27,6 +27,7 @@ typedef xmlDict *xmlDictPtr;
|
|
27
27
|
/*
|
28
28
|
* Initializer
|
29
29
|
*/
|
30
|
+
XML_DEPRECATED
|
30
31
|
XMLPUBFUN int XMLCALL xmlInitializeDict(void);
|
31
32
|
|
32
33
|
/*
|
@@ -70,6 +71,7 @@ XMLPUBFUN int XMLCALL
|
|
70
71
|
/*
|
71
72
|
* Cleanup function
|
72
73
|
*/
|
74
|
+
XML_DEPRECATED
|
73
75
|
XMLPUBFUN void XMLCALL
|
74
76
|
xmlDictCleanup (void);
|
75
77
|
|
@@ -27,9 +27,7 @@
|
|
27
27
|
#ifdef LIBXML_ICONV_ENABLED
|
28
28
|
#include <iconv.h>
|
29
29
|
#endif
|
30
|
-
|
31
|
-
#include <unicode/ucnv.h>
|
32
|
-
#endif
|
30
|
+
|
33
31
|
#ifdef __cplusplus
|
34
32
|
extern "C" {
|
35
33
|
#endif
|
@@ -128,19 +126,6 @@ typedef int (* xmlCharEncodingOutputFunc)(unsigned char *out, int *outlen,
|
|
128
126
|
* Block defining the handlers for non UTF-8 encodings.
|
129
127
|
* If iconv is supported, there are two extra fields.
|
130
128
|
*/
|
131
|
-
#ifdef LIBXML_ICU_ENABLED
|
132
|
-
/* Size of pivot buffer, same as icu/source/common/ucnv.cpp CHUNK_SIZE */
|
133
|
-
#define ICU_PIVOT_BUF_SIZE 1024
|
134
|
-
struct _uconv_t {
|
135
|
-
UConverter *uconv; /* for conversion between an encoding and UTF-16 */
|
136
|
-
UConverter *utf8; /* for conversion between UTF-8 and UTF-16 */
|
137
|
-
UChar pivot_buf[ICU_PIVOT_BUF_SIZE];
|
138
|
-
UChar *pivot_source;
|
139
|
-
UChar *pivot_target;
|
140
|
-
};
|
141
|
-
typedef struct _uconv_t uconv_t;
|
142
|
-
#endif
|
143
|
-
|
144
129
|
typedef struct _xmlCharEncodingHandler xmlCharEncodingHandler;
|
145
130
|
typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr;
|
146
131
|
struct _xmlCharEncodingHandler {
|
@@ -152,8 +137,8 @@ struct _xmlCharEncodingHandler {
|
|
152
137
|
iconv_t iconv_out;
|
153
138
|
#endif /* LIBXML_ICONV_ENABLED */
|
154
139
|
#ifdef LIBXML_ICU_ENABLED
|
155
|
-
|
156
|
-
|
140
|
+
struct _uconv_t *uconv_in;
|
141
|
+
struct _uconv_t *uconv_out;
|
157
142
|
#endif /* LIBXML_ICU_ENABLED */
|
158
143
|
};
|
159
144
|
|
@@ -168,8 +153,10 @@ extern "C" {
|
|
168
153
|
/*
|
169
154
|
* Interfaces for encoding handlers.
|
170
155
|
*/
|
156
|
+
XML_DEPRECATED
|
171
157
|
XMLPUBFUN void XMLCALL
|
172
158
|
xmlInitCharEncodingHandlers (void);
|
159
|
+
XML_DEPRECATED
|
173
160
|
XMLPUBFUN void XMLCALL
|
174
161
|
xmlCleanupCharEncodingHandlers (void);
|
175
162
|
XMLPUBFUN void XMLCALL
|
@@ -75,6 +75,7 @@ typedef xmlEntitiesTable *xmlEntitiesTablePtr;
|
|
75
75
|
*/
|
76
76
|
|
77
77
|
#ifdef LIBXML_LEGACY_ENABLED
|
78
|
+
XML_DEPRECATED
|
78
79
|
XMLPUBFUN void XMLCALL
|
79
80
|
xmlInitializePredefinedEntities (void);
|
80
81
|
#endif /* LIBXML_LEGACY_ENABLED */
|
@@ -112,6 +113,7 @@ XMLPUBFUN xmlEntityPtr XMLCALL
|
|
112
113
|
xmlGetParameterEntity (xmlDocPtr doc,
|
113
114
|
const xmlChar *name);
|
114
115
|
#ifdef LIBXML_LEGACY_ENABLED
|
116
|
+
XML_DEPRECATED
|
115
117
|
XMLPUBFUN const xmlChar * XMLCALL
|
116
118
|
xmlEncodeEntities (xmlDocPtr doc,
|
117
119
|
const xmlChar *input);
|
@@ -24,7 +24,9 @@
|
|
24
24
|
extern "C" {
|
25
25
|
#endif
|
26
26
|
|
27
|
+
XML_DEPRECATED
|
27
28
|
XMLPUBFUN void XMLCALL xmlInitGlobals(void);
|
29
|
+
XML_DEPRECATED
|
28
30
|
XMLPUBFUN void XMLCALL xmlCleanupGlobals(void);
|
29
31
|
|
30
32
|
/**
|
@@ -67,7 +69,6 @@ XMLCALL xmlOutputBufferCreateFilenameDefault (xmlOutputBufferCreateFilenameFunc
|
|
67
69
|
* compatibility support.
|
68
70
|
*/
|
69
71
|
|
70
|
-
#undef docbDefaultSAXHandler
|
71
72
|
#undef htmlDefaultSAXHandler
|
72
73
|
#undef oldXMLWDcompatibility
|
73
74
|
#undef xmlBufferAllocScheme
|
@@ -124,7 +125,7 @@ struct _xmlGlobalState
|
|
124
125
|
|
125
126
|
xmlSAXLocator xmlDefaultSAXLocator;
|
126
127
|
xmlSAXHandlerV1 xmlDefaultSAXHandler;
|
127
|
-
xmlSAXHandlerV1 docbDefaultSAXHandler;
|
128
|
+
xmlSAXHandlerV1 docbDefaultSAXHandler; /* unused */
|
128
129
|
xmlSAXHandlerV1 htmlDefaultSAXHandler;
|
129
130
|
|
130
131
|
xmlFreeFunc xmlFree;
|
@@ -251,16 +252,6 @@ XMLPUBVAR xmlFreeFunc xmlFree;
|
|
251
252
|
XMLPUBVAR xmlStrdupFunc xmlMemStrdup;
|
252
253
|
#endif /* LIBXML_THREAD_ALLOC_ENABLED */
|
253
254
|
|
254
|
-
#ifdef LIBXML_DOCB_ENABLED
|
255
|
-
XMLPUBFUN xmlSAXHandlerV1 * XMLCALL __docbDefaultSAXHandler(void);
|
256
|
-
#ifdef LIBXML_THREAD_ENABLED
|
257
|
-
#define docbDefaultSAXHandler \
|
258
|
-
(*(__docbDefaultSAXHandler()))
|
259
|
-
#else
|
260
|
-
XMLPUBVAR xmlSAXHandlerV1 docbDefaultSAXHandler;
|
261
|
-
#endif
|
262
|
-
#endif
|
263
|
-
|
264
255
|
#ifdef LIBXML_HTML_ENABLED
|
265
256
|
XMLPUBFUN xmlSAXHandlerV1 * XMLCALL __htmlDefaultSAXHandler(void);
|
266
257
|
#ifdef LIBXML_THREAD_ENABLED
|