traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

warnings in the Python/ subdirectory.
This commit is contained in:
Victor Stinner 2014-08-15 23:30:40 +02:00
parent eae94706a3
commit 98ea54c35c
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Python/bltinmodule.c
View File

@ -581,7 +581,7 @@ source_as_string(PyObject *cmd, char *funcname, char *what, PyCompilerFlags *cf)
return NULL; return NULL;
} }
if (strlen(str) != size) { if (strlen(str) != (size_t)size) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"source code string cannot contain null bytes"); "source code string cannot contain null bytes");
return NULL; return NULL;

4
Python/getargs.c
View File

@ -872,7 +872,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
STORE_SIZE(count); STORE_SIZE(count);
format++; format++;
} else { } else {
if (strlen(*p) != count) if (strlen(*p) != (size_t)count)
return converterr( return converterr(
"bytes without null bytes", "bytes without null bytes",
arg, msgbuf, bufsize); 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); *p = PyUnicode_AsUnicodeAndSize(arg, &len);
if (*p == NULL) if (*p == NULL)
RETURN_ERR_OCCURRED; RETURN_ERR_OCCURRED;
if (Py_UNICODE_strlen(*p) != len) if (Py_UNICODE_strlen(*p) != (size_t)len)
return converterr( return converterr(
"str without null characters or None", "str without null characters or None",
arg, msgbuf, bufsize); arg, msgbuf, bufsize);

2
Python/pythonrun.c
View File

@ -1738,7 +1738,7 @@ print_error_text(PyObject *f, int offset, PyObject *text_obj)
return; return;
if (offset >= 0) { 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--; offset--;
for (;;) { for (;;) {
nl = strchr(text, '\n'); nl = strchr(text, '\n');

2
Python/thread.c
View File

@ -431,7 +431,7 @@ PyThread_GetInfo(void)
&& defined(_CS_GNU_LIBPTHREAD_VERSION)) && defined(_CS_GNU_LIBPTHREAD_VERSION))
value = NULL; value = NULL;
len = confstr(_CS_GNU_LIBPTHREAD_VERSION, buffer, sizeof(buffer)); 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); value = PyUnicode_DecodeFSDefaultAndSize(buffer, len-1);
if (value == NULL) if (value == NULL)
PyErr_Clear(); PyErr_Clear();

2
Python/traceback.c
View File

@ -198,7 +198,7 @@ _Py_FindSourceFile(PyObject *filename, char* namebuf, size_t namelen, PyObject *
} }
strcpy(namebuf, PyBytes_AS_STRING(path)); strcpy(namebuf, PyBytes_AS_STRING(path));
Py_DECREF(path); Py_DECREF(path);
if (strlen(namebuf) != len) if (strlen(namebuf) != (size_t)len)
continue; /* v contains '\0' */ continue; /* v contains '\0' */
if (len > 0 && namebuf[len-1] != SEP) if (len > 0 && namebuf[len-1] != SEP)
namebuf[len++] = SEP; namebuf[len++] = SEP;