From kwaclaw at users.sourceforge.net Tue Aug 10 19:34:21 2004 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Tue Aug 10 19:34:24 2004 Subject: [Expat-checkins] expat/lib expat.h, 1.70, 1.71 expat_external.h, 1.1, 1.2 Message-ID: Update of /cvsroot/expat/expat/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23366 Modified Files: expat.h expat_external.h Log Message: Fix for bug #1006708. Index: expat.h =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- expat.h 16 Jul 2004 00:54:57 -0000 1.70 +++ expat.h 10 Aug 2004 17:34:18 -0000 1.71 @@ -17,6 +17,10 @@ #include #include "expat_external.h" +#ifdef __cplusplus +extern "C" { +#endif + struct XML_ParserStruct; typedef struct XML_ParserStruct *XML_Parser; Index: expat_external.h =================================================================== RCS file: /cvsroot/expat/expat/lib/expat_external.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- expat_external.h 6 May 2004 13:55:49 -0000 1.1 +++ expat_external.h 10 Aug 2004 17:34:19 -0000 1.2 @@ -90,3 +90,7 @@ typedef char XML_Char; typedef char XML_LChar; #endif /* XML_UNICODE */ + +#ifdef __cplusplus +} +#endif From kwaclaw at users.sourceforge.net Tue Aug 10 20:04:38 2004 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Tue Aug 10 20:04:42 2004 Subject: [Expat-checkins] expat/lib xmlparse.c,1.136,1.137 Message-ID: Update of /cvsroot/expat/expat/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29136 Modified Files: xmlparse.c Log Message: Fixed type error that came to light when compiling as C++ file. Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.136 retrieving revision 1.137 diff -u -d -r1.136 -r1.137 --- xmlparse.c 23 Jul 2004 02:02:41 -0000 1.136 +++ xmlparse.c 10 Aug 2004 18:04:34 -0000 1.137 @@ -1539,7 +1539,7 @@ XML_ParseBuffer(XML_Parser parser, int len, int isFinal) { const char *start; - enum XML_Error result = XML_STATUS_OK; + enum XML_Status result = XML_STATUS_OK; switch (parsing) { case XML_SUSPENDED: @@ -1698,7 +1698,7 @@ enum XML_Status XMLCALL XML_ResumeParser(XML_Parser parser) { - enum XML_Error result = XML_STATUS_OK; + enum XML_Status result = XML_STATUS_OK; if (parsing != XML_SUSPENDED) { errorCode = XML_ERROR_NOT_SUSPENDED; From kwaclaw at users.sourceforge.net Tue Aug 10 20:06:32 2004 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Tue Aug 10 20:06:35 2004 Subject: [Expat-checkins] expat/examples elements.c,1.4,1.5 Message-ID: Update of /cvsroot/expat/expat/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29515 Modified Files: elements.c Log Message: Added type cast necessary for compiling as C++ file (at least under VC++). Index: elements.c =================================================================== RCS file: /cvsroot/expat/expat/examples/elements.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- elements.c 15 Oct 2003 16:25:43 -0000 1.4 +++ elements.c 10 Aug 2004 18:06:29 -0000 1.5 @@ -11,7 +11,7 @@ startElement(void *userData, const char *name, const char **atts) { int i; - int *depthPtr = userData; + int *depthPtr = (int *)userData; for (i = 0; i < *depthPtr; i++) putchar('\t'); puts(name); @@ -21,7 +21,7 @@ static void XMLCALL endElement(void *userData, const char *name) { - int *depthPtr = userData; + int *depthPtr = (int *)userData; *depthPtr -= 1; } From kwaclaw at users.sourceforge.net Tue Aug 10 20:13:50 2004 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Tue Aug 10 20:13:53 2004 Subject: [Expat-checkins] expat/xmlwf xmlfile.c,1.13,1.14 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31045 Modified Files: xmlfile.c Log Message: Added type casts necessary for compiling as C++ file (at least under VC++). Index: xmlfile.c =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlfile.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- xmlfile.c 16 Oct 2003 04:51:11 -0000 1.13 +++ xmlfile.c 10 Aug 2004 18:13:47 -0000 1.14 @@ -50,7 +50,7 @@ static void reportError(XML_Parser parser, const XML_Char *filename) { - int code = XML_GetErrorCode(parser); + enum XML_Error code = XML_GetErrorCode(parser); const XML_Char *message = XML_ErrorString(code); if (message) ftprintf(stdout, T("%s:%d:%d: %s\n"), @@ -68,7 +68,7 @@ { XML_Parser parser = ((PROCESS_ARGS *)args)->parser; int *retPtr = ((PROCESS_ARGS *)args)->retPtr; - if (XML_Parse(parser, data, size, 1) == XML_STATUS_ERROR) { + if (XML_Parse(parser, (const char *)data, size, 1) == XML_STATUS_ERROR) { reportError(parser, filename); *retPtr = 0; } @@ -154,7 +154,7 @@ } for (;;) { int nread; - char *buf = XML_GetBuffer(parser, READ_SIZE); + char *buf = (char *)XML_GetBuffer(parser, READ_SIZE); if (!buf) { if (filename != NULL) close(fd); From kwaclaw at users.sourceforge.net Tue Aug 10 20:18:30 2004 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Tue Aug 10 20:18:34 2004 Subject: [Expat-checkins] expat/xmlwf xmlwf.c,1.66,1.67 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32643 Modified Files: xmlwf.c Log Message: Added type casts necessary for compiling as C++ file (at least under VC++). Index: xmlwf.c =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- xmlwf.c 15 Oct 2003 16:25:44 -0000 1.66 +++ xmlwf.c 10 Aug 2004 18:18:25 -0000 1.67 @@ -23,7 +23,7 @@ static void XMLCALL characterData(void *userData, const XML_Char *s, int len) { - FILE *fp = userData; + FILE *fp = (FILE *)userData; for (; len > 0; --len, ++s) { switch (*s) { case T('&'): @@ -118,7 +118,7 @@ { int nAtts; const XML_Char **p; - FILE *fp = userData; + FILE *fp = (FILE *)userData; puttc(T('<'), fp); fputts(name, fp); @@ -140,7 +140,7 @@ static void XMLCALL endElement(void *userData, const XML_Char *name) { - FILE *fp = userData; + FILE *fp = (FILE *)userData; puttc(T('<'), fp); puttc(T('/'), fp); fputts(name, fp); @@ -165,7 +165,7 @@ int nAtts; int nsi; const XML_Char **p; - FILE *fp = userData; + FILE *fp = (FILE *)userData; const XML_Char *sep; puttc(T('<'), fp); @@ -211,7 +211,7 @@ static void XMLCALL endElementNS(void *userData, const XML_Char *name) { - FILE *fp = userData; + FILE *fp = (FILE *)userData; const XML_Char *sep; puttc(T('<'), fp); puttc(T('/'), fp); @@ -231,7 +231,7 @@ processingInstruction(void *userData, const XML_Char *target, const XML_Char *data) { - FILE *fp = userData; + FILE *fp = (FILE *)userData; puttc(T('<'), fp); puttc(T('?'), fp); fputts(target, fp); @@ -293,7 +293,7 @@ static void XMLCALL markup(void *userData, const XML_Char *s, int len) { - FILE *fp = XML_GetUserData((XML_Parser) userData); + FILE *fp = (FILE *)XML_GetUserData((XML_Parser) userData); for (; len > 0; --len, ++s) puttc(*s, fp); } @@ -303,8 +303,8 @@ { const XML_Char *uri = XML_GetBase(parser); if (uri) - ftprintf(XML_GetUserData(parser), T(" uri=\"%s\""), uri); - ftprintf(XML_GetUserData(parser), + ftprintf((FILE *)XML_GetUserData(parser), T(" uri=\"%s\""), uri); + ftprintf((FILE *)XML_GetUserData(parser), T(" byte=\"%ld\" nbytes=\"%d\" line=\"%d\" col=\"%d\""), XML_GetCurrentByteIndex(parser), XML_GetCurrentByteCount(parser), @@ -315,13 +315,13 @@ static void metaStartDocument(void *userData) { - fputts(T("\n"), XML_GetUserData((XML_Parser) userData)); + fputts(T("\n"), (FILE *)XML_GetUserData((XML_Parser) userData)); } static void metaEndDocument(void *userData) { - fputts(T("\n"), XML_GetUserData((XML_Parser) userData)); + fputts(T("\n"), (FILE *)XML_GetUserData((XML_Parser) userData)); } static void XMLCALL @@ -329,7 +329,7 @@ const XML_Char **atts) { XML_Parser parser = (XML_Parser) userData; - FILE *fp = XML_GetUserData(parser); + FILE *fp = (FILE *)XML_GetUserData(parser); const XML_Char **specifiedAttsEnd = atts + XML_GetSpecifiedAttributeCount(parser); const XML_Char **idAttPtr; @@ -363,7 +363,7 @@ metaEndElement(void *userData, const XML_Char *name) { XML_Parser parser = (XML_Parser) userData; - FILE *fp = XML_GetUserData(parser); + FILE *fp = (FILE *)XML_GetUserData(parser); ftprintf(fp, T("\n"), fp); @@ -374,7 +374,7 @@ const XML_Char *data) { XML_Parser parser = (XML_Parser) userData; - FILE *fp = XML_GetUserData(parser); + FILE *fp = (FILE *)XML_GetUserData(parser); ftprintf(fp, T("\n"), fp); @@ -408,7 +408,7 @@ metaEndCdataSection(void *userData) { XML_Parser parser = (XML_Parser) userData; - FILE *fp = XML_GetUserData(parser); + FILE *fp = (FILE *)XML_GetUserData(parser); fputts(T("\n"), fp); @@ -418,7 +418,7 @@ metaCharacterData(void *userData, const XML_Char *s, int len) { XML_Parser parser = (XML_Parser) userData; - FILE *fp = XML_GetUserData(parser); + FILE *fp = (FILE *)XML_GetUserData(parser); fputts(T("\n"), fp); @@ -444,7 +444,7 @@ metaEndDoctypeDecl(void *userData) { XML_Parser parser = (XML_Parser) userData; - FILE *fp = XML_GetUserData(parser); + FILE *fp = (FILE *)XML_GetUserData(parser); fputts(T("\n"), fp); @@ -458,7 +458,7 @@ const XML_Char *publicId) { XML_Parser parser = (XML_Parser) userData; - FILE *fp = XML_GetUserData(parser); + FILE *fp = (FILE *)XML_GetUserData(parser); ftprintf(fp, T("\n"), fp); else @@ -645,7 +645,8 @@ int outputType = 0; int useNamespaces = 0; int requireStandalone = 0; - int paramEntityParsing = XML_PARAM_ENTITY_PARSING_NEVER; + enum XML_ParamEntityParsing paramEntityParsing = + XML_PARAM_ENTITY_PARSING_NEVER; int useStdin = 0; #ifdef _MSC_VER @@ -773,7 +774,7 @@ if (tcsrchr(file, T('\\'))) file = tcsrchr(file, T('\\')) + 1; #endif - outName = malloc((tcslen(outputDir) + tcslen(file) + 2) + outName = (XML_Char *)malloc((tcslen(outputDir) + tcslen(file) + 2) * sizeof(XML_Char)); tcscpy(outName, outputDir); tcscat(outName, T("/")); From fdrake at users.sourceforge.net Tue Aug 24 19:40:42 2004 From: fdrake at users.sourceforge.net (Fred L. Drake) Date: Tue Aug 24 19:40:46 2004 Subject: [Expat-checkins] htdocs index.html,1.52,1.53 Message-ID: Update of /cvsroot/expat/htdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19835 Modified Files: index.html Log Message: reference to an old snapshot should no longer be a hyperlink Index: index.html =================================================================== RCS file: /cvsroot/expat/htdocs/index.html,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- index.html 26 Jul 2004 14:53:39 -0000 1.52 +++ index.html 24 Aug 2004 17:40:39 -0000 1.53 @@ -105,8 +105,8 @@

We're working on getting the long-delayed Expat 1.95.7 out the - door. A snapshot of the current source code is available as expat-2003-10-15.tar.gz; + door. A snapshot of the current source code is available as + expat-2003-10-15.tar.gz (no longer available); please give this a try on your platform and report how it works for you to the