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

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

(cherry picked from commit 0138c4ceab)

Co-authored-by: Raymond Hettinger <rhettinger@users.noreply.github.com>
This commit is contained in:
Miss Islington (bot) 2019-08-27 10:13:52 -07:00 committed by Raymond Hettinger
parent 91020fade6
commit d5ba8bbdae
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

@ -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);

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
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;
}
}

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;
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;
}