Fix compiler warnings
authorVictor Stinner <victor.stinner@haypocalc.com>
Tue, 22 Nov 2011 01:30:47 +0000 (02:30 +0100)
committerVictor Stinner <victor.stinner@haypocalc.com>
Tue, 22 Nov 2011 01:30:47 +0000 (02:30 +0100)
Modules/_io/textio.c
Modules/posixmodule.c
Objects/unicodeobject.c

index 07dad3a8ba1eb1beb66ca28fa139fd44fe3665a4..890a356cc03bbb04636d3ae80bd91f78679ee1b2 100644 (file)
@@ -1431,7 +1431,7 @@ textiowrapper_read_chunk(textio *self, Py_ssize_t size_hint)
 
     /* Read a chunk, decode it, and put the result in self._decoded_chars. */
     if (size_hint > 0) {
-        size_hint = Py_MAX(self->b2cratio, 1.0) * size_hint;
+        size_hint = (Py_ssize_t)(Py_MAX(self->b2cratio, 1.0) * size_hint);
     }
     chunk_size = PyLong_FromSsize_t(Py_MAX(self->chunk_size, size_hint));
     if (chunk_size == NULL)
index 975cd9afb82875e3c2a47a5d95ed7334821da06a..fe924915ee74a4bbbc94ac64a6d13a0474b2638a 100644 (file)
@@ -7756,9 +7756,9 @@ posix_putenv(PyObject *self, PyObject *args)
     PyObject *os1, *os2;
     char *s1, *s2;
     char *newenv;
+    size_t len;
 #endif
     PyObject *newstr = NULL;
-    size_t len;
 
 #ifdef MS_WINDOWS
     if (!PyArg_ParseTuple(args,
index 16db801b5c3a8a5fcc8618d6828c798b7709d294..e7155677600cfd6c2fc285a9b0502a5d0e43ab35 100644 (file)
@@ -4330,7 +4330,8 @@ static int
 refit_partial_string(PyObject **unicode, int kind, void *data, Py_ssize_t n)
 {
     PyObject *tmp;
-    Py_ssize_t k, maxchar;
+    Py_ssize_t k;
+    Py_UCS4 maxchar;
     for (k = 0, maxchar = 0; k < n; k++)
         maxchar = Py_MAX(maxchar, PyUnicode_READ(kind, data, k));
     tmp = PyUnicode_New(PyUnicode_GET_LENGTH(*unicode), maxchar);