Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
........
This commit is contained in:
Antoine Pitrou 2010-08-15 17:46:50 +00:00
parent 00d5f35b85
commit bc760d9f45
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Objects/bytearrayobject.c
View File

@ -1215,7 +1215,7 @@ bytearray_contains(PyObject *self, PyObject *arg)
Py_ssize_t ival = PyNumber_AsSsize_t(arg, PyExc_ValueError); Py_ssize_t ival = PyNumber_AsSsize_t(arg, PyExc_ValueError);
if (ival == -1 && PyErr_Occurred()) { if (ival == -1 && PyErr_Occurred()) {
Py_buffer varg; Py_buffer varg;
int pos; Py_ssize_t pos;
PyErr_Clear(); PyErr_Clear();
if (_getbuffer(arg, &varg) < 0) if (_getbuffer(arg, &varg) < 0)
return -1; return -1;
@ -1229,7 +1229,7 @@ bytearray_contains(PyObject *self, PyObject *arg)
return -1; return -1;
} }
return memchr(PyByteArray_AS_STRING(self), ival, Py_SIZE(self)) != NULL; return memchr(PyByteArray_AS_STRING(self), (int) ival, Py_SIZE(self)) != NULL;
} }

2
Objects/bytes_methods.c
View File

@ -417,7 +417,7 @@ _Py_bytes_maketrans(PyObject *args)
} }
p = PyBytes_AS_STRING(res); p = PyBytes_AS_STRING(res);
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++)
p[i] = i; p[i] = (char) i;
for (i = 0; i < bfrm.len; i++) { for (i = 0; i < bfrm.len; i++) {
p[((unsigned char *)bfrm.buf)[i]] = ((char *)bto.buf)[i]; p[((unsigned char *)bfrm.buf)[i]] = ((char *)bto.buf)[i];
} }

8
Objects/bytesobject.c
View File

@ -791,7 +791,7 @@ bytes_contains(PyObject *self, PyObject *arg)
Py_ssize_t ival = PyNumber_AsSsize_t(arg, PyExc_ValueError); Py_ssize_t ival = PyNumber_AsSsize_t(arg, PyExc_ValueError);
if (ival == -1 && PyErr_Occurred()) { if (ival == -1 && PyErr_Occurred()) {
Py_buffer varg; Py_buffer varg;
int pos; Py_ssize_t pos;
PyErr_Clear(); PyErr_Clear();
if (_getbuffer(arg, &varg) < 0) if (_getbuffer(arg, &varg) < 0)
return -1; return -1;
@ -805,7 +805,7 @@ bytes_contains(PyObject *self, PyObject *arg)
return -1; 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 * static PyObject *
@ -1980,7 +1980,7 @@ return_self(PyBytesObject *self)
} }
Py_LOCAL_INLINE(Py_ssize_t) 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; Py_ssize_t count=0;
const char *start=target; const char *start=target;
@ -3039,7 +3039,7 @@ PyBytes_FromObject(PyObject *x)
if (_PyBytes_Resize(&new, size) < 0) if (_PyBytes_Resize(&new, size) < 0)
goto error; goto error;
} }
((PyBytesObject *)new)->ob_sval[i] = value; ((PyBytesObject *)new)->ob_sval[i] = (char) value;
} }
_PyBytes_Resize(&new, i); _PyBytes_Resize(&new, i);