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

vstinner · vstinner · commit 98ea54c35c37 · 2014-08-15T23:30:40.000+02:00
warnings in the Python/ subdirectory.
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
@@ -581,7 +581,7 @@ source_as_string(PyObject *cmd, char *funcname, char *what, PyCompilerFlags *cf)
         return NULL;
     }
 
-    if (strlen(str) != size) {
+    if (strlen(str) != (size_t)size) {
         PyErr_SetString(PyExc_TypeError,
                         "source code string cannot contain null bytes");
         return NULL;
diff --git a/Python/getargs.c b/Python/getargs.c
@@ -872,7 +872,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
             STORE_SIZE(count);
             format++;
         } else {
-            if (strlen(*p) != count)
+            if (strlen(*p) != (size_t)count)
                 return converterr(
                     "bytes without null bytes",
                     arg, msgbuf, bufsize);
@@ -994,7 +994,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
                 *p = PyUnicode_AsUnicodeAndSize(arg, &len);
                 if (*p == NULL)
                     RETURN_ERR_OCCURRED;
-                if (Py_UNICODE_strlen(*p) != len)
+                if (Py_UNICODE_strlen(*p) != (size_t)len)
                     return converterr(
                         "str without null characters or None",
                         arg, msgbuf, bufsize);
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -1738,7 +1738,7 @@ print_error_text(PyObject *f, int offset, PyObject *text_obj)
         return;
 
     if (offset >= 0) {
-        if (offset > 0 && offset == strlen(text) && text[offset - 1] == '\n')
+        if (offset > 0 && (size_t)offset == strlen(text) && text[offset - 1] == '\n')
             offset--;
         for (;;) {
             nl = strchr(text, '\n');
diff --git a/Python/thread.c b/Python/thread.c
@@ -431,7 +431,7 @@ PyThread_GetInfo(void)
      && defined(_CS_GNU_LIBPTHREAD_VERSION))
     value = NULL;
     len = confstr(_CS_GNU_LIBPTHREAD_VERSION, buffer, sizeof(buffer));
-    if (1 < len && len < sizeof(buffer)) {
+    if (1 < len && (size_t)len < sizeof(buffer)) {
         value = PyUnicode_DecodeFSDefaultAndSize(buffer, len-1);
         if (value == NULL)
             PyErr_Clear();
diff --git a/Python/traceback.c b/Python/traceback.c
@@ -198,7 +198,7 @@ _Py_FindSourceFile(PyObject *filename, char* namebuf, size_t namelen, PyObject *
         }
         strcpy(namebuf, PyBytes_AS_STRING(path));
         Py_DECREF(path);
-        if (strlen(namebuf) != len)
+        if (strlen(namebuf) != (size_t)len)
             continue; /* v contains '\0' */
         if (len > 0 && namebuf[len-1] != SEP)
             namebuf[len++] = SEP;

Original file line number	Diff line number	Diff line change
`@@ -581,7 +581,7 @@ source_as_string(PyObject cmd, char funcname, char what, PyCompilerFlags cf)`
`581`	`581`	`return NULL;`
`582`	`582`	`}`
`583`	`583`
`584`		`- if (strlen(str) != size) {`
	`584`	`+ if (strlen(str) != (size_t)size) {`
`585`	`585`	`PyErr_SetString(PyExc_TypeError,`
`586`	`586`	`"source code string cannot contain null bytes");`
`587`	`587`	`return NULL;`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ _Py_FindSourceFile(PyObject filename, char namebuf, size_t namelen, PyObject *`
`198`	`198`	`}`
`199`	`199`	`strcpy(namebuf, PyBytes_AS_STRING(path));`
`200`	`200`	`Py_DECREF(path);`
`201`		`- if (strlen(namebuf) != len)`
	`201`	`+ if (strlen(namebuf) != (size_t)len)`
`202`	`202`	`continue; /* v contains '\0' */`
`203`	`203`	`if (len > 0 && namebuf[len-1] != SEP)`
`204`	`204`	`namebuf[len++] = SEP;`