niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

xml2: Import upstream release 2.11.7.

Browse source
This commit is contained in:
Alexandre Julliard 2024-02-17 21:00:22 +01:00
parent f1454777a8
commit da62790584
18 changed files with 63 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libs/xml2/error.c
View file

@ -67,7 +67,7 @@
*
* Default handler for out of context error messages.
*/
void XMLCDECL
void
xmlGenericErrorDefaultFunc(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) {
va_list args;
@ -466,7 +466,7 @@ xmlReportError(xmlErrorPtr err, xmlParserCtxtPtr ctxt, const char *str,
* then forward the error message down the parser or generic
* error callback handler
*/
void XMLCDECL
void
__xmlRaiseError(xmlStructuredErrorFunc schannel,
xmlGenericErrorFunc channel, void *data, void *ctx,
void *nod, int domain, int code, xmlErrorLevel level,
@ -705,7 +705,7 @@ __xmlSimpleError(int domain, int code, xmlNodePtr node,
* Display and format an error messages, gives file, line, position and
* extra parameters.
*/
void XMLCDECL
void
xmlParserError(void *ctx, const char *msg, ...)
{
xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
@ -748,7 +748,7 @@ xmlParserError(void *ctx, const char *msg, ...)
* Display and format a warning messages, gives file, line, position and
* extra parameters.
*/
void XMLCDECL
void
xmlParserWarning(void *ctx, const char *msg, ...)
{
xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
@ -797,7 +797,7 @@ xmlParserWarning(void *ctx, const char *msg, ...)
* Display and format an validity error messages, gives file,
* line, position and extra parameters.
*/
void XMLCDECL
void
xmlParserValidityError(void *ctx, const char *msg, ...)
{
xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
@ -841,7 +841,7 @@ xmlParserValidityError(void *ctx, const char *msg, ...)
* Display and format a validity warning messages, gives file, line,
* position and extra parameters.
*/
void XMLCDECL
void
xmlParserValidityWarning(void *ctx, const char *msg, ...)
{
xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
@ -1021,4 +1021,3 @@ xmlCopyError(xmlErrorPtr from, xmlErrorPtr to) {
return 0;
}

9
libs/xml2/globals.c
View file

@ -1083,7 +1083,7 @@ int xmlThrDefSubstituteEntitiesDefaultValue(int v) {
}
#undef xmlRegisterNodeDefaultValue
xmlRegisterNodeFunc * XMLCALL
xmlRegisterNodeFunc *
__xmlRegisterNodeDefaultValue(void) {
if (IS_MAIN_THREAD)
return (&xmlRegisterNodeDefaultValue);
@ -1092,7 +1092,7 @@ __xmlRegisterNodeDefaultValue(void) {
}
#undef xmlDeregisterNodeDefaultValue
xmlDeregisterNodeFunc * XMLCALL
xmlDeregisterNodeFunc *
__xmlDeregisterNodeDefaultValue(void) {
if (IS_MAIN_THREAD)
return (&xmlDeregisterNodeDefaultValue);
@ -1101,7 +1101,7 @@ __xmlDeregisterNodeDefaultValue(void) {
}
#undef xmlParserInputBufferCreateFilenameValue
xmlParserInputBufferCreateFilenameFunc * XMLCALL
xmlParserInputBufferCreateFilenameFunc *
__xmlParserInputBufferCreateFilenameValue(void) {
if (IS_MAIN_THREAD)
return (&xmlParserInputBufferCreateFilenameValue);
@ -1110,11 +1110,10 @@ __xmlParserInputBufferCreateFilenameValue(void) {
}
#undef xmlOutputBufferCreateFilenameValue
xmlOutputBufferCreateFilenameFunc * XMLCALL
xmlOutputBufferCreateFilenameFunc *
__xmlOutputBufferCreateFilenameValue(void) {
if (IS_MAIN_THREAD)
return (&xmlOutputBufferCreateFilenameValue);
else
return (&xmlGetGlobalState()->xmlOutputBufferCreateFilenameValue);
}

6
libs/xml2/include/libxml/parser.h
View file

@ -606,7 +606,7 @@ typedef void (*cdataBlockSAXFunc) (
*
* Display and format a warning messages, callback.
*/
typedef void (XMLCDECL *warningSAXFunc) (void *ctx,
typedef void (*warningSAXFunc) (void *ctx,
const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
/**
* errorSAXFunc:
@ -616,7 +616,7 @@ typedef void (XMLCDECL *warningSAXFunc) (void *ctx,
*
* Display and format an error messages, callback.
*/
typedef void (XMLCDECL *errorSAXFunc) (void *ctx,
typedef void (*errorSAXFunc) (void *ctx,
const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
/**
* fatalErrorSAXFunc:
@ -628,7 +628,7 @@ typedef void (XMLCDECL *errorSAXFunc) (void *ctx,
* Note: so far fatalError() SAX callbacks are not used, error()
* get all the callbacks for errors.
*/
typedef void (XMLCDECL *fatalErrorSAXFunc) (void *ctx,
typedef void (*fatalErrorSAXFunc) (void *ctx,
const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
/**
* isStandaloneSAXFunc:

4
libs/xml2/include/libxml/relaxng.h
View file

@ -32,7 +32,7 @@ typedef xmlRelaxNG *xmlRelaxNGPtr;
*
* Signature of an error callback from a Relax-NG validation
*/
typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx,
typedef void (*xmlRelaxNGValidityErrorFunc) (void *ctx,
const char *msg,
...) LIBXML_ATTR_FORMAT(2,3);
@ -44,7 +44,7 @@ typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx,
*
* Signature of a warning callback from a Relax-NG validation
*/
typedef void (XMLCDECL *xmlRelaxNGValidityWarningFunc) (void *ctx,
typedef void (*xmlRelaxNGValidityWarningFunc) (void *ctx,
const char *msg,
...) LIBXML_ATTR_FORMAT(2,3);

4
libs/xml2/include/libxml/valid.h
View file

@ -39,7 +39,7 @@ typedef xmlValidState *xmlValidStatePtr;
* Callback called when a validity error is found. This is a message
* oriented function similar to an *printf function.
*/
typedef void (XMLCDECL *xmlValidityErrorFunc) (void *ctx,
typedef void (*xmlValidityErrorFunc) (void *ctx,
const char *msg,
...) LIBXML_ATTR_FORMAT(2,3);
@ -54,7 +54,7 @@ typedef void (XMLCDECL *xmlValidityErrorFunc) (void *ctx,
* Callback called when a validity warning is found. This is a message
* oriented function similar to an *printf function.
*/
typedef void (XMLCDECL *xmlValidityWarningFunc) (void *ctx,
typedef void (*xmlValidityWarningFunc) (void *ctx,
const char *msg,
...) LIBXML_ATTR_FORMAT(2,3);

10
libs/xml2/include/libxml/xmlerror.h
View file

@ -844,7 +844,7 @@ typedef enum {
* Signature of the function to use when there is an error and
* no parsing or validity context available .
*/
typedef void (XMLCDECL *xmlGenericErrorFunc) (void *ctx,
typedef void (*xmlGenericErrorFunc) (void *ctx,
const char *msg,
...) LIBXML_ATTR_FORMAT(2,3);
/**
@ -875,19 +875,19 @@ XMLPUBFUN void
* Default message routines used by SAX and Valid context for error
* and warning reporting.
*/
XMLPUBFUN void XMLCDECL
XMLPUBFUN void
xmlParserError (void *ctx,
const char *msg,
...) LIBXML_ATTR_FORMAT(2,3);
XMLPUBFUN void XMLCDECL
XMLPUBFUN void
xmlParserWarning (void *ctx,
const char *msg,
...) LIBXML_ATTR_FORMAT(2,3);
XMLPUBFUN void XMLCDECL
XMLPUBFUN void
xmlParserValidityError (void *ctx,
const char *msg,
...) LIBXML_ATTR_FORMAT(2,3);
XMLPUBFUN void XMLCDECL
XMLPUBFUN void
xmlParserValidityWarning (void *ctx,
const char *msg,
...) LIBXML_ATTR_FORMAT(2,3);

4
libs/xml2/include/libxml/xmlexports.h
View file

@ -39,12 +39,10 @@
/** DOC_DISABLE */
/* Compatibility */
#define XMLCALL
#define XMLCDECL WINAPIV
#define XMLCDECL
#if !defined(LIBXML_DLL_IMPORT)
#define LIBXML_DLL_IMPORT XMLPUBVAR
#endif
/** DOC_ENABLE */
#endif /* __XML_EXPORTS_H__ */

6
libs/xml2/include/libxml/xmlschemas.h
View file

@ -92,7 +92,7 @@ typedef xmlSchema *xmlSchemaPtr;
*
* Signature of an error callback from an XSD validation
*/
typedef void (XMLCDECL *xmlSchemaValidityErrorFunc)
typedef void (*xmlSchemaValidityErrorFunc)
(void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
/**
@ -103,7 +103,7 @@ typedef void (XMLCDECL *xmlSchemaValidityErrorFunc)
*
* Signature of a warning callback from an XSD validation
*/
typedef void (XMLCDECL *xmlSchemaValidityWarningFunc)
typedef void (*xmlSchemaValidityWarningFunc)
(void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
/**
@ -128,7 +128,7 @@ typedef xmlSchemaValidCtxt *xmlSchemaValidCtxtPtr;
* Returns: 0 in case of success and -1 in case of error
*/
typedef int (XMLCDECL *xmlSchemaValidityLocatorFunc) (void *ctx,
typedef int (*xmlSchemaValidityLocatorFunc) (void *ctx,
const char **file, unsigned long *line);
/*

2
libs/xml2/include/libxml/xmlstring.h
View file

@ -94,7 +94,7 @@ XMLPUBFUN xmlChar *
xmlStrncatNew (const xmlChar *str1,
const xmlChar *str2,
int len);
XMLPUBFUN int XMLCDECL
XMLPUBFUN int
xmlStrPrintf (xmlChar *buf,
int len,
const char *msg,

8
libs/xml2/include/libxml/xmlversion.h
View file

@ -29,21 +29,21 @@ XMLPUBFUN void xmlCheckVersion(int version);
*
* the version string like "1.2.3"
*/
#define LIBXML_DOTTED_VERSION "2.11.5"
#define LIBXML_DOTTED_VERSION "2.11.7"
/**
* LIBXML_VERSION:
*
* the version number: 1.2.3 value is 10203
*/
#define LIBXML_VERSION 21105
#define LIBXML_VERSION 21107
/**
* LIBXML_VERSION_STRING:
*
* the version number string, 1.2.3 value is "10203"
*/
#define LIBXML_VERSION_STRING "21105"
#define LIBXML_VERSION_STRING "21107"
/**
* LIBXML_VERSION_EXTRA:
@ -58,7 +58,7 @@ XMLPUBFUN void xmlCheckVersion(int version);
* Macro to check that the libxml version in use is compatible with
* the version the software has been compiled against
*/
#define LIBXML_TEST_VERSION xmlCheckVersion(21105);
#define LIBXML_TEST_VERSION xmlCheckVersion(21107);
#ifndef VMS
#if 0

4
libs/xml2/include/private/error.h
View file

@ -4,7 +4,7 @@
#include <libxml/xmlerror.h>
#include <libxml/xmlversion.h>
XML_HIDDEN void XMLCDECL
XML_HIDDEN void
__xmlRaiseError(xmlStructuredErrorFunc schannel,
xmlGenericErrorFunc channel, void *data, void *ctx,
void *nod, int domain, int code, xmlErrorLevel level,
@ -14,7 +14,7 @@ __xmlRaiseError(xmlStructuredErrorFunc schannel,
XML_HIDDEN void
__xmlSimpleError(int domain, int code, xmlNodePtr node,
const char *msg, const char *extra) LIBXML_ATTR_FORMAT(4,0);
XML_HIDDEN void XMLCDECL
XML_HIDDEN void
xmlGenericErrorDefaultFunc(void *ctx, const char *msg,
...) LIBXML_ATTR_FORMAT(2,3);

11
libs/xml2/parser.c
View file

@ -4494,6 +4494,8 @@ get_more:
line = ctxt->input->line;
col = ctxt->input->col;
}
if (ctxt->instate == XML_PARSER_EOF)
return;
}
ctxt->input->cur = in;
if (*in == 0xD) {
@ -14322,7 +14324,9 @@ xmlInitParser(void) {
__xmlGlobalInitMutexLock();
if (xmlParserInitialized == 0) {
#endif
#if defined(_WIN32) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
#if defined(_WIN32) && \
!defined(LIBXML_THREAD_ALLOC_ENABLED) && \
(!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
if (xmlFree == free)
atexit(xmlCleanupParser);
#endif
@ -14392,7 +14396,9 @@ xmlCleanupParser(void) {
xmlParserInitialized = 0;
}
#if defined(HAVE_ATTRIBUTE_DESTRUCTOR) && !defined(LIBXML_STATIC) && \
#if defined(HAVE_ATTRIBUTE_DESTRUCTOR) && \
!defined(LIBXML_THREAD_ALLOC_ENABLED) && \
!defined(LIBXML_STATIC) && \
!defined(_WIN32)
static void
ATTRIBUTE_DESTRUCTOR
@ -15184,4 +15190,3 @@ xmlCtxtReadIO(xmlParserCtxtPtr ctxt, xmlInputReadCallback ioread,
inputPush(ctxt, stream);
return (xmlDoRead(ctxt, URL, encoding, options, 1));
}

36
libs/xml2/save.h
View file

@ -1,36 +0,0 @@
/*
* Summary: Internal Interfaces for saving in libxml2
* Description: this module describes a few interfaces which were
* added along with the API changes in 2.9.0
* those are private routines at this point
*
* Copy: See Copyright for the status of this software.
*
* Author: Daniel Veillard
*/
#ifndef __XML_SAVE_H__
#define __XML_SAVE_H__
#include <libxml/tree.h>
#ifdef __cplusplus
extern "C" {
#endif
#ifdef LIBXML_OUTPUT_ENABLED
void xmlBufAttrSerializeTxtContent(xmlBufPtr buf, xmlDocPtr doc,
xmlAttrPtr attr, const xmlChar * string);
void xmlBufDumpNotationTable(xmlBufPtr buf, xmlNotationTablePtr table);
void xmlBufDumpElementDecl(xmlBufPtr buf, xmlElementPtr elem);
void xmlBufDumpAttributeDecl(xmlBufPtr buf, xmlAttributePtr attr);
void xmlBufDumpEntityDecl(xmlBufPtr buf, xmlEntityPtr ent);
#endif
xmlChar *xmlEncodeAttributeEntities(xmlDocPtr doc, const xmlChar *input);
#ifdef __cplusplus
}
#endif
#endif /* __XML_SAVE_H__ */

2
libs/xml2/valid.c
View file

@ -7018,7 +7018,7 @@ xmlValidGetPotentialChildren(xmlElementContent *ctree,
/*
* Dummy function to suppress messages while we try out valid elements
*/
static void XMLCDECL xmlNoValidityErr(void *ctx ATTRIBUTE_UNUSED,
static void xmlNoValidityErr(void *ctx ATTRIBUTE_UNUSED,
const char *msg ATTRIBUTE_UNUSED, ...) {
return;
}

3
libs/xml2/xinclude.c
View file

@ -733,10 +733,11 @@ xmlXIncludeCopyNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr elem,
return(result);
while (cur->next == NULL) {
if (insertParent != NULL)
insertParent->last = insertLast;
cur = cur->parent;
if (cur == elem)
return(result);
insertParent->last = insertLast;
insertLast = insertParent;
insertParent = insertParent->parent;
}

23
libs/xml2/xmlreader.c
View file

@ -1443,6 +1443,7 @@ node_found:
* Handle XInclude if asked for
*/
if ((reader->xinclude) && (reader->in_xinclude == 0) &&
(reader->state != XML_TEXTREADER_BACKTRACK) &&
(reader->node != NULL) &&
(reader->node->type == XML_ELEMENT_NODE) &&
(reader->node->ns != NULL) &&
@ -3889,7 +3890,7 @@ xmlTextReaderPreserve(xmlTextReaderPtr reader) {
}
reader->preserves++;
parent = cur->parent;;
parent = cur->parent;
while (parent != NULL) {
if (parent->type == XML_ELEMENT_NODE)
parent->extra |= NODE_IS_PRESERVED;
@ -3979,19 +3980,19 @@ xmlTextReaderCurrentDoc(xmlTextReaderPtr reader) {
#ifdef LIBXML_SCHEMAS_ENABLED
static char *xmlTextReaderBuildMessage(const char *msg, va_list ap) LIBXML_ATTR_FORMAT(1,0);
static void XMLCDECL
static void
xmlTextReaderValidityError(void *ctxt, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
static void XMLCDECL
static void
xmlTextReaderValidityWarning(void *ctxt, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
static void XMLCDECL
static void
xmlTextReaderValidityErrorRelay(void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
static void XMLCDECL
static void
xmlTextReaderValidityWarningRelay(void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
static void XMLCDECL
static void
xmlTextReaderValidityErrorRelay(void *ctx, const char *msg, ...)
{
xmlTextReaderPtr reader = (xmlTextReaderPtr) ctx;
@ -4014,7 +4015,7 @@ xmlTextReaderValidityErrorRelay(void *ctx, const char *msg, ...)
va_end(ap);
}
static void XMLCDECL
static void
xmlTextReaderValidityWarningRelay(void *ctx, const char *msg, ...)
{
xmlTextReaderPtr reader = (xmlTextReaderPtr) ctx;
@ -4783,7 +4784,7 @@ xmlTextReaderStructuredError(void *ctxt, xmlErrorPtr error)
}
}
static void XMLCDECL LIBXML_ATTR_FORMAT(2,3)
static void LIBXML_ATTR_FORMAT(2,3)
xmlTextReaderError(void *ctxt, const char *msg, ...)
{
va_list ap;
@ -4796,7 +4797,7 @@ xmlTextReaderError(void *ctxt, const char *msg, ...)
}
static void XMLCDECL LIBXML_ATTR_FORMAT(2,3)
static void LIBXML_ATTR_FORMAT(2,3)
xmlTextReaderWarning(void *ctxt, const char *msg, ...)
{
va_list ap;
@ -4808,7 +4809,7 @@ xmlTextReaderWarning(void *ctxt, const char *msg, ...)
va_end(ap);
}
static void XMLCDECL
static void
xmlTextReaderValidityError(void *ctxt, const char *msg, ...)
{
va_list ap;
@ -4828,7 +4829,7 @@ xmlTextReaderValidityError(void *ctxt, const char *msg, ...)
}
}
static void XMLCDECL
static void
xmlTextReaderValidityWarning(void *ctxt, const char *msg, ...)
{
va_list ap;

12
libs/xml2/xmlschemas.c
View file

@ -20342,7 +20342,7 @@ xmlSchemaResolveAttrUseReferences(xmlSchemaAttributeUsePtr ause,
WXS_BASIC_CAST ause, ause->node,
"ref", ref->name, ref->targetNamespace,
XML_SCHEMA_TYPE_ATTRIBUTE, NULL);
return(ctxt->err);;
return(ctxt->err);
}
}
return(0);
@ -23011,7 +23011,7 @@ xmlSchemaXPathProcessHistory(xmlSchemaValidCtxtPtr vctxt,
} else if (pos >= matcher->sizeKeySeqs) {
int i = matcher->sizeKeySeqs;
matcher->sizeKeySeqs *= 2;
matcher->sizeKeySeqs = pos * 2;
matcher->keySeqs = (xmlSchemaPSVIIDCKeyPtr **)
xmlRealloc(matcher->keySeqs,
matcher->sizeKeySeqs *
@ -28716,7 +28716,7 @@ commentSplit(void *ctx, const xmlChar *value)
* Varargs error callbacks to the user application, harder ...
*/
static void XMLCDECL
static void
warningSplit(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) {
xmlSchemaSAXPlugPtr ctxt = (xmlSchemaSAXPlugPtr) ctx;
if ((ctxt != NULL) && (ctxt->user_sax != NULL) &&
@ -28724,7 +28724,7 @@ warningSplit(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) {
TODO
}
}
static void XMLCDECL
static void
errorSplit(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) {
xmlSchemaSAXPlugPtr ctxt = (xmlSchemaSAXPlugPtr) ctx;
if ((ctxt != NULL) && (ctxt->user_sax != NULL) &&
@ -28732,7 +28732,7 @@ errorSplit(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) {
TODO
}
}
static void XMLCDECL
static void
fatalErrorSplit(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) {
xmlSchemaSAXPlugPtr ctxt = (xmlSchemaSAXPlugPtr) ctx;
if ((ctxt != NULL) && (ctxt->user_sax != NULL) &&
@ -29117,7 +29117,7 @@ xmlSchemaValidateStream(xmlSchemaValidCtxtPtr ctxt,
pctxt->linenumbers = 1;
xmlSchemaValidateSetLocator(ctxt, xmlSchemaValidateStreamLocator, pctxt);
inputStream = xmlNewIOInputStream(pctxt, input, enc);;
inputStream = xmlNewIOInputStream(pctxt, input, enc);
if (inputStream == NULL) {
ret = -1;
goto done;

3
libs/xml2/xmlstring.c
View file

@ -543,7 +543,7 @@ xmlStrcat(xmlChar *cur, const xmlChar *add) {
*
* Returns the number of characters written to @buf or -1 if an error occurs.
*/
int XMLCDECL
int
xmlStrPrintf(xmlChar *buf, int len, const char *msg, ...) {
va_list args;
int ret;
@ -1043,4 +1043,3 @@ xmlEscapeFormatString(xmlChar **msg)
return *msg;
}