diff options
author | Chris Liddell <chris.liddell@artifex.com> | 2016-11-04 12:13:08 +0000 |
---|---|---|
committer | Chris Liddell <chris.liddell@artifex.com> | 2016-11-04 12:42:40 +0000 |
commit | 00b5d81646bb936577cbea2476e13f0a5dd4b9f1 (patch) | |
tree | 1a648bec4b9bd8ba16e38e5d96e636c568802c41 /expat/xmlwf/xmlwf.c | |
parent | a73e3cf1ca91bbdb51d5a999a491e58fb9a7ce35 (diff) | |
download | ghostpdl-00b5d81646bb936577cbea2476e13f0a5dd4b9f1.tar.gz |
Update to expat 2.2.0
Diffstat (limited to 'expat/xmlwf/xmlwf.c')
-rw-r--r-- | expat/xmlwf/xmlwf.c | 52 |
1 files changed, 30 insertions, 22 deletions
diff --git a/expat/xmlwf/xmlwf.c b/expat/xmlwf/xmlwf.c index 41a433d3c..66d6c9ef4 100644 --- a/expat/xmlwf/xmlwf.c +++ b/expat/xmlwf/xmlwf.c @@ -9,6 +9,7 @@ #include "expat.h" #include "codepage.h" +#include "internal.h" /* for UNUSED_P only */ #include "xmlfile.h" #include "xmltchar.h" @@ -248,49 +249,49 @@ processingInstruction(void *userData, const XML_Char *target, #endif /* not W3C14N */ static void XMLCALL -defaultCharacterData(void *userData, const XML_Char *s, int len) +defaultCharacterData(void *userData, const XML_Char *UNUSED_P(s), int UNUSED_P(len)) { XML_DefaultCurrent((XML_Parser) userData); } static void XMLCALL -defaultStartElement(void *userData, const XML_Char *name, - const XML_Char **atts) +defaultStartElement(void *userData, const XML_Char *UNUSED_P(name), + const XML_Char **UNUSED_P(atts)) { XML_DefaultCurrent((XML_Parser) userData); } static void XMLCALL -defaultEndElement(void *userData, const XML_Char *name) +defaultEndElement(void *userData, const XML_Char *UNUSED_P(name)) { XML_DefaultCurrent((XML_Parser) userData); } static void XMLCALL -defaultProcessingInstruction(void *userData, const XML_Char *target, - const XML_Char *data) +defaultProcessingInstruction(void *userData, const XML_Char *UNUSED_P(target), + const XML_Char *UNUSED_P(data)) { XML_DefaultCurrent((XML_Parser) userData); } static void XMLCALL -nopCharacterData(void *userData, const XML_Char *s, int len) +nopCharacterData(void *UNUSED_P(userData), const XML_Char *UNUSED_P(s), int UNUSED_P(len)) { } static void XMLCALL -nopStartElement(void *userData, const XML_Char *name, const XML_Char **atts) +nopStartElement(void *UNUSED_P(userData), const XML_Char *UNUSED_P(name), const XML_Char **UNUSED_P(atts)) { } static void XMLCALL -nopEndElement(void *userData, const XML_Char *name) +nopEndElement(void *UNUSED_P(userData), const XML_Char *UNUSED_P(name)) { } static void XMLCALL -nopProcessingInstruction(void *userData, const XML_Char *target, - const XML_Char *data) +nopProcessingInstruction(void *UNUSED_P(userData), const XML_Char *UNUSED_P(target), + const XML_Char *UNUSED_P(data)) { } @@ -434,9 +435,9 @@ metaCharacterData(void *userData, const XML_Char *s, int len) static void XMLCALL metaStartDoctypeDecl(void *userData, const XML_Char *doctypeName, - const XML_Char *sysid, - const XML_Char *pubid, - int has_internal_subset) + const XML_Char *UNUSED_P(sysid), + const XML_Char *UNUSED_P(pubid), + int UNUSED_P(has_internal_subset)) { XML_Parser parser = (XML_Parser) userData; FILE *fp = (FILE *)XML_GetUserData(parser); @@ -458,7 +459,7 @@ metaEndDoctypeDecl(void *userData) static void XMLCALL metaNotationDecl(void *userData, const XML_Char *notationName, - const XML_Char *base, + const XML_Char *UNUSED_P(base), const XML_Char *systemId, const XML_Char *publicId) { @@ -480,10 +481,10 @@ metaNotationDecl(void *userData, static void XMLCALL metaEntityDecl(void *userData, const XML_Char *entityName, - int is_param, + int UNUSED_P(is_param), const XML_Char *value, int value_length, - const XML_Char *base, + const XML_Char *UNUSED_P(base), const XML_Char *systemId, const XML_Char *publicId, const XML_Char *notationName) @@ -558,7 +559,7 @@ unknownEncodingConvert(void *data, const char *p) } static int XMLCALL -unknownEncoding(void *userData, const XML_Char *name, XML_Encoding *info) +unknownEncoding(void *UNUSED_P(userData), const XML_Char *name, XML_Encoding *info) { int cp; static const XML_Char prefixL[] = T("windows-"); @@ -594,7 +595,7 @@ unknownEncoding(void *userData, const XML_Char *name, XML_Encoding *info) } static int XMLCALL -notStandalone(void *userData) +notStandalone(void *UNUSED_P(userData)) { return 0; } @@ -634,8 +635,7 @@ static void usage(const XML_Char *prog, int rc) { ftprintf(stderr, - T("usage: %s [-n] [-p] [-r] [-s] [-w] [-x] [-d output-dir] " - "[-e encoding] file ...\n"), prog); + T("usage: %s [-s] [-n] [-p] [-x] [-e encoding] [-w] [-d output-dir] [-c] [-m] [-r] [-t] [file ...]\n"), prog); exit(rc); } @@ -760,6 +760,12 @@ 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); @@ -849,8 +855,10 @@ tmain(int argc, XML_Char **argv) if (outputType == 'm') metaEndDocument(parser); fclose(fp); - if (!result) + if (!result) { tremove(outName); + exit(2); + } free(outName); } XML_ParserFree(parser); |