[Expat-checkins] CVS: expat/xmlwf xmlwf.c,1.56,1.57

[Fred L. Drake]

Update of /cvsroot/expat/expat/xmlwf
In directory usw-pr-cvs1:/tmp/cvs-serv22136

Modified Files:
	xmlwf.c 
Log Message:
Wrap some long lines.

Index: xmlwf.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** xmlwf.c	5 Dec 2001 16:30:31 -0000	1.56
--- xmlwf.c	19 Apr 2002 16:19:33 -0000	1.57
***************
*** 112,116 ****
  }
  
! static void startElement(void *userData, const XML_Char *name, const XML_Char **atts)
  {
    int nAtts;
--- 112,117 ----
  }
  
! static void startElement(void *userData, const XML_Char *name,
! 			 const XML_Char **atts)
  {
    int nAtts;
***************
*** 155,159 ****
  }
  
! static void startElementNS(void *userData, const XML_Char *name, const XML_Char **atts)
  {
    int nAtts;
--- 156,161 ----
  }
  
! static void startElementNS(void *userData, const XML_Char *name,
! 			   const XML_Char **atts)
  {
    int nAtts;
***************
*** 221,225 ****
  #ifndef W3C14N
  
! static void processingInstruction(void *userData, const XML_Char *target, const XML_Char *data)
  {
    FILE *fp = userData;
--- 223,228 ----
  #ifndef W3C14N
  
! static void processingInstruction(void *userData, const XML_Char *target,
! 				  const XML_Char *data)
  {
    FILE *fp = userData;
***************
*** 240,244 ****
  }
  
! static void defaultStartElement(XML_Parser parser, const XML_Char *name, const XML_Char **atts)
  {
    XML_DefaultCurrent(parser);
--- 243,248 ----
  }
  
! static void defaultStartElement(XML_Parser parser, const XML_Char *name,
! 				const XML_Char **atts)
  {
    XML_DefaultCurrent(parser);
***************
*** 250,254 ****
  }
  
! static void defaultProcessingInstruction(XML_Parser parser, const XML_Char *target, const XML_Char *data)
  {
    XML_DefaultCurrent(parser);
--- 254,260 ----
  }
  
! static void defaultProcessingInstruction(XML_Parser parser,
! 					 const XML_Char *target,
! 					 const XML_Char *data)
  {
    XML_DefaultCurrent(parser);
***************
*** 259,263 ****
  }
  
! static void nopStartElement(XML_Parser parser, const XML_Char *name, const XML_Char **atts)
  {
  }
--- 265,270 ----
  }
  
! static void nopStartElement(XML_Parser parser, const XML_Char *name,
! 			    const XML_Char **atts)
  {
  }
***************
*** 267,271 ****
  }
  
! static void nopProcessingInstruction(XML_Parser parser, const XML_Char *target, const XML_Char *data)
  {
  }
--- 274,279 ----
  }
  
! static void nopProcessingInstruction(XML_Parser parser, const XML_Char *target,
! 				     const XML_Char *data)
  {
  }
***************
*** 305,309 ****
  
  static
! void metaStartElement(XML_Parser parser, const XML_Char *name, const XML_Char **atts)
  {
    FILE *fp = XML_GetUserData(parser);
--- 313,318 ----
  
  static
! void metaStartElement(XML_Parser parser, const XML_Char *name,
! 		      const XML_Char **atts)
  {
    FILE *fp = XML_GetUserData(parser);
***************
*** 347,351 ****
  
  static
! void metaProcessingInstruction(XML_Parser parser, const XML_Char *target, const XML_Char *data)
  {
    FILE *fp = XML_GetUserData(parser);
--- 356,361 ----
  
  static
! void metaProcessingInstruction(XML_Parser parser, const XML_Char *target,
! 			       const XML_Char *data)
  {
    FILE *fp = XML_GetUserData(parser);
***************
*** 577,581 ****
  void usage(const XML_Char *prog)
  {
!   ftprintf(stderr, T("usage: %s [-n] [-p] [-r] [-s] [-w] [-x] [-d output-dir] [-e encoding] file ...\n"), prog);
    exit(1);
  }
--- 587,593 ----
  void usage(const XML_Char *prog)
  {
!   ftprintf(stderr,
! 	   T("usage: %s [-n] [-p] [-r] [-s] [-w] [-x] [-d output-dir] "
! 	     "[-e encoding] file ...\n"), prog);
    exit(1);
  }
***************
*** 712,716 ****
  	file = tcsrchr(file, T('\\')) + 1;
  #endif
!       outName = malloc((tcslen(outputDir) + tcslen(file) + 2) * sizeof(XML_Char));
        tcscpy(outName, outputDir);
        tcscat(outName, T("/"));
--- 724,729 ----
  	file = tcsrchr(file, T('\\')) + 1;
  #endif
!       outName = malloc((tcslen(outputDir) + tcslen(file) + 2)
! 		       * sizeof(XML_Char));
        tcscpy(outName, outputDir);
        tcscat(outName, T("/"));
***************
*** 732,741 ****
  	XML_SetProcessingInstructionHandler(parser, metaProcessingInstruction);
  	XML_SetCommentHandler(parser, metaComment);
! 	XML_SetCdataSectionHandler(parser, metaStartCdataSection, metaEndCdataSection);
  	XML_SetCharacterDataHandler(parser, metaCharacterData);
! 	XML_SetDoctypeDeclHandler(parser, metaStartDoctypeDecl, metaEndDoctypeDecl);
  	XML_SetEntityDeclHandler(parser, metaEntityDecl);
  	XML_SetNotationDeclHandler(parser, metaNotationDecl);
! 	XML_SetNamespaceDeclHandler(parser, metaStartNamespaceDecl, metaEndNamespaceDecl);
  	metaStartDocument(parser);
  	break;
--- 745,757 ----
  	XML_SetProcessingInstructionHandler(parser, metaProcessingInstruction);
  	XML_SetCommentHandler(parser, metaComment);
! 	XML_SetCdataSectionHandler(parser, metaStartCdataSection,
! 				   metaEndCdataSection);
  	XML_SetCharacterDataHandler(parser, metaCharacterData);
! 	XML_SetDoctypeDeclHandler(parser, metaStartDoctypeDecl,
! 				  metaEndDoctypeDecl);
  	XML_SetEntityDeclHandler(parser, metaEntityDecl);
  	XML_SetNotationDeclHandler(parser, metaNotationDecl);
! 	XML_SetNamespaceDeclHandler(parser, metaStartNamespaceDecl,
! 				    metaEndNamespaceDecl);
  	metaStartDocument(parser);
  	break;
***************
*** 745,749 ****
  	XML_SetElementHandler(parser, defaultStartElement, defaultEndElement);
  	XML_SetCharacterDataHandler(parser, defaultCharacterData);
! 	XML_SetProcessingInstructionHandler(parser, defaultProcessingInstruction);
  	break;
        default:
--- 761,766 ----
  	XML_SetElementHandler(parser, defaultStartElement, defaultEndElement);
  	XML_SetCharacterDataHandler(parser, defaultCharacterData);
! 	XML_SetProcessingInstructionHandler(parser,
! 					    defaultProcessingInstruction);
  	break;
        default: