Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-21 06:01:13 +02:00
Code Issues Releases Wiki Activity

Revert "Update from expat 2.1.0 to version 2.2.1..."

Browse Source 
This reverts commit 2b146bf543, reversing
changes made to 138c188fb4.
This commit is contained in:
Paul Licameli
2017-06-29 11:27:12 -04:00
parent f3e31eca8b
commit f6d92ece82
85 changed files with 882 additions and 8074 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lib-src/expat/xmlwf/xmlwf.c
View File

@@ -9,7 +9,6 @@
#include "expat.h"
#include "codepage.h"
#include "internal.h" /* for UNUSED_P only */
#include "xmlfile.h"
#include "xmltchar.h"
@@ -17,6 +16,10 @@
#include <crtdbg.h>
#endif
#if defined(__amigaos__) && defined(__USE_INLINE__)
#include <proto/expat.h>
#endif
/* This ensures proper sorting. */
#define NSSEP T('\001')
@@ -245,49 +248,49 @@ processingInstruction(void *userData, const XML_Char *target,
#endif /* not W3C14N */
static void XMLCALL
defaultCharacterData(void *userData, const XML_Char *UNUSED_P(s), int UNUSED_P(len))
defaultCharacterData(void *userData, const XML_Char *s, int len)
{
XML_DefaultCurrent((XML_Parser) userData);
}
static void XMLCALL
defaultStartElement(void *userData, const XML_Char *UNUSED_P(name),
const XML_Char **UNUSED_P(atts))
defaultStartElement(void *userData, const XML_Char *name,
const XML_Char **atts)
{
XML_DefaultCurrent((XML_Parser) userData);
}
static void XMLCALL
defaultEndElement(void *userData, const XML_Char *UNUSED_P(name))
defaultEndElement(void *userData, const XML_Char *name)
{
XML_DefaultCurrent((XML_Parser) userData);
}
static void XMLCALL
defaultProcessingInstruction(void *userData, const XML_Char *UNUSED_P(target),
const XML_Char *UNUSED_P(data))
defaultProcessingInstruction(void *userData, const XML_Char *target,
const XML_Char *data)
{
XML_DefaultCurrent((XML_Parser) userData);
}
static void XMLCALL
nopCharacterData(void *UNUSED_P(userData), const XML_Char *UNUSED_P(s), int UNUSED_P(len))
nopCharacterData(void *userData, const XML_Char *s, int len)
{
}
static void XMLCALL
nopStartElement(void *UNUSED_P(userData), const XML_Char *UNUSED_P(name), const XML_Char **UNUSED_P(atts))
nopStartElement(void *userData, const XML_Char *name, const XML_Char **atts)
{
}
static void XMLCALL
nopEndElement(void *UNUSED_P(userData), const XML_Char *UNUSED_P(name))
nopEndElement(void *userData, const XML_Char *name)
{
}
static void XMLCALL
nopProcessingInstruction(void *UNUSED_P(userData), const XML_Char *UNUSED_P(target),
const XML_Char *UNUSED_P(data))
nopProcessingInstruction(void *userData, const XML_Char *target,
const XML_Char *data)
{
}
@@ -431,9 +434,9 @@ metaCharacterData(void *userData, const XML_Char *s, int len)
static void XMLCALL
metaStartDoctypeDecl(void *userData,
const XML_Char *doctypeName,
const XML_Char *UNUSED_P(sysid),
const XML_Char *UNUSED_P(pubid),
int UNUSED_P(has_internal_subset))
const XML_Char *sysid,
const XML_Char *pubid,
int has_internal_subset)
{
XML_Parser parser = (XML_Parser) userData;
FILE *fp = (FILE *)XML_GetUserData(parser);
@@ -455,7 +458,7 @@ metaEndDoctypeDecl(void *userData)
static void XMLCALL
metaNotationDecl(void *userData,
const XML_Char *notationName,
const XML_Char *UNUSED_P(base),
const XML_Char *base,
const XML_Char *systemId,
const XML_Char *publicId)
{
@@ -477,10 +480,10 @@ metaNotationDecl(void *userData,
static void XMLCALL
metaEntityDecl(void *userData,
const XML_Char *entityName,
int UNUSED_P(is_param),
int is_param,
const XML_Char *value,
int value_length,
const XML_Char *UNUSED_P(base),
const XML_Char *base,
const XML_Char *systemId,
const XML_Char *publicId,
const XML_Char *notationName)
@@ -555,7 +558,7 @@ unknownEncodingConvert(void *data, const char *p)
}
static int XMLCALL
unknownEncoding(void *UNUSED_P(userData), const XML_Char *name, XML_Encoding *info)
unknownEncoding(void *userData, const XML_Char *name, XML_Encoding *info)
{
int cp;
static const XML_Char prefixL[] = T("windows-");
@@ -591,7 +594,7 @@ unknownEncoding(void *UNUSED_P(userData), const XML_Char *name, XML_Encoding *in
}
static int XMLCALL
notStandalone(void *UNUSED_P(userData))
notStandalone(void *userData)
{
return 0;
}
@@ -604,7 +607,7 @@ showVersion(XML_Char *prog)
const XML_Feature *features = XML_GetFeatureList();
while ((ch = *s) != 0) {
if (ch == '/'
#if defined(_WIN32)
#if (defined(WIN32) || defined(__WATCOMC__))
|| ch == '\\'
#endif
)
@@ -631,7 +634,8 @@ static void
usage(const XML_Char *prog, int rc)
{
ftprintf(stderr,
T("usage: %s [-s] [-n] [-p] [-x] [-e encoding] [-w] [-d output-dir] [-c] [-m] [-r] [-t] [file ...]\n"), prog);
T("usage: %s [-n] [-p] [-r] [-s] [-w] [-x] [-d output-dir] "
"[-e encoding] file ...\n"), prog);
exit(rc);
}
@@ -756,12 +760,6 @@ tmain(int argc, XML_Char **argv)
parser = XML_ParserCreateNS(encoding, NSSEP);
else
parser = XML_ParserCreate(encoding);
if (! parser) {
tperror("Could not instantiate parser");
exit(1);
}
if (requireStandalone)
XML_SetNotStandaloneHandler(parser, notStandalone);
XML_SetParamEntityParsing(parser, paramEntityParsing);
@@ -781,7 +779,7 @@ tmain(int argc, XML_Char **argv)
const XML_Char * lastDelim = tcsrchr(file, delim[0]);
if (lastDelim)
file = lastDelim + 1;
#if defined(_WIN32)
#if (defined(WIN32) || defined(__WATCOMC__))
else {
const XML_Char * winDelim = T("\\");
lastDelim = tcsrchr(file, winDelim[0]);