diff Objects/bytesobject.c @ 64041:9028f23db74b

Fix some compilation warnings under 64-bit Windows (issue #9566). Some of these are genuine bugs with objects bigger than 2GB, but my system doesn't allow me to write tests for it.
author Antoine Pitrou <solipsis@pitrou.net>
date Sun, 15 Aug 2010 17:12:55 +0000
parents 9108e7dcd7d8
children a4cfd5b5df96
line wrap: on
line diff
--- a/Objects/bytesobject.c	Sun Aug 15 16:26:49 2010 +0000
+++ b/Objects/bytesobject.c	Sun Aug 15 17:12:55 2010 +0000
@@ -770,7 +770,7 @@
     Py_ssize_t ival = PyNumber_AsSsize_t(arg, PyExc_ValueError);
     if (ival == -1 && PyErr_Occurred()) {
         Py_buffer varg;
-        int pos;
+        Py_ssize_t pos;
         PyErr_Clear();
         if (_getbuffer(arg, &varg) < 0)
             return -1;
@@ -784,7 +784,7 @@
         return -1;
     }
 
-    return memchr(PyBytes_AS_STRING(self), ival, Py_SIZE(self)) != NULL;
+    return memchr(PyBytes_AS_STRING(self), (int) ival, Py_SIZE(self)) != NULL;
 }
 
 static PyObject *
@@ -1654,7 +1654,7 @@
 }
 
 Py_LOCAL_INLINE(Py_ssize_t)
-countchar(const char *target, int target_len, char c, Py_ssize_t maxcount)
+countchar(const char *target, Py_ssize_t target_len, char c, Py_ssize_t maxcount)
 {
     Py_ssize_t count=0;
     const char *start=target;
@@ -2609,7 +2609,7 @@
                 Py_DECREF(new);
                 return NULL;
             }
-            ((PyBytesObject *)new)->ob_sval[i] = value;
+            ((PyBytesObject *)new)->ob_sval[i] = (char) value;
         }
         return new;
     }
@@ -2630,7 +2630,7 @@
                 Py_DECREF(new);
                 return NULL;
             }
-            ((PyBytesObject *)new)->ob_sval[i] = value;
+            ((PyBytesObject *)new)->ob_sval[i] = (char) value;
         }
         return new;
     }
@@ -2685,7 +2685,7 @@
             if (_PyBytes_Resize(&new, size) < 0)
                 goto error;
         }
-        ((PyBytesObject *)new)->ob_sval[i] = value;
+        ((PyBytesObject *)new)->ob_sval[i] = (char) value;
     }
     _PyBytes_Resize(&new, i);