*.[ch]: Some preparatory reformatting for the Python 3 porting.

[pyke] / mapping.c

diff --git a/mapping.c b/mapping.c
index 4a0d412..3ad1ac7 100644 (file)
--- a/mapping.c
+++ b/mapping.c
@@ -90,7 +90,7 @@ static PyObject *keyiter_pynext(PyObject *me)
 }
 
 static const PyTypeObject keyiter_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,             /* Header */
+  PyVarObject_HEAD_INIT(0, 0)          /* Header */
   "_KeyIter",                          /* @tp_name@ */
   sizeof(iter_pyobj),                  /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -148,7 +148,7 @@ static PyObject *valiter_pynext(PyObject *me)
 }
 
 static const PyTypeObject valiter_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,             /* Header */
+  PyVarObject_HEAD_INIT(0, 0)          /* Header */
   "_ValueIter",                                /* @tp_name@ */
   sizeof(iter_pyobj),                  /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -210,7 +210,7 @@ static PyObject *itemiter_pynext(PyObject *me)
 }
 
 static const PyTypeObject itemiter_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,             /* Header */
+  PyVarObject_HEAD_INIT(0, 0)          /* Header */
   "_ItemIter",                         /* @tp_name@ */
   sizeof(iter_pyobj),                  /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -493,7 +493,8 @@ static int update_core(PyObject *me, PyObject *map)
   unsigned foundp;
   int rc = -1;
 
-  i = PyObject_CallMethod(map, "iteritems", 0);
+  v = PyObject_CallMethod(map, "iteritems", 0);
+  i = v; v = 0;
 
   if (i) {
     for (;;) {