[Expat-checkins] expat/xmlwf xmlwf.c,1.66,1.67
Karl Waclawek
kwaclaw at users.sourceforge.net
Tue Aug 10 20:18:30 CEST 2004
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("<document>\n"), XML_GetUserData((XML_Parser) userData));
+ fputts(T("<document>\n"), (FILE *)XML_GetUserData((XML_Parser) userData));
}
static void
metaEndDocument(void *userData)
{
- fputts(T("</document>\n"), XML_GetUserData((XML_Parser) userData));
+ fputts(T("</document>\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("<endtag name=\"%s\""), name);
metaLocation(parser);
fputts(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("<pi target=\"%s\" data=\""), target);
characterData(fp, data, tcslen(data));
puttc(T('"'), fp);
@@ -386,7 +386,7 @@
metaComment(void *userData, const XML_Char *data)
{
XML_Parser parser = (XML_Parser) userData;
- FILE *fp = XML_GetUserData(parser);
+ FILE *fp = (FILE *)XML_GetUserData(parser);
fputts(T("<comment data=\""), fp);
characterData(fp, data, tcslen(data));
puttc(T('"'), fp);
@@ -398,7 +398,7 @@
metaStartCdataSection(void *userData)
{
XML_Parser parser = (XML_Parser) userData;
- FILE *fp = XML_GetUserData(parser);
+ FILE *fp = (FILE *)XML_GetUserData(parser);
fputts(T("<startcdata"), fp);
metaLocation(parser);
fputts(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("<endcdata"), fp);
metaLocation(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("<chars str=\""), fp);
characterData(fp, s, len);
puttc(T('"'), fp);
@@ -434,7 +434,7 @@
int has_internal_subset)
{
XML_Parser parser = (XML_Parser) userData;
- FILE *fp = XML_GetUserData(parser);
+ FILE *fp = (FILE *)XML_GetUserData(parser);
ftprintf(fp, T("<startdoctype name=\"%s\""), doctypeName);
metaLocation(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("<enddoctype"), fp);
metaLocation(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("<notation name=\"%s\""), notationName);
if (publicId)
ftprintf(fp, T(" public=\"%s\""), publicId);
@@ -484,7 +484,7 @@
const XML_Char *notationName)
{
XML_Parser parser = (XML_Parser) userData;
- FILE *fp = XML_GetUserData(parser);
+ FILE *fp = (FILE *)XML_GetUserData(parser);
if (value) {
ftprintf(fp, T("<entity name=\"%s\""), entityName);
@@ -522,7 +522,7 @@
const XML_Char *uri)
{
XML_Parser parser = (XML_Parser) userData;
- FILE *fp = XML_GetUserData(parser);
+ FILE *fp = (FILE *)XML_GetUserData(parser);
fputts(T("<startns"), fp);
if (prefix)
ftprintf(fp, T(" prefix=\"%s\""), prefix);
@@ -539,7 +539,7 @@
metaEndNamespaceDecl(void *userData, const XML_Char *prefix)
{
XML_Parser parser = (XML_Parser) userData;
- FILE *fp = XML_GetUserData(parser);
+ FILE *fp = (FILE *)XML_GetUserData(parser);
if (!prefix)
fputts(T("<endns/>\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("/"));
More information about the Expat-checkins
mailing list