projects / packages / 3dwm.git / blame
| Commit | Line | Data |
|---|---|---|
| 2425bf66 MM |
1 | diff -ur 3dwm-0.3.1/src/Celsius/SAX/ExpatParser.cc 3dwm-0.3.1-/src/Celsius/SAX/ExpatParser.cc |
| 2 | --- 3dwm-0.3.1/src/Celsius/SAX/ExpatParser.cc Tue Aug 21 10:51:42 2001 | |
| 3 | +++ 3dwm-0.3.1-/src/Celsius/SAX/ExpatParser.cc Mon Feb 3 18:17:12 2003 | |
| 4 | @@ -62,13 +63,13 @@ | |
| 5 | _docHandler(0), _errorHandler(0) | |
| 6 | { | |
| 7 | // Associate the parser with a pointer to this instance | |
| 8 | - XML_SetUserData(_parser, this); | |
| 9 | + XML_SetUserData((XML_ParserStruct*)_parser, this); | |
| 10 | } | |
| 11 | ||
| 12 | ExpatParser::~ExpatParser() | |
| 13 | { | |
| 14 | // Delete the parser | |
| 15 | - XML_ParserFree(_parser); | |
| 16 | + XML_ParserFree((XML_ParserStruct*)_parser); | |
| 17 | } | |
| 18 | ||
| 19 | void ExpatParser::setEntityResolver(EntityResolver *resolver) | |
| 20 | @@ -88,13 +89,13 @@ | |
| 21 | ||
| 22 | // If this is a valid handler, set event handler functions | |
| 23 | if (_docHandler) { | |
| 24 | - XML_SetElementHandler(_parser, startElementHandler, endElementHandler); | |
| 25 | - XML_SetCharacterDataHandler(_parser, characterDataHandler); | |
| 26 | + XML_SetElementHandler((XML_ParserStruct*)_parser, startElementHandler, endElementHandler); | |
| 27 | + XML_SetCharacterDataHandler((XML_ParserStruct*)_parser, characterDataHandler); | |
| 28 | } | |
| 29 | // It is not, clear out handlers to stop handling events | |
| 30 | else { | |
| 31 | - XML_SetElementHandler(_parser, 0, 0); | |
| 32 | - XML_SetCharacterDataHandler(_parser, 0); | |
| 33 | + XML_SetElementHandler((XML_ParserStruct*)_parser, 0, 0); | |
| 34 | + XML_SetCharacterDataHandler((XML_ParserStruct*)_parser, 0); | |
| 35 | } | |
| 36 | } | |
| 37 | ||
| 38 | @@ -123,19 +124,19 @@ | |
| 39 | is.read(buffer, BUFFER_SIZE); | |
| 40 | ||
| 41 | // Parse it and report any errors | |
| 42 | - if (!XML_Parse(_parser, buffer, is.gcount(), false)) | |
| 43 | - throw ParseException(XML_ErrorString(XML_GetErrorCode(_parser)), | |
| 44 | + if (!XML_Parse((XML_ParserStruct*)_parser, buffer, is.gcount(), false)) | |
| 45 | + throw ParseException(XML_ErrorString(XML_GetErrorCode((XML_ParserStruct*)_parser)), | |
| 46 | publicId, systemId, | |
| 47 | - XML_GetCurrentLineNumber(_parser), | |
| 48 | - XML_GetCurrentColumnNumber(_parser)); | |
| 49 | + XML_GetCurrentLineNumber((XML_ParserStruct*)_parser), | |
| 50 | + XML_GetCurrentColumnNumber((XML_ParserStruct*)_parser)); | |
| 51 | } | |
| 52 | ||
| 53 | // We need to call expat with a final flag set to true | |
| 54 | - if (!XML_Parse(_parser, 0, 0, true)) | |
| 55 | - throw ParseException(XML_ErrorString(XML_GetErrorCode(_parser)), | |
| 56 | + if (!XML_Parse((XML_ParserStruct*)_parser, 0, 0, true)) | |
| 57 | + throw ParseException(XML_ErrorString(XML_GetErrorCode((XML_ParserStruct*)_parser)), | |
| 58 | publicId, systemId, | |
| 59 | - XML_GetCurrentLineNumber(_parser), | |
| 60 | - XML_GetCurrentColumnNumber(_parser)); | |
| 61 | + XML_GetCurrentLineNumber((XML_ParserStruct*)_parser), | |
| 62 | + XML_GetCurrentColumnNumber((XML_ParserStruct*)_parser)); | |
| 63 | ||
| 64 | // Finally, if we have a document handler, send an end event to it | |
| 65 | if (_docHandler) _docHandler->endDocument(); |