[Expat-checkins] CVS: expat/xmlwf Makefile.in,1.1,1.2 xmlwf.c,1.54,1.55

[Clark Cooper]

Update of /cvsroot/expat/expat/xmlwf
In directory slayer.i.sourceforge.net:/tmp/cvs-serv14959/xmlwf

Modified Files:
	Makefile.in xmlwf.c 
Log Message:
Switch to using MANIFEST to build distribution.
Also fix xmlwf to use current entity declaration signature.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.in	2000/09/18 16:26:23	1.1
--- Makefile.in	2000/09/28 19:47:34	1.2
***************
*** 10,12 ****
  
  xmlwf: $(OBJS)
! 	$(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS)
\ No newline at end of file
--- 10,15 ----
  
  xmlwf: $(OBJS)
! 	$(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS)
! 
! clean:
! 	rm -f xmlwf core *.o
\ No newline at end of file

Index: xmlwf.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** xmlwf.c	2000/09/21 21:20:18	1.54
--- xmlwf.c	2000/09/28 19:47:35	1.55
***************
*** 398,402 ****
  
  static
! void metaStartDoctypeDecl(XML_Parser parser, const XML_Char *doctypeName)
  {
    FILE *fp = XML_GetUserData(parser);
--- 398,406 ----
  
  static
! void metaStartDoctypeDecl(XML_Parser parser,
! 			  const XML_Char *doctypeName,
! 			  const XML_Char *sysid,
! 			  const XML_Char *pubid,
! 			  int has_internal_subset)
  {
    FILE *fp = XML_GetUserData(parser);
***************
*** 416,439 ****
  
  static
- void metaUnparsedEntityDecl(XML_Parser parser,
- 			    const XML_Char *entityName,
- 			    const XML_Char *base,
- 			    const XML_Char *systemId,
- 			    const XML_Char *publicId,
- 			    const XML_Char *notationName)
- {
-   FILE *fp = XML_GetUserData(parser);
-   ftprintf(fp, T("<entity name=\"%s\""), entityName);
-   if (publicId)
-     ftprintf(fp, T(" public=\"%s\""), publicId);
-   fputts(T(" system=\""), fp);
-   characterData(fp, systemId, tcslen(systemId));
-   puttc(T('"'), fp);
-   ftprintf(fp, T(" notation=\"%s\""), notationName);
-   metaLocation(parser);
-   fputts(T("/>\n"), fp);
- }
- 
- static
  void metaNotationDecl(XML_Parser parser,
  		      const XML_Char *notationName,
--- 420,423 ----
***************
*** 457,489 ****
  
  static
! void metaExternalParsedEntityDecl(XML_Parser parser,
! 				  const XML_Char *entityName,
! 				  const XML_Char *base,
! 				  const XML_Char *systemId,
! 				  const XML_Char *publicId)
  {
    FILE *fp = XML_GetUserData(parser);
-   ftprintf(fp, T("<entity name=\"%s\""), entityName);
-   if (publicId)
-     ftprintf(fp, T(" public=\"%s\""), publicId);
-   fputts(T(" system=\""), fp);
-   characterData(fp, systemId, tcslen(systemId));
-   puttc(T('"'), fp);
-   metaLocation(parser);
-   fputts(T("/>\n"), fp);
- }
  
! static
! void metaInternalParsedEntityDecl(XML_Parser parser,
! 				  const XML_Char *entityName,
! 				  const XML_Char *text,
! 				  int textLen)
! {
!   FILE *fp = XML_GetUserData(parser);
!   ftprintf(fp, T("<entity name=\"%s\""), entityName);
!   metaLocation(parser);
!   puttc(T('>'), fp);
!   characterData(fp, text, textLen);
!   fputts(T("</entity/>\n"), fp);
  }
  
--- 441,484 ----
  
  static
! void metaEntityDecl(XML_Parser parser,
! 		    const XML_Char *entityName,
! 		    int  is_param,
! 		    const XML_Char *value,
! 		    int  value_length,
! 		    const XML_Char *base,
! 		    const XML_Char *systemId,
! 		    const XML_Char *publicId,
! 		    const XML_Char *notationName)
  {
    FILE *fp = XML_GetUserData(parser);
  
!   if (value) {
!     ftprintf(fp, T("<entity name=\"%s\""), entityName);
!     metaLocation(parser);
!     puttc(T('>'), fp);
!     characterData(fp, value, value_length);
!     fputts(T("</entity/>\n"), fp);
!   }
!   else if (notationName) {
!     ftprintf(fp, T("<entity name=\"%s\""), entityName);
!     if (publicId)
!       ftprintf(fp, T(" public=\"%s\""), publicId);
!     fputts(T(" system=\""), fp);
!     characterData(fp, systemId, tcslen(systemId));
!     puttc(T('"'), fp);
!     ftprintf(fp, T(" notation=\"%s\""), notationName);
!     metaLocation(parser);
!     fputts(T("/>\n"), fp);
!   }
!   else {
!     ftprintf(fp, T("<entity name=\"%s\""), entityName);
!     if (publicId)
!       ftprintf(fp, T(" public=\"%s\""), publicId);
!     fputts(T(" system=\""), fp);
!     characterData(fp, systemId, tcslen(systemId));
!     puttc(T('"'), fp);
!     metaLocation(parser);
!     fputts(T("/>\n"), fp);
!   }
  }
  
***************
*** 724,731 ****
  	XML_SetCharacterDataHandler(parser, metaCharacterData);
  	XML_SetDoctypeDeclHandler(parser, metaStartDoctypeDecl, metaEndDoctypeDecl);
! 	XML_SetUnparsedEntityDeclHandler(parser, metaUnparsedEntityDecl);
  	XML_SetNotationDeclHandler(parser, metaNotationDecl);
- 	XML_SetExternalParsedEntityDeclHandler(parser, metaExternalParsedEntityDecl);
- 	XML_SetInternalParsedEntityDeclHandler(parser, metaInternalParsedEntityDecl);
  	XML_SetNamespaceDeclHandler(parser, metaStartNamespaceDecl, metaEndNamespaceDecl);
  	metaStartDocument(parser);
--- 719,724 ----
  	XML_SetCharacterDataHandler(parser, metaCharacterData);
  	XML_SetDoctypeDeclHandler(parser, metaStartDoctypeDecl, metaEndDoctypeDecl);
! 	XML_SetEntityDeclHandler(parser, metaEntityDecl);
  	XML_SetNotationDeclHandler(parser, metaNotationDecl);
  	XML_SetNamespaceDeclHandler(parser, metaStartNamespaceDecl, metaEndNamespaceDecl);
  	metaStartDocument(parser);