Mercurial > cpython-lru_cache-weakref
diff Objects/bytesobject.c @ 64045:de46e4250431 3.1
Merged revisions 84070,84074 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84070 | antoine.pitrou | 2010-08-15 19:12:55 +0200 (dim., 15 août 2010) | 5 lines
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.
........
r84074 | antoine.pitrou | 2010-08-15 19:41:31 +0200 (dim., 15 août 2010) | 3 lines
Fix (harmless) warning with MSVC.
........
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Sun, 15 Aug 2010 17:46:50 +0000 |
| parents | 001529d647fe |
| children | 45b23f3f7f6b |
line wrap: on
line diff
--- a/Objects/bytesobject.c Sun Aug 15 17:40:03 2010 +0000 +++ b/Objects/bytesobject.c Sun Aug 15 17:46:50 2010 +0000 @@ -791,7 +791,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; @@ -805,7 +805,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 * @@ -1980,7 +1980,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; @@ -3039,7 +3039,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);