diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-08-27 17:13:52 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <rhettinger@users.noreply.github.com> | 2019-08-27 17:13:52 (GMT) |
| commit | d5ba8bbdae9a59c10c1275f71415732d68fe9661 (patch) | |
| tree | a1786498e01822ef21d52efd84c131ca902f93c3 | |
| parent | 91020fade6ca0f22eef2d338be1380b17385e715 (diff) | |
| download | cpython-d5ba8bbdae9a59c10c1275f71415732d68fe9661.zip cpython-d5ba8bbdae9a59c10c1275f71415732d68fe9661.tar.gz cpython-d5ba8bbdae9a59c10c1275f71415732d68fe9661.tar.bz2 | |
Fix unused variable and signed/unsigned warnings (GH-15537) (GH-15551)
(cherry picked from commit 0138c4ceab1e10d42d0aa962d2ae079b46da7671)
Co-authored-by: Raymond Hettinger <rhettinger@users.noreply.github.com>
| -rw-r--r-- | Objects/unicodeobject.c | 6 | ||||
| -rw-r--r-- | Python/peephole.c | 4 | ||||
| -rw-r--r-- | Python/pystrhex.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index c28f36f..8521a4c 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -456,10 +456,14 @@ _PyUnicode_CheckConsistency(PyObject *op, int check_content) } else { PyCompactUnicodeObject *compact = (PyCompactUnicodeObject *)op; +#ifndef NDEBUG void *data; +#endif if (ascii->state.compact == 1) { +#ifndef NDEBUG data = compact + 1; +#endif _PyObject_ASSERT(op, kind == PyUnicode_1BYTE_KIND || kind == PyUnicode_2BYTE_KIND || kind == PyUnicode_4BYTE_KIND); @@ -468,9 +472,11 @@ _PyUnicode_CheckConsistency(PyObject *op, int check_content) _PyObject_ASSERT(op, compact->utf8 != data); } else { +#ifndef NDEBUG PyUnicodeObject *unicode = (PyUnicodeObject *)op; data = unicode->data.any; +#endif if (kind == PyUnicode_WCHAR_KIND) { _PyObject_ASSERT(op, ascii->length == 0); _PyObject_ASSERT(op, ascii->hash == -1); diff --git a/Python/peephole.c b/Python/peephole.c index 3e56e78..d859648 100644 --- a/Python/peephole.c +++ b/Python/peephole.c @@ -255,8 +255,8 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names, than +255 (encoded as multiple bytes), just to keep the peephole optimizer simple. The optimizer leaves line number deltas unchanged. */ - for (j = 0; j < tabsiz; j += 2) { - if (lnotab[j] == 255) { + for (i = 0; i < tabsiz; i += 2) { + if (lnotab[i] == 255) { goto exitUnchanged; } } diff --git a/Python/pystrhex.c b/Python/pystrhex.c index 5dc7c96..9d34f71 100644 --- a/Python/pystrhex.c +++ b/Python/pystrhex.c @@ -57,7 +57,7 @@ static PyObject *_Py_strhex_impl(const char* argbuf, const Py_ssize_t arglen, } resultlen += arglen * 2; - if (abs_bytes_per_sep >= arglen) { + if ((size_t)abs_bytes_per_sep >= (size_t)arglen) { bytes_per_sep_group = 0; abs_bytes_per_sep = 0; } |