]> granicus.if.org Git - python/commitdiff
fix compiler warnings
authorBenjamin Peterson <benjamin@python.org>
Mon, 16 Feb 2009 21:07:52 +0000 (21:07 +0000)
committerBenjamin Peterson <benjamin@python.org>
Mon, 16 Feb 2009 21:07:52 +0000 (21:07 +0000)
Modules/itertoolsmodule.c

index 7d1791b2e0bb78b1461cf103d38e57e925d512cc..f42232db69922c97642bfb24d7efc6ad6d21f3ac 100644 (file)
@@ -3239,8 +3239,8 @@ count_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
                        kwlist, &long_cnt, &long_step))
                return NULL;
 
-       if (long_cnt != NULL && !PyNumber_Check(long_cnt) ||
-               long_step != NULL && !PyNumber_Check(long_step)) {
+       if ((long_cnt != NULL && !PyNumber_Check(long_cnt)) ||
+            (long_step != NULL && !PyNumber_Check(long_step))) {
                        PyErr_SetString(PyExc_TypeError, "a number is required");
                        return NULL;
        }
@@ -3267,8 +3267,8 @@ count_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
                } else
                        long_cnt = NULL;
        }
-       assert(cnt != PY_SSIZE_T_MAX && long_cnt == NULL ||
-                  cnt == PY_SSIZE_T_MAX && long_cnt != NULL);
+       assert((cnt != PY_SSIZE_T_MAX && long_cnt == NULL) ||
+               (cnt == PY_SSIZE_T_MAX && long_cnt != NULL));
 
        /* create countobject structure */
        lz = (countobject *)type->tp_alloc(type, 0);
@@ -3292,6 +3292,7 @@ count_dealloc(countobject *lz)
        Py_TYPE(lz)->tp_free(lz);
 }
 
+static int
 count_traverse(countobject *lz, visitproc visit, void *arg)
 {
        Py_VISIT(lz->long_cnt);
@@ -3302,7 +3303,6 @@ count_traverse(countobject *lz, visitproc visit, void *arg)
 static PyObject *
 count_nextlong(countobject *lz)
 {
-       static PyObject *one = NULL;
        PyObject *long_cnt;
        PyObject *stepped_up;