diff options
| -rw-r--r-- | Objects/bytearrayobject.c | 4 | ||||
| -rw-r--r-- | Objects/bytes_methods.c | 2 | ||||
| -rw-r--r-- | Objects/bytesobject.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index 4878d83..670f589 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -1215,7 +1215,7 @@ bytearray_contains(PyObject *self, PyObject *arg) 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; @@ -1229,7 +1229,7 @@ bytearray_contains(PyObject *self, PyObject *arg) 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; } diff --git a/Objects/bytes_methods.c b/Objects/bytes_methods.c index 099cee6..ef91b7f 100644 --- a/Objects/bytes_methods.c +++ b/Objects/bytes_methods.c @@ -417,7 +417,7 @@ _Py_bytes_maketrans(PyObject *args) } p = PyBytes_AS_STRING(res); for (i = 0; i < 256; i++) - p[i] = i; + p[i] = (char) i; for (i = 0; i < bfrm.len; i++) { p[((unsigned char *)bfrm.buf)[i]] = ((char *)bto.buf)[i]; } diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index 0f7e7d3..e580884 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -791,7 +791,7 @@ bytes_contains(PyObject *self, PyObject *arg) 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 @@ bytes_contains(PyObject *self, PyObject *arg) 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 @@ return_self(PyBytesObject *self) } 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 @@ PyBytes_FromObject(PyObject *x) 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); |