From 50f4e1695fda3b8b409787de0b35eb920cadfc41 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Mon, 6 Aug 2018 20:45:36 +0200 Subject: [PATCH] Re-add int casts dropped at 3960f6061ac4a7a54d96153613b10efc072a6eee (#170) This is meant to address warning C4244. > C4244: '=' : conversion from '__int64' to 'int', possible loss of data > C4244: 'initializing' : conversion from '__int64' to 'int', possible loss of data --- expat/lib/xmlparse.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index ae89c866..9d7c96e8 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -2044,7 +2044,7 @@ XML_GetBuffer(XML_Parser parser, int len) return NULL; } #ifdef XML_CONTEXT_BYTES - keep = EXPAT_SAFE_PTR_DIFF(parser->m_bufferPtr, parser->m_buffer); + keep = (int)EXPAT_SAFE_PTR_DIFF(parser->m_bufferPtr, parser->m_buffer); if (keep > XML_CONTEXT_BYTES) keep = XML_CONTEXT_BYTES; neededSize += keep; @@ -2070,7 +2070,7 @@ XML_GetBuffer(XML_Parser parser, int len) } else { char *newBuf; - int bufferSize = EXPAT_SAFE_PTR_DIFF(parser->m_bufferLim, parser->m_bufferPtr); + int bufferSize = (int)EXPAT_SAFE_PTR_DIFF(parser->m_bufferLim, parser->m_bufferPtr); if (bufferSize == 0) bufferSize = INIT_BUFFER_SIZE; do { @@ -2089,7 +2089,7 @@ XML_GetBuffer(XML_Parser parser, int len) parser->m_bufferLim = newBuf + bufferSize; #ifdef XML_CONTEXT_BYTES if (parser->m_bufferPtr) { - int keep = EXPAT_SAFE_PTR_DIFF(parser->m_bufferPtr, parser->m_buffer); + int keep = (int)EXPAT_SAFE_PTR_DIFF(parser->m_bufferPtr, parser->m_buffer); if (keep > XML_CONTEXT_BYTES) keep = XML_CONTEXT_BYTES; memcpy(newBuf, &parser->m_bufferPtr[-keep], -- 2.40.0