mirror of https://github.com/python/cpython
fix compiler warnings
This commit is contained in:
parent
3e4caeb3bf
commit
873389dbd8
|
@ -3240,15 +3240,15 @@ count_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
||||||
kwlist, &long_cnt, &long_step))
|
kwlist, &long_cnt, &long_step))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (long_cnt != NULL && !PyNumber_Check(long_cnt) ||
|
if ((long_cnt != NULL && !PyNumber_Check(long_cnt)) ||
|
||||||
long_step != NULL && !PyNumber_Check(long_step)) {
|
(long_step != NULL && !PyNumber_Check(long_step))) {
|
||||||
PyErr_SetString(PyExc_TypeError, "a number is required");
|
PyErr_SetString(PyExc_TypeError, "a number is required");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (long_cnt != NULL) {
|
if (long_cnt != NULL) {
|
||||||
cnt = PyInt_AsSsize_t(long_cnt);
|
cnt = PyInt_AsSsize_t(long_cnt);
|
||||||
if (cnt == -1 && PyErr_Occurred() || !PyInt_Check(long_cnt)) {
|
if ((cnt == -1 && PyErr_Occurred()) || !PyInt_Check(long_cnt)) {
|
||||||
PyErr_Clear();
|
PyErr_Clear();
|
||||||
slow_mode = 1;
|
slow_mode = 1;
|
||||||
}
|
}
|
||||||
|
@ -3281,10 +3281,10 @@ count_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
||||||
else
|
else
|
||||||
Py_CLEAR(long_cnt);
|
Py_CLEAR(long_cnt);
|
||||||
|
|
||||||
assert(cnt != PY_SSIZE_T_MAX && long_cnt == NULL && !slow_mode ||
|
assert((cnt != PY_SSIZE_T_MAX && long_cnt == NULL && !slow_mode) ||
|
||||||
cnt == PY_SSIZE_T_MAX && long_cnt != NULL && slow_mode);
|
(cnt == PY_SSIZE_T_MAX && long_cnt != NULL && slow_mode));
|
||||||
assert(slow_mode ||
|
assert(slow_mode ||
|
||||||
PyInt_Check(long_step) && PyInt_AS_LONG(long_step) == 1);
|
(PyInt_Check(long_step) && PyInt_AS_LONG(long_step) == 1));
|
||||||
|
|
||||||
/* create countobject structure */
|
/* create countobject structure */
|
||||||
lz = (countobject *)type->tp_alloc(type, 0);
|
lz = (countobject *)type->tp_alloc(type, 0);
|
||||||
|
|
Loading…
Reference in New Issue