#define encoding (parser->m_encoding)
#define unknownEncodingHandlerData \
(parser->m_unknownEncodingHandlerData)
-#define eventPtr (parser->m_eventPtr)
#define eventEndPtr (parser->m_eventEndPtr)
#define positionPtr (parser->m_positionPtr)
#define position (parser->m_position)
declAttributeIsId = XML_FALSE;
memset(&position, 0, sizeof(POSITION));
parser->m_errorCode = XML_ERROR_NONE;
- eventPtr = NULL;
+ parser->m_eventPtr = NULL;
eventEndPtr = NULL;
positionPtr = NULL;
openInternalEntities = NULL;
return XML_STATUS_OK;
}
}
- eventEndPtr = eventPtr;
+ eventEndPtr = parser->m_eventPtr;
parser->m_processor = errorProcessor;
return XML_STATUS_ERROR;
}
/* Detect overflow (a+b > MAX <==> b > MAX-a) */
if (len > ((XML_Size)-1) / 2 - parseEndByteIndex) {
parser->m_errorCode = XML_ERROR_NO_MEMORY;
- eventPtr = eventEndPtr = NULL;
+ parser->m_eventPtr = eventEndPtr = NULL;
parser->m_processor = errorProcessor;
return XML_STATUS_ERROR;
}
parser->m_errorCode = parser->m_processor(parser, s, parseEndPtr = s + len, &end);
if (parser->m_errorCode != XML_ERROR_NONE) {
- eventEndPtr = eventPtr;
+ eventEndPtr = parser->m_eventPtr;
parser->m_processor = errorProcessor;
return XML_STATUS_ERROR;
}
}
if (temp == NULL) {
parser->m_errorCode = XML_ERROR_NO_MEMORY;
- eventPtr = eventEndPtr = NULL;
+ parser->m_eventPtr = eventEndPtr = NULL;
parser->m_processor = errorProcessor;
return XML_STATUS_ERROR;
}
bufferEnd = buffer + nLeftOver;
positionPtr = bufferPtr;
parseEndPtr = bufferEnd;
- eventPtr = bufferPtr;
+ parser->m_eventPtr = bufferPtr;
eventEndPtr = bufferPtr;
return result;
}
parser->m_errorCode = parser->m_processor(parser, start, parseEndPtr, &bufferPtr);
if (parser->m_errorCode != XML_ERROR_NONE) {
- eventEndPtr = eventPtr;
+ eventEndPtr = parser->m_eventPtr;
parser->m_processor = errorProcessor;
return XML_STATUS_ERROR;
}
bufferPtr = buffer = newBuf;
#endif /* not defined XML_CONTEXT_BYTES */
}
- eventPtr = eventEndPtr = NULL;
+ parser->m_eventPtr = eventEndPtr = NULL;
positionPtr = NULL;
}
return bufferEnd;
parser->m_errorCode = parser->m_processor(parser, bufferPtr, parseEndPtr, &bufferPtr);
if (parser->m_errorCode != XML_ERROR_NONE) {
- eventEndPtr = eventPtr;
+ eventEndPtr = parser->m_eventPtr;
parser->m_processor = errorProcessor;
return XML_STATUS_ERROR;
}
{
if (parser == NULL)
return -1;
- if (eventPtr)
- return (XML_Index)(parseEndByteIndex - (parseEndPtr - eventPtr));
+ if (parser->m_eventPtr)
+ return (XML_Index)(parseEndByteIndex - (parseEndPtr - parser->m_eventPtr));
return -1;
}
{
if (parser == NULL)
return 0;
- if (eventEndPtr && eventPtr)
- return (int)(eventEndPtr - eventPtr);
+ if (eventEndPtr && parser->m_eventPtr)
+ return (int)(eventEndPtr - parser->m_eventPtr);
return 0;
}
#ifdef XML_CONTEXT_BYTES
if (parser == NULL)
return NULL;
- if (eventPtr && buffer) {
+ if (parser->m_eventPtr && buffer) {
if (offset != NULL)
- *offset = (int)(eventPtr - buffer);
+ *offset = (int)(parser->m_eventPtr - buffer);
if (size != NULL)
*size = (int)(bufferEnd - buffer);
return buffer;
{
if (parser == NULL)
return 0;
- if (eventPtr && eventPtr >= positionPtr) {
- XmlUpdatePosition(encoding, positionPtr, eventPtr, &position);
- positionPtr = eventPtr;
+ if (parser->m_eventPtr && parser->m_eventPtr >= positionPtr) {
+ XmlUpdatePosition(encoding, positionPtr, parser->m_eventPtr, &position);
+ positionPtr = parser->m_eventPtr;
}
return position.lineNumber + 1;
}
{
if (parser == NULL)
return 0;
- if (eventPtr && eventPtr >= positionPtr) {
- XmlUpdatePosition(encoding, positionPtr, eventPtr, &position);
- positionPtr = eventPtr;
+ if (parser->m_eventPtr && parser->m_eventPtr >= positionPtr) {
+ XmlUpdatePosition(encoding, positionPtr, parser->m_eventPtr, &position);
+ positionPtr = parser->m_eventPtr;
}
return position.columnNumber;
}
openInternalEntities->internalEventPtr,
openInternalEntities->internalEventEndPtr);
else
- reportDefault(parser, encoding, eventPtr, eventEndPtr);
+ reportDefault(parser, encoding, parser->m_eventPtr, eventEndPtr);
}
}
*endPtr = start;
return XML_ERROR_NONE;
}
- eventPtr = start;
+ parser->m_eventPtr = start;
return XML_ERROR_UNCLOSED_TOKEN;
case XML_TOK_PARTIAL_CHAR:
if (!ps_finalBuffer) {
*endPtr = start;
return XML_ERROR_NONE;
}
- eventPtr = start;
+ parser->m_eventPtr = start;
return XML_ERROR_PARTIAL_CHAR;
}
parser->m_processor = externalEntityInitProcessor3;
{
int tok;
const char *next = start; /* XmlContentTok doesn't always set the last arg */
- eventPtr = start;
+ parser->m_eventPtr = start;
tok = XmlContentTok(encoding, start, end, &next);
eventEndPtr = next;
const char **eventPP;
const char **eventEndPP;
if (enc == encoding) {
- eventPP = &eventPtr;
+ eventPP = &parser->m_eventPtr;
eventEndPP = &eventEndPtr;
}
else {
*/
if ((attId->name)[-1]) {
if (enc == encoding)
- eventPtr = atts[i].name;
+ parser->m_eventPtr = atts[i].name;
return XML_ERROR_DUPLICATE_ATTRIBUTE;
}
(attId->name)[-1] = 1;
const char **eventPP;
const char **eventEndPP;
if (enc == encoding) {
- eventPP = &eventPtr;
+ eventPP = &parser->m_eventPtr;
*eventPP = s;
eventEndPP = &eventEndPtr;
}
const char **eventPP;
const char **eventEndPP;
if (enc == encoding) {
- eventPP = &eventPtr;
+ eventPP = &parser->m_eventPtr;
*eventPP = s;
eventEndPP = &eventEndPtr;
}
encoding,
s,
next,
- &eventPtr,
+ &parser->m_eventPtr,
&version,
&versionend,
&encodingName,
if (newEncoding->minBytesPerChar != encoding->minBytesPerChar
|| (newEncoding->minBytesPerChar == 2 &&
newEncoding != encoding)) {
- eventPtr = encodingName;
+ parser->m_eventPtr = encodingName;
return XML_ERROR_INCORRECT_ENCODING;
}
encoding = newEncoding;
result = handleUnknownEncoding(parser, storedEncName);
poolClear(&temp2Pool);
if (result == XML_ERROR_UNKNOWN_ENCODING)
- eventPtr = encodingName;
+ parser->m_eventPtr = encodingName;
return result;
}
}
int tok;
const char *start = s;
const char *next = start;
- eventPtr = start;
+ parser->m_eventPtr = start;
for (;;) {
tok = XmlPrologTok(encoding, start, end, &next);
return XML_ERROR_SYNTAX;
}
start = next;
- eventPtr = start;
+ parser->m_eventPtr = start;
}
}
enum XML_Content_Quant quant;
if (enc == encoding) {
- eventPP = &eventPtr;
+ eventPP = &parser->m_eventPtr;
eventEndPP = &eventEndPtr;
}
else {
const char **nextPtr)
{
parser->m_processor = epilogProcessor;
- eventPtr = s;
+ parser->m_eventPtr = s;
for (;;) {
const char *next = NULL;
int tok = XmlPrologTok(encoding, s, end, &next);
return XML_ERROR_NO_MEMORY;
break;
case XML_TOK_INVALID:
- eventPtr = next;
+ parser->m_eventPtr = next;
return XML_ERROR_INVALID_TOKEN;
case XML_TOK_PARTIAL:
if (!ps_finalBuffer) {
default:
return XML_ERROR_JUNK_AFTER_DOC_ELEMENT;
}
- eventPtr = s = next;
+ parser->m_eventPtr = s = next;
switch (ps_parsing) {
case XML_SUSPENDED:
*nextPtr = next;
return XML_ERROR_NONE;
case XML_TOK_INVALID:
if (enc == encoding)
- eventPtr = next;
+ parser->m_eventPtr = next;
return XML_ERROR_INVALID_TOKEN;
case XML_TOK_PARTIAL:
if (enc == encoding)
- eventPtr = ptr;
+ parser->m_eventPtr = ptr;
return XML_ERROR_INVALID_TOKEN;
case XML_TOK_CHAR_REF:
{
int n = XmlCharRefNumber(enc, ptr);
if (n < 0) {
if (enc == encoding)
- eventPtr = ptr;
+ parser->m_eventPtr = ptr;
return XML_ERROR_BAD_CHAR_REF;
}
if (!isCdata
* we keep the line and merely exclude it from coverage
* tests.
*/
- eventPtr = ptr; /* LCOV_EXCL_LINE */
+ parser->m_eventPtr = ptr; /* LCOV_EXCL_LINE */
}
return XML_ERROR_RECURSIVE_ENTITY_REF;
}
if (entity->notation) {
if (enc == encoding)
- eventPtr = ptr;
+ parser->m_eventPtr = ptr;
return XML_ERROR_BINARY_ENTITY_REF;
}
if (!entity->textPtr) {
if (enc == encoding)
- eventPtr = ptr;
+ parser->m_eventPtr = ptr;
return XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF;
}
else {
* LCOV_EXCL_START
*/
if (enc == encoding)
- eventPtr = ptr;
+ parser->m_eventPtr = ptr;
return XML_ERROR_UNEXPECTED_STATE;
/* LCOV_EXCL_STOP */
}
}
if (entity->open) {
if (enc == encoding)
- eventPtr = entityTextPtr;
+ parser->m_eventPtr = entityTextPtr;
result = XML_ERROR_RECURSIVE_ENTITY_REF;
goto endEntityValue;
}
#endif /* XML_DTD */
/* In the internal subset, PE references are not legal
within markup declarations, e.g entity values in this case. */
- eventPtr = entityTextPtr;
+ parser->m_eventPtr = entityTextPtr;
result = XML_ERROR_PARAM_ENTITY_REF;
goto endEntityValue;
case XML_TOK_NONE:
int n = XmlCharRefNumber(enc, entityTextPtr);
if (n < 0) {
if (enc == encoding)
- eventPtr = entityTextPtr;
+ parser->m_eventPtr = entityTextPtr;
result = XML_ERROR_BAD_CHAR_REF;
goto endEntityValue;
}
break;
case XML_TOK_PARTIAL:
if (enc == encoding)
- eventPtr = entityTextPtr;
+ parser->m_eventPtr = entityTextPtr;
result = XML_ERROR_INVALID_TOKEN;
goto endEntityValue;
case XML_TOK_INVALID:
if (enc == encoding)
- eventPtr = next;
+ parser->m_eventPtr = next;
result = XML_ERROR_INVALID_TOKEN;
goto endEntityValue;
default:
* LCOV_EXCL_START
*/
if (enc == encoding)
- eventPtr = entityTextPtr;
+ parser->m_eventPtr = entityTextPtr;
result = XML_ERROR_UNEXPECTED_STATE;
goto endEntityValue;
/* LCOV_EXCL_STOP */
const char **eventPP;
const char **eventEndPP;
if (enc == encoding) {
- eventPP = &eventPtr;
+ eventPP = &parser->m_eventPtr;
eventEndPP = &eventEndPtr;
}
else {