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

Fix unused variable and signed/unsigned warnings (GH-15537)

This commit is contained in:
Raymond Hettinger 2019-08-27 09:55:13 -07:00 committed by GitHub
parent 8bf5fef873
commit 0138c4ceab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Objects/unicodeobject.c
View File

@ -500,10 +500,14 @@ _PyUnicode_CheckConsistency(PyObject *op, int check_content)
} }
else { else {
PyCompactUnicodeObject *compact = (PyCompactUnicodeObject *)op; PyCompactUnicodeObject *compact = (PyCompactUnicodeObject *)op;
#ifndef NDEBUG
void *data; void *data;
#endif
if (ascii->state.compact == 1) { if (ascii->state.compact == 1) {
#ifndef NDEBUG
data = compact + 1; data = compact + 1;
#endif
_PyObject_ASSERT(op, kind == PyUnicode_1BYTE_KIND _PyObject_ASSERT(op, kind == PyUnicode_1BYTE_KIND
|| kind == PyUnicode_2BYTE_KIND || kind == PyUnicode_2BYTE_KIND
|| kind == PyUnicode_4BYTE_KIND); || kind == PyUnicode_4BYTE_KIND);
@ -512,9 +516,11 @@ _PyUnicode_CheckConsistency(PyObject *op, int check_content)
_PyObject_ASSERT(op, compact->utf8 != data); _PyObject_ASSERT(op, compact->utf8 != data);
} }
else { else {
#ifndef NDEBUG
PyUnicodeObject *unicode = (PyUnicodeObject *)op; PyUnicodeObject *unicode = (PyUnicodeObject *)op;
data = unicode->data.any; data = unicode->data.any;
#endif
if (kind == PyUnicode_WCHAR_KIND) { if (kind == PyUnicode_WCHAR_KIND) {
_PyObject_ASSERT(op, ascii->length == 0); _PyObject_ASSERT(op, ascii->length == 0);
_PyObject_ASSERT(op, ascii->hash == -1); _PyObject_ASSERT(op, ascii->hash == -1);

4
Python/peephole.c
View File

@ -255,8 +255,8 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names,
than +255 (encoded as multiple bytes), just to keep the peephole optimizer than +255 (encoded as multiple bytes), just to keep the peephole optimizer
simple. The optimizer leaves line number deltas unchanged. */ simple. The optimizer leaves line number deltas unchanged. */
for (j = 0; j < tabsiz; j += 2) { for (i = 0; i < tabsiz; i += 2) {
if (lnotab[j] == 255) { if (lnotab[i] == 255) {
goto exitUnchanged; goto exitUnchanged;
} }
} }

2
Python/pystrhex.c
View File

@ -57,7 +57,7 @@ static PyObject *_Py_strhex_impl(const char* argbuf, const Py_ssize_t arglen,
} }
resultlen += arglen * 2; resultlen += arglen * 2;
if (abs_bytes_per_sep >= arglen) { if ((size_t)abs_bytes_per_sep >= (size_t)arglen) {
bytes_per_sep_group = 0; bytes_per_sep_group = 0;
abs_bytes_per_sep = 0; abs_bytes_per_sep = 0;
} }