[Python-checkins] Fix unused variable and signed/unsigned warnings (GH-15537)
Raymond Hettinger
webhook-mailer at python.org
Tue Aug 27 12:55:21 EDT 2019
https://github.com/python/cpython/commit/0138c4ceab1e10d42d0aa962d2ae079b46da7671
commit: 0138c4ceab1e10d42d0aa962d2ae079b46da7671
branch: master
author: Raymond Hettinger <rhettinger at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-08-27T09:55:13-07:00
summary:
Fix unused variable and signed/unsigned warnings (GH-15537)
files:
M Objects/unicodeobject.c
M Python/peephole.c
M Python/pystrhex.c
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index aa933773233b..d4b2c93a8452 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -500,10 +500,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);
@@ -512,9 +516,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 3e56e788b007..d859648411fa 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 5dc7c9613796..9d34f71a2e9c 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;
}
More information about the Python-checkins
mailing list