ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/src/vendor/expat/dist/xmlwf/xmlwf.c
(Generate patch)

Comparing vendor/expat/dist/xmlwf/xmlwf.c (file contents):
Revision 11600 by laffer1, Mon Sep 26 13:11:14 2016 UTC vs.
Revision 11601 by laffer1, Sun Jul 8 16:07:46 2018 UTC

# Line 9 | Line 9
9  
10   #include "expat.h"
11   #include "codepage.h"
12 + #include "internal.h"  /* for UNUSED_P only */
13   #include "xmlfile.h"
14   #include "xmltchar.h"
15  
# Line 248 | Line 249 | processingInstruction(void *userData, const XML_Char *
249   #endif /* not W3C14N */
250  
251   static void XMLCALL
252 < defaultCharacterData(void *userData, const XML_Char *s, int len)
252 > defaultCharacterData(void *userData, const XML_Char *UNUSED_P(s), int UNUSED_P(len))
253   {
254    XML_DefaultCurrent((XML_Parser) userData);
255   }
256  
257   static void XMLCALL
258 < defaultStartElement(void *userData, const XML_Char *name,
259 <                    const XML_Char **atts)
258 > defaultStartElement(void *userData, const XML_Char *UNUSED_P(name),
259 >                    const XML_Char **UNUSED_P(atts))
260   {
261    XML_DefaultCurrent((XML_Parser) userData);
262   }
263  
264   static void XMLCALL
265 < defaultEndElement(void *userData, const XML_Char *name)
265 > defaultEndElement(void *userData, const XML_Char *UNUSED_P(name))
266   {
267    XML_DefaultCurrent((XML_Parser) userData);
268   }
269  
270   static void XMLCALL
271 < defaultProcessingInstruction(void *userData, const XML_Char *target,
272 <                             const XML_Char *data)
271 > defaultProcessingInstruction(void *userData, const XML_Char *UNUSED_P(target),
272 >                             const XML_Char *UNUSED_P(data))
273   {
274    XML_DefaultCurrent((XML_Parser) userData);
275   }
276  
277   static void XMLCALL
278 < nopCharacterData(void *userData, const XML_Char *s, int len)
278 > nopCharacterData(void *UNUSED_P(userData), const XML_Char *UNUSED_P(s), int UNUSED_P(len))
279   {
280   }
281  
282   static void XMLCALL
283 < nopStartElement(void *userData, const XML_Char *name, const XML_Char **atts)
283 > nopStartElement(void *UNUSED_P(userData), const XML_Char *UNUSED_P(name), const XML_Char **UNUSED_P(atts))
284   {
285   }
286  
287   static void XMLCALL
288 < nopEndElement(void *userData, const XML_Char *name)
288 > nopEndElement(void *UNUSED_P(userData), const XML_Char *UNUSED_P(name))
289   {
290   }
291  
292   static void XMLCALL
293 < nopProcessingInstruction(void *userData, const XML_Char *target,
294 <                         const XML_Char *data)
293 > nopProcessingInstruction(void *UNUSED_P(userData), const XML_Char *UNUSED_P(target),
294 >                         const XML_Char *UNUSED_P(data))
295   {
296   }
297  
# Line 434 | Line 435 | metaCharacterData(void *userData, const XML_Char *s, i
435   static void XMLCALL
436   metaStartDoctypeDecl(void *userData,
437                       const XML_Char *doctypeName,
438 <                     const XML_Char *sysid,
439 <                     const XML_Char *pubid,
440 <                     int has_internal_subset)
438 >                     const XML_Char *UNUSED_P(sysid),
439 >                     const XML_Char *UNUSED_P(pubid),
440 >                     int UNUSED_P(has_internal_subset))
441   {
442    XML_Parser parser = (XML_Parser) userData;
443    FILE *fp = (FILE *)XML_GetUserData(parser);
# Line 458 | Line 459 | metaEndDoctypeDecl(void *userData)
459   static void XMLCALL
460   metaNotationDecl(void *userData,
461                   const XML_Char *notationName,
462 <                 const XML_Char *base,
462 >                 const XML_Char *UNUSED_P(base),
463                   const XML_Char *systemId,
464                   const XML_Char *publicId)
465   {
# Line 480 | Line 481 | metaNotationDecl(void *userData,
481   static void XMLCALL
482   metaEntityDecl(void *userData,
483                 const XML_Char *entityName,
484 <               int  is_param,
484 >               int  UNUSED_P(is_param),
485                 const XML_Char *value,
486                 int  value_length,
487 <               const XML_Char *base,
487 >               const XML_Char *UNUSED_P(base),
488                 const XML_Char *systemId,
489                 const XML_Char *publicId,
490                 const XML_Char *notationName)
# Line 558 | Line 559 | unknownEncodingConvert(void *data, const char *p)
559   }
560  
561   static int XMLCALL
562 < unknownEncoding(void *userData, const XML_Char *name, XML_Encoding *info)
562 > unknownEncoding(void *UNUSED_P(userData), const XML_Char *name, XML_Encoding *info)
563   {
564    int cp;
565    static const XML_Char prefixL[] = T("windows-");
# Line 594 | Line 595 | unknownEncoding(void *userData, const XML_Char *name,
595   }
596  
597   static int XMLCALL
598 < notStandalone(void *userData)
598 > notStandalone(void *UNUSED_P(userData))
599   {
600    return 0;
601   }
# Line 634 | Line 635 | static void
635   usage(const XML_Char *prog, int rc)
636   {
637    ftprintf(stderr,
638 <           T("usage: %s [-n] [-p] [-r] [-s] [-w] [-x] [-d output-dir] "
638 <             "[-e encoding] file ...\n"), prog);
638 >           T("usage: %s [-s] [-n] [-p] [-x] [-e encoding] [-w] [-d output-dir] [-c] [-m] [-r] [-t] [file ...]\n"), prog);
639    exit(rc);
640   }
641  
# Line 760 | Line 760 | tmain(int argc, XML_Char **argv)
760        parser = XML_ParserCreateNS(encoding, NSSEP);
761      else
762        parser = XML_ParserCreate(encoding);
763 +
764 +    if (! parser) {
765 +      tperror("Could not instantiate parser");
766 +      exit(1);
767 +    }
768 +
769      if (requireStandalone)
770        XML_SetNotStandaloneHandler(parser, notStandalone);
771      XML_SetParamEntityParsing(parser, paramEntityParsing);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines