Fix review comments

python · rhettinger · Aug 27, 2019 · Aug 26, 2019 · Aug 26, 2019 · Aug 26, 2019
commit 03c60f55dde934b8b74668dc91b9d0352945b8d3
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -516,9 +516,9 @@ _PyUnicode_CheckConsistency(PyObject *op, int check_content)
             _PyObject_ASSERT(op, compact->utf8 != data);
         }
         else {
+#ifndef NDEBUG
             PyUnicodeObject *unicode = (PyUnicodeObject *)op;
 
-#ifndef NDEBUG
             data = unicode->data.any;
 #endif
             if (kind == PyUnicode_WCHAR_KIND) {

diff --git 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 < (unsigned int) 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
@@ -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 >= (unsigned int) arglen) {
+    if ((size_t)abs_bytes_per_sep >= (size_t)arglen) {
         bytes_per_sep_group = 0;
         abs_bytes_per_sep = 0;
     }