Issue #22156: Fix some "comparison between signed and unsigned integers"

vstinner · vstinner · commit 706768c687f5 · 2014-08-16T01:03:39.000+02:00
compiler warnings in the Modules/ subdirectory.
diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c
@@ -188,7 +188,7 @@ compress(BZ2Compressor *c, char *data, size_t len, int action)
         if (action == BZ_FINISH && bzerror == BZ_STREAM_END)
             break;
     }
-    if (data_size != PyBytes_GET_SIZE(result))
+    if (data_size != (size_t)PyBytes_GET_SIZE(result))
         if (_PyBytes_Resize(&result, data_size) < 0)
             goto error;
     return result;
@@ -457,7 +457,7 @@ decompress(BZ2Decompressor *d, char *data, size_t len)
             d->bzs.avail_out = (unsigned int)Py_MIN(buffer_left, UINT_MAX);
         }
     }
-    if (data_size != PyBytes_GET_SIZE(result))
+    if (data_size != (size_t)PyBytes_GET_SIZE(result))
         if (_PyBytes_Resize(&result, data_size) < 0)
             goto error;
     return result;
diff --git a/Modules/_csv.c b/Modules/_csv.c
@@ -290,7 +290,7 @@ dialect_check_quoting(int quoting)
     StyleDesc *qs;
 
     for (qs = quote_styles; qs->name; qs++) {
-        if (qs->style == quoting)
+        if ((int)qs->style == quoting)
             return 0;
     }
     PyErr_Format(PyExc_TypeError, "bad \"quoting\" value");
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
@@ -1606,7 +1606,7 @@ resize(PyObject *self, PyObject *args)
                      "Memory cannot be resized because this object doesn't own it");
         return NULL;
     }
-    if (size <= sizeof(obj->b_value)) {
+    if ((size_t)size <= sizeof(obj->b_value)) {
         /* internal default buffer is large enough */
         obj->b_size = size;
         goto done;
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
@@ -3741,7 +3741,7 @@ PyInit__elementtree(void)
     if (expat_capi) {
         /* check that it's usable */
         if (strcmp(expat_capi->magic, PyExpat_CAPI_MAGIC) != 0 ||
-            expat_capi->size < sizeof(struct PyExpat_CAPI) ||
+            (size_t)expat_capi->size < sizeof(struct PyExpat_CAPI) ||
             expat_capi->MAJOR_VERSION != XML_MAJOR_VERSION ||
             expat_capi->MINOR_VERSION != XML_MINOR_VERSION ||
             expat_capi->MICRO_VERSION != XML_MICRO_VERSION) {
diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
@@ -53,18 +53,20 @@ unshare(bytesio *self, size_t preferred_size, int truncate)
         Py_ssize_t copy_size;
         char *new_buf;
 
-        if((! truncate) && preferred_size < self->string_size) {
+        if((! truncate) && preferred_size < (size_t)self->string_size) {
             preferred_size = self->string_size;
         }
 
+        /* PyMem_Malloc() returns NULL if preferred_size is bigger
+           than PY_SSIZE_T_MAX */
         new_buf = (char *)PyMem_Malloc(preferred_size);
         if (new_buf == NULL) {
             PyErr_NoMemory();
             return -1;
         }
 
         copy_size = self->string_size;
-        if (copy_size > preferred_size) {
+        if ((size_t)copy_size > preferred_size) {
             copy_size = preferred_size;
         }
 
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
@@ -1730,7 +1730,7 @@ _PyIO_find_line_ending(
     else {
         /* Non-universal mode. */
         Py_ssize_t readnl_len = PyUnicode_GET_LENGTH(readnl);
-        char *nl = PyUnicode_DATA(readnl);
+        Py_UCS1 *nl = PyUnicode_1BYTE_DATA(readnl);
         /* Assume that readnl is an ASCII character. */
         assert(PyUnicode_KIND(readnl) == PyUnicode_1BYTE_KIND);
         if (readnl_len == 1) {
diff --git a/Modules/_sre.c b/Modules/_sre.c
@@ -1236,7 +1236,7 @@ pattern_repr(PatternObject *obj)
     };
     PyObject *result = NULL;
     PyObject *flag_items;
-    int i;
+    size_t i;
     int flags = obj->flags;
 
     /* Omit re.UNICODE for valid string patterns. */
diff --git a/Modules/_struct.c b/Modules/_struct.c
@@ -1263,7 +1263,8 @@ prepare_s(PyStructObject *self)
     const char *s;
     const char *fmt;
     char c;
-    Py_ssize_t size, len, ncodes, num, itemsize;
+    Py_ssize_t size, len, num, itemsize;
+    size_t ncodes;
 
     fmt = PyBytes_AS_STRING(self->s_format);
 
@@ -1319,7 +1320,7 @@ prepare_s(PyStructObject *self)
     }
 
     /* check for overflow */
-    if ((ncodes + 1) > (PY_SSIZE_T_MAX / sizeof(formatcode))) {
+    if ((ncodes + 1) > ((size_t)PY_SSIZE_T_MAX / sizeof(formatcode))) {
         PyErr_NoMemory();
         return -1;
     }
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
@@ -1719,7 +1719,7 @@ test_long_numbits(PyObject *self)
              {-0xffffL, 16, -1},
              {0xfffffffL, 28, 1},
              {-0xfffffffL, 28, -1}};
-    int i;
+    size_t i;
 
     for (i = 0; i < Py_ARRAY_LENGTH(testcases); ++i) {
         size_t nbits;
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
@@ -1414,7 +1414,7 @@ varname_converter(PyObject *in, void *_out)
             return 0;
         }
         s = PyBytes_AsString(in);
-        if (strlen(s) != PyBytes_Size(in)) {
+        if (strlen(s) != (size_t)PyBytes_Size(in)) {
             PyErr_SetString(PyExc_ValueError, "null byte in bytes object");
             return 0;
         }
@@ -1431,7 +1431,7 @@ varname_converter(PyObject *in, void *_out)
             PyErr_SetString(PyExc_OverflowError, "string is too long");
             return 0;
         }
-        if (strlen(s) != size) {
+        if (strlen(s) != (size_t)size) {
             PyErr_SetString(PyExc_ValueError, "null character in string");
             return 0;
         }
diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c
@@ -79,7 +79,7 @@ typedef struct {
         (sizeof(traceback_t) + sizeof(frame_t) * (NFRAME - 1))
 
 #define MAX_NFRAME \
-        ((INT_MAX - sizeof(traceback_t)) / sizeof(frame_t) + 1)
+        (((size_t)INT_MAX - sizeof(traceback_t)) / sizeof(frame_t) + 1)
 
 static PyObject *unknown_filename = NULL;
 static traceback_t tracemalloc_empty_traceback;
@@ -874,7 +874,7 @@ tracemalloc_start(int max_nframe)
         return 0;
     }
 
-    assert(1 <= max_nframe && max_nframe <= MAX_NFRAME);
+    assert(1 <= max_nframe && (size_t)max_nframe <= MAX_NFRAME);
     tracemalloc_config.max_nframe = max_nframe;
 
     /* allocate a buffer to store a new traceback */
@@ -1226,7 +1226,7 @@ py_tracemalloc_start(PyObject *self, PyObject *args)
     if (!PyArg_ParseTuple(args, "|n:start", &nframe))
         return NULL;
 
-    if (nframe < 1 || nframe > MAX_NFRAME) {
+    if (nframe < 1 || (size_t)nframe > MAX_NFRAME) {
         PyErr_Format(PyExc_ValueError,
                      "the number of frames must be in range [1; %i]",
                      (int)MAX_NFRAME);
@@ -1388,7 +1388,7 @@ parse_sys_xoptions(PyObject *value)
     if (nframe == -1 && PyErr_Occurred())
         return -1;
 
-    if (nframe < 1 || nframe > MAX_NFRAME)
+    if (nframe < 1 || (size_t)nframe > MAX_NFRAME)
         return -1;
 
     return Py_SAFE_DOWNCAST(nframe, long, int);
@@ -1412,7 +1412,7 @@ _PyTraceMalloc_Init(void)
         value = strtol(p, &endptr, 10);
         if (*endptr != '\0'
             || value < 1
-            || value > MAX_NFRAME
+            || (size_t)value > MAX_NFRAME
             || errno == ERANGE)
         {
             Py_FatalError("PYTHONTRACEMALLOC: invalid number of frames");
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
@@ -2000,7 +2000,7 @@ array_reconstructor(PyObject *self, PyObject *args)
          */
         for (descr = descriptors; descr->typecode != '\0'; descr++) {
             if (descr->is_integer_type &&
-                descr->itemsize == mf_descr.size &&
+                (size_t)descr->itemsize == mf_descr.size &&
                 descr->is_signed == mf_descr.is_signed)
                 typecode = descr->typecode;
         }
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -902,7 +902,7 @@ path_converter(PyObject *o, void *p) {
 #endif
 
     narrow = PyBytes_AS_STRING(bytes);
-    if (length != strlen(narrow)) {
+    if ((size_t)length != strlen(narrow)) {
         FORMAT_EXCEPTION(PyExc_ValueError, "embedded NUL character in %s");
         Py_DECREF(bytes);
         return 0;

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ compress(BZ2Compressor c, char data, size_t len, int action)`
`188`	`188`	`if (action == BZ_FINISH && bzerror == BZ_STREAM_END)`
`189`	`189`	`break;`
`190`	`190`	`}`
`191`		`- if (data_size != PyBytes_GET_SIZE(result))`
	`191`	`+ if (data_size != (size_t)PyBytes_GET_SIZE(result))`
`192`	`192`	`if (_PyBytes_Resize(&result, data_size) < 0)`
`193`	`193`	`goto error;`
`194`	`194`	`return result;`
`@@ -457,7 +457,7 @@ decompress(BZ2Decompressor d, char data, size_t len)`
`457`	`457`	`d->bzs.avail_out = (unsigned int)Py_MIN(buffer_left, UINT_MAX);`
`458`	`458`	`}`
`459`	`459`	`}`
`460`		`- if (data_size != PyBytes_GET_SIZE(result))`
	`460`	`+ if (data_size != (size_t)PyBytes_GET_SIZE(result))`
`461`	`461`	`if (_PyBytes_Resize(&result, data_size) < 0)`
`462`	`462`	`goto error;`
`463`	`463`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ dialect_check_quoting(int quoting)`
`290`	`290`	`StyleDesc *qs;`
`291`	`291`
`292`	`292`	`for (qs = quote_styles; qs->name; qs++) {`
`293`		`- if (qs->style == quoting)`
	`293`	`+ if ((int)qs->style == quoting)`
`294`	`294`	`return 0;`
`295`	`295`	`}`
`296`	`296`	`PyErr_Format(PyExc_TypeError, "bad \"quoting\" value");`
Original file line number	Diff line number	Diff line change
`@@ -1606,7 +1606,7 @@ resize(PyObject self, PyObject args)`
`1606`	`1606`	`"Memory cannot be resized because this object doesn't own it");`
`1607`	`1607`	`return NULL;`
`1608`	`1608`	`}`
`1609`		`- if (size <= sizeof(obj->b_value)) {`
	`1609`	`+ if ((size_t)size <= sizeof(obj->b_value)) {`
`1610`	`1610`	`/* internal default buffer is large enough */`
`1611`	`1611`	`obj->b_size = size;`
`1612`	`1612`	`goto done;`
Original file line number	Diff line number	Diff line change
`@@ -53,18 +53,20 @@ unshare(bytesio *self, size_t preferred_size, int truncate)`
`53`	`53`	`Py_ssize_t copy_size;`
`54`	`54`	`char *new_buf;`
`55`	`55`
`56`		`- if((! truncate) && preferred_size < self->string_size) {`
	`56`	`+ if((! truncate) && preferred_size < (size_t)self->string_size) {`
`57`	`57`	`preferred_size = self->string_size;`
`58`	`58`	`}`
`59`	`59`
	`60`	`+ /* PyMem_Malloc() returns NULL if preferred_size is bigger`
	`61`	`+ than PY_SSIZE_T_MAX */`
`60`	`62`	`new_buf = (char *)PyMem_Malloc(preferred_size);`
`61`	`63`	`if (new_buf == NULL) {`
`62`	`64`	`PyErr_NoMemory();`
`63`	`65`	`return -1;`
`64`	`66`	`}`
`65`	`67`
`66`	`68`	`copy_size = self->string_size;`
`67`		`- if (copy_size > preferred_size) {`
	`69`	`+ if ((size_t)copy_size > preferred_size) {`
`68`	`70`	`copy_size = preferred_size;`
`69`	`71`	`}`
`70`	`72`
Original file line number	Diff line number	Diff line change
`@@ -1414,7 +1414,7 @@ varname_converter(PyObject in, void _out)`
`1414`	`1414`	`return 0;`
`1415`	`1415`	`}`
`1416`	`1416`	`s = PyBytes_AsString(in);`
`1417`		`- if (strlen(s) != PyBytes_Size(in)) {`
	`1417`	`+ if (strlen(s) != (size_t)PyBytes_Size(in)) {`
`1418`	`1418`	`PyErr_SetString(PyExc_ValueError, "null byte in bytes object");`
`1419`	`1419`	`return 0;`
`1420`	`1420`	`}`
`@@ -1431,7 +1431,7 @@ varname_converter(PyObject in, void _out)`
`1431`	`1431`	`PyErr_SetString(PyExc_OverflowError, "string is too long");`
`1432`	`1432`	`return 0;`
`1433`	`1433`	`}`
`1434`		`- if (strlen(s) != size) {`
	`1434`	`+ if (strlen(s) != (size_t)size) {`
`1435`	`1435`	`PyErr_SetString(PyExc_ValueError, "null character in string");`
`1436`	`1436`	`return 0;`
`1437`	`1437`	`}`