traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Antoine Pitrou 2010-08-15 17:12:55 +00:00
parent 1d0aaea54a
commit 0010d37a43
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Objects/bytearrayobject.c
View File

@ -1214,7 +1214,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;
@ -1228,7 +1228,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;
} }

12
Objects/bytesobject.c
View File

@ -770,7 +770,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;
@ -784,7 +784,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 *
@ -1654,7 +1654,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;
@ -2609,7 +2609,7 @@ PyBytes_FromObject(PyObject *x)
Py_DECREF(new); Py_DECREF(new);
return NULL; return NULL;
} }
((PyBytesObject *)new)->ob_sval[i] = value; ((PyBytesObject *)new)->ob_sval[i] = (char) value;
} }
return new; return new;
} }
@ -2630,7 +2630,7 @@ PyBytes_FromObject(PyObject *x)
Py_DECREF(new); Py_DECREF(new);
return NULL; return NULL;
} }
((PyBytesObject *)new)->ob_sval[i] = value; ((PyBytesObject *)new)->ob_sval[i] = (char) value;
} }
return new; return new;
} }
@ -2685,7 +2685,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);