]> granicus.if.org Git - libexpat/commitdiff
Re-add int casts dropped at 3960f6061ac4a7a54d96153613b10efc072a6eee (#170)
authorSebastian Pipping <sebastian@pipping.org>
Mon, 6 Aug 2018 18:45:36 +0000 (20:45 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Mon, 6 Aug 2018 21:05:23 +0000 (23:05 +0200)
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

index ae89c866bb62eedeacddb10c067437e6cec9b368..9d7c96e8d77ed6957b602ccef0cc8590b1c0ecc0 100644 (file)
@@ -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],