Skip to content

Commit fff423c

Browse files
committed
Update libxml2 to version 2.11.5.
1 parent 495a753 commit fff423c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+4760
-5034
lines changed

ChangeLog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ dd.mm.yy hh:mm - smooth alpha 0.9.11
55
- fixed crash querying CPU info on systems without affinity setting support in libcpuid
66

77
- upgraded fribidi to version 1.0.13
8+
- upgraded libxml2 to version 2.11.5
89
- upgraded libcurl to version 8.4.0
910
- upgraded libpng to version 1.6.40
1011
- upgraded libwebp to version 1.3.2

include/support/libxml2/libxml/HTMLparser.h

Lines changed: 52 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -83,87 +83,101 @@ struct _htmlEntityDesc {
8383
/*
8484
* There is only few public functions.
8585
*/
86-
XMLPUBFUN const htmlElemDesc * XMLCALL
86+
XML_DEPRECATED
87+
XMLPUBFUN void
88+
htmlInitAutoClose (void);
89+
XMLPUBFUN const htmlElemDesc *
8790
htmlTagLookup (const xmlChar *tag);
88-
XMLPUBFUN const htmlEntityDesc * XMLCALL
91+
XMLPUBFUN const htmlEntityDesc *
8992
htmlEntityLookup(const xmlChar *name);
90-
XMLPUBFUN const htmlEntityDesc * XMLCALL
93+
XMLPUBFUN const htmlEntityDesc *
9194
htmlEntityValueLookup(unsigned int value);
9295

93-
XMLPUBFUN int XMLCALL
96+
XMLPUBFUN int
9497
htmlIsAutoClosed(htmlDocPtr doc,
9598
htmlNodePtr elem);
96-
XMLPUBFUN int XMLCALL
99+
XMLPUBFUN int
97100
htmlAutoCloseTag(htmlDocPtr doc,
98101
const xmlChar *name,
99102
htmlNodePtr elem);
100-
XMLPUBFUN const htmlEntityDesc * XMLCALL
103+
XML_DEPRECATED
104+
XMLPUBFUN const htmlEntityDesc *
101105
htmlParseEntityRef(htmlParserCtxtPtr ctxt,
102106
const xmlChar **str);
103-
XMLPUBFUN int XMLCALL
107+
XML_DEPRECATED
108+
XMLPUBFUN int
104109
htmlParseCharRef(htmlParserCtxtPtr ctxt);
105-
XMLPUBFUN void XMLCALL
110+
XML_DEPRECATED
111+
XMLPUBFUN void
106112
htmlParseElement(htmlParserCtxtPtr ctxt);
107113

108-
XMLPUBFUN htmlParserCtxtPtr XMLCALL
114+
XMLPUBFUN htmlParserCtxtPtr
109115
htmlNewParserCtxt(void);
116+
XMLPUBFUN htmlParserCtxtPtr
117+
htmlNewSAXParserCtxt(const htmlSAXHandler *sax,
118+
void *userData);
110119

111-
XMLPUBFUN htmlParserCtxtPtr XMLCALL
120+
XMLPUBFUN htmlParserCtxtPtr
112121
htmlCreateMemoryParserCtxt(const char *buffer,
113122
int size);
114123

115-
XMLPUBFUN int XMLCALL
124+
XMLPUBFUN int
116125
htmlParseDocument(htmlParserCtxtPtr ctxt);
117-
XMLPUBFUN htmlDocPtr XMLCALL
126+
XML_DEPRECATED
127+
XMLPUBFUN htmlDocPtr
118128
htmlSAXParseDoc (const xmlChar *cur,
119129
const char *encoding,
120130
htmlSAXHandlerPtr sax,
121131
void *userData);
122-
XMLPUBFUN htmlDocPtr XMLCALL
132+
XMLPUBFUN htmlDocPtr
123133
htmlParseDoc (const xmlChar *cur,
124134
const char *encoding);
125-
XMLPUBFUN htmlDocPtr XMLCALL
135+
XMLPUBFUN htmlParserCtxtPtr
136+
htmlCreateFileParserCtxt(const char *filename,
137+
const char *encoding);
138+
XML_DEPRECATED
139+
XMLPUBFUN htmlDocPtr
126140
htmlSAXParseFile(const char *filename,
127141
const char *encoding,
128142
htmlSAXHandlerPtr sax,
129143
void *userData);
130-
XMLPUBFUN htmlDocPtr XMLCALL
144+
XMLPUBFUN htmlDocPtr
131145
htmlParseFile (const char *filename,
132146
const char *encoding);
133-
XMLPUBFUN int XMLCALL
147+
XMLPUBFUN int
134148
UTF8ToHtml (unsigned char *out,
135149
int *outlen,
136150
const unsigned char *in,
137151
int *inlen);
138-
XMLPUBFUN int XMLCALL
152+
XMLPUBFUN int
139153
htmlEncodeEntities(unsigned char *out,
140154
int *outlen,
141155
const unsigned char *in,
142156
int *inlen, int quoteChar);
143-
XMLPUBFUN int XMLCALL
157+
XMLPUBFUN int
144158
htmlIsScriptAttribute(const xmlChar *name);
145-
XMLPUBFUN int XMLCALL
159+
XMLPUBFUN int
146160
htmlHandleOmittedElem(int val);
147161

148162
#ifdef LIBXML_PUSH_ENABLED
149163
/**
150164
* Interfaces for the Push mode.
151165
*/
152-
XMLPUBFUN htmlParserCtxtPtr XMLCALL
166+
XMLPUBFUN htmlParserCtxtPtr
153167
htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax,
154168
void *user_data,
155169
const char *chunk,
156170
int size,
157171
const char *filename,
158172
xmlCharEncoding enc);
159-
XMLPUBFUN int XMLCALL
173+
XMLPUBFUN int
160174
htmlParseChunk (htmlParserCtxtPtr ctxt,
161175
const char *chunk,
162176
int size,
163177
int terminate);
164178
#endif /* LIBXML_PUSH_ENABLED */
165179

166-
XMLPUBFUN void XMLCALL
180+
XMLPUBFUN void
167181
htmlFreeParserCtxt (htmlParserCtxtPtr ctxt);
168182

169183
/*
@@ -188,63 +202,63 @@ typedef enum {
188202
HTML_PARSE_IGNORE_ENC=1<<21 /* ignore internal document encoding hint */
189203
} htmlParserOption;
190204

191-
XMLPUBFUN void XMLCALL
205+
XMLPUBFUN void
192206
htmlCtxtReset (htmlParserCtxtPtr ctxt);
193-
XMLPUBFUN int XMLCALL
207+
XMLPUBFUN int
194208
htmlCtxtUseOptions (htmlParserCtxtPtr ctxt,
195209
int options);
196-
XMLPUBFUN htmlDocPtr XMLCALL
210+
XMLPUBFUN htmlDocPtr
197211
htmlReadDoc (const xmlChar *cur,
198212
const char *URL,
199213
const char *encoding,
200214
int options);
201-
XMLPUBFUN htmlDocPtr XMLCALL
215+
XMLPUBFUN htmlDocPtr
202216
htmlReadFile (const char *URL,
203217
const char *encoding,
204218
int options);
205-
XMLPUBFUN htmlDocPtr XMLCALL
219+
XMLPUBFUN htmlDocPtr
206220
htmlReadMemory (const char *buffer,
207221
int size,
208222
const char *URL,
209223
const char *encoding,
210224
int options);
211-
XMLPUBFUN htmlDocPtr XMLCALL
225+
XMLPUBFUN htmlDocPtr
212226
htmlReadFd (int fd,
213227
const char *URL,
214228
const char *encoding,
215229
int options);
216-
XMLPUBFUN htmlDocPtr XMLCALL
230+
XMLPUBFUN htmlDocPtr
217231
htmlReadIO (xmlInputReadCallback ioread,
218232
xmlInputCloseCallback ioclose,
219233
void *ioctx,
220234
const char *URL,
221235
const char *encoding,
222236
int options);
223-
XMLPUBFUN htmlDocPtr XMLCALL
237+
XMLPUBFUN htmlDocPtr
224238
htmlCtxtReadDoc (xmlParserCtxtPtr ctxt,
225239
const xmlChar *cur,
226240
const char *URL,
227241
const char *encoding,
228242
int options);
229-
XMLPUBFUN htmlDocPtr XMLCALL
243+
XMLPUBFUN htmlDocPtr
230244
htmlCtxtReadFile (xmlParserCtxtPtr ctxt,
231245
const char *filename,
232246
const char *encoding,
233247
int options);
234-
XMLPUBFUN htmlDocPtr XMLCALL
248+
XMLPUBFUN htmlDocPtr
235249
htmlCtxtReadMemory (xmlParserCtxtPtr ctxt,
236250
const char *buffer,
237251
int size,
238252
const char *URL,
239253
const char *encoding,
240254
int options);
241-
XMLPUBFUN htmlDocPtr XMLCALL
255+
XMLPUBFUN htmlDocPtr
242256
htmlCtxtReadFd (xmlParserCtxtPtr ctxt,
243257
int fd,
244258
const char *URL,
245259
const char *encoding,
246260
int options);
247-
XMLPUBFUN htmlDocPtr XMLCALL
261+
XMLPUBFUN htmlDocPtr
248262
htmlCtxtReadIO (xmlParserCtxtPtr ctxt,
249263
xmlInputReadCallback ioread,
250264
xmlInputCloseCallback ioclose,
@@ -266,10 +280,10 @@ typedef enum {
266280
/* Using htmlElemDesc rather than name here, to emphasise the fact
267281
that otherwise there's a lookup overhead
268282
*/
269-
XMLPUBFUN htmlStatus XMLCALL htmlAttrAllowed(const htmlElemDesc*, const xmlChar*, int) ;
270-
XMLPUBFUN int XMLCALL htmlElementAllowedHere(const htmlElemDesc*, const xmlChar*) ;
271-
XMLPUBFUN htmlStatus XMLCALL htmlElementStatusHere(const htmlElemDesc*, const htmlElemDesc*) ;
272-
XMLPUBFUN htmlStatus XMLCALL htmlNodeStatus(const htmlNodePtr, int) ;
283+
XMLPUBFUN htmlStatus htmlAttrAllowed(const htmlElemDesc*, const xmlChar*, int) ;
284+
XMLPUBFUN int htmlElementAllowedHere(const htmlElemDesc*, const xmlChar*) ;
285+
XMLPUBFUN htmlStatus htmlElementStatusHere(const htmlElemDesc*, const htmlElemDesc*) ;
286+
XMLPUBFUN htmlStatus htmlNodeStatus(const htmlNodePtr, int) ;
273287
/**
274288
* htmlDefaultSubelement:
275289
* @elt: HTML element

include/support/libxml2/libxml/HTMLtree.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,81 +59,81 @@ extern "C" {
5959
*/
6060
#define HTML_PI_NODE XML_PI_NODE
6161

62-
XMLPUBFUN htmlDocPtr XMLCALL
62+
XMLPUBFUN htmlDocPtr
6363
htmlNewDoc (const xmlChar *URI,
6464
const xmlChar *ExternalID);
65-
XMLPUBFUN htmlDocPtr XMLCALL
65+
XMLPUBFUN htmlDocPtr
6666
htmlNewDocNoDtD (const xmlChar *URI,
6767
const xmlChar *ExternalID);
68-
XMLPUBFUN const xmlChar * XMLCALL
68+
XMLPUBFUN const xmlChar *
6969
htmlGetMetaEncoding (htmlDocPtr doc);
70-
XMLPUBFUN int XMLCALL
70+
XMLPUBFUN int
7171
htmlSetMetaEncoding (htmlDocPtr doc,
7272
const xmlChar *encoding);
7373
#ifdef LIBXML_OUTPUT_ENABLED
74-
XMLPUBFUN void XMLCALL
74+
XMLPUBFUN void
7575
htmlDocDumpMemory (xmlDocPtr cur,
7676
xmlChar **mem,
7777
int *size);
78-
XMLPUBFUN void XMLCALL
78+
XMLPUBFUN void
7979
htmlDocDumpMemoryFormat (xmlDocPtr cur,
8080
xmlChar **mem,
8181
int *size,
8282
int format);
83-
XMLPUBFUN int XMLCALL
83+
XMLPUBFUN int
8484
htmlDocDump (FILE *f,
8585
xmlDocPtr cur);
86-
XMLPUBFUN int XMLCALL
86+
XMLPUBFUN int
8787
htmlSaveFile (const char *filename,
8888
xmlDocPtr cur);
89-
XMLPUBFUN int XMLCALL
89+
XMLPUBFUN int
9090
htmlNodeDump (xmlBufferPtr buf,
9191
xmlDocPtr doc,
9292
xmlNodePtr cur);
93-
XMLPUBFUN void XMLCALL
93+
XMLPUBFUN void
9494
htmlNodeDumpFile (FILE *out,
9595
xmlDocPtr doc,
9696
xmlNodePtr cur);
97-
XMLPUBFUN int XMLCALL
97+
XMLPUBFUN int
9898
htmlNodeDumpFileFormat (FILE *out,
9999
xmlDocPtr doc,
100100
xmlNodePtr cur,
101101
const char *encoding,
102102
int format);
103-
XMLPUBFUN int XMLCALL
103+
XMLPUBFUN int
104104
htmlSaveFileEnc (const char *filename,
105105
xmlDocPtr cur,
106106
const char *encoding);
107-
XMLPUBFUN int XMLCALL
107+
XMLPUBFUN int
108108
htmlSaveFileFormat (const char *filename,
109109
xmlDocPtr cur,
110110
const char *encoding,
111111
int format);
112112

113-
XMLPUBFUN void XMLCALL
113+
XMLPUBFUN void
114114
htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf,
115115
xmlDocPtr doc,
116116
xmlNodePtr cur,
117117
const char *encoding,
118118
int format);
119-
XMLPUBFUN void XMLCALL
119+
XMLPUBFUN void
120120
htmlDocContentDumpOutput(xmlOutputBufferPtr buf,
121121
xmlDocPtr cur,
122122
const char *encoding);
123-
XMLPUBFUN void XMLCALL
123+
XMLPUBFUN void
124124
htmlDocContentDumpFormatOutput(xmlOutputBufferPtr buf,
125125
xmlDocPtr cur,
126126
const char *encoding,
127127
int format);
128-
XMLPUBFUN void XMLCALL
128+
XMLPUBFUN void
129129
htmlNodeDumpOutput (xmlOutputBufferPtr buf,
130130
xmlDocPtr doc,
131131
xmlNodePtr cur,
132132
const char *encoding);
133133

134134
#endif /* LIBXML_OUTPUT_ENABLED */
135135

136-
XMLPUBFUN int XMLCALL
136+
XMLPUBFUN int
137137
htmlIsBooleanAttr (const xmlChar *name);
138138

139139

0 commit comments

Comments
 (0)