diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2014-08-15 21:30:40 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2014-08-15 21:30:40 (GMT) |
commit | 98ea54c35c37e4f9a7d7a923a7ccd792f4b7ff90 (patch) | |
tree | 126cb038a65e06368c70f900ed90139c0e67a66b | |
parent | eae94706a30c99150982034d644d8b3abf28110b (diff) | |
download | cpython-98ea54c35c37e4f9a7d7a923a7ccd792f4b7ff90.zip cpython-98ea54c35c37e4f9a7d7a923a7ccd792f4b7ff90.tar.gz cpython-98ea54c35c37e4f9a7d7a923a7ccd792f4b7ff90.tar.bz2 |
Issue #22156: Fix "comparison between signed and unsigned integers" compiler
warnings in the Python/ subdirectory.
-rw-r--r-- | Python/bltinmodule.c | 2 | ||||
-rw-r--r-- | Python/getargs.c | 4 | ||||
-rw-r--r-- | Python/pythonrun.c | 2 | ||||
-rw-r--r-- | Python/thread.c | 2 | ||||
-rw-r--r-- | Python/traceback.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index d905ba2..d2d1698 100644 --- 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 index 946faf2..a313269 100644 --- 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 index b2d5464..63d9eeb 100644 --- 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 index d1cb0e6..9eb5d12 100644 --- 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 index 2ece192..565094b 100644 --- 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; |