From 734db55f5806e1260739f13f007d8607614411eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= Date: Tue, 26 Mar 2013 10:58:02 +0100 Subject: [PATCH] Fix iterators (issue #198) --- src/diff.c | 10 +++++----- src/index.c | 4 ++-- src/note.c | 2 +- src/reference.c | 6 +++--- src/tree.c | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/diff.c b/src/diff.c index 619d142..a113739 100644 --- a/src/diff.c +++ b/src/diff.c @@ -197,11 +197,11 @@ DiffIter_dealloc(DiffIter *self) PyDoc_STRVAR(DiffIter__doc__, "Diff iterator object."); PyTypeObject DiffIterType = { - PyVarObject_HEAD_INIT(NULL, 0) - "_pygit2.DiffIter", /* tp_name */ - sizeof(DiffIter), /* tp_basicsize */ + PyVarObject_HEAD_INIT(&PyType_Type, 0) + "_pygit2.DiffIter", /* tp_name */ + sizeof(DiffIter), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor)DiffIter_dealloc, /* tp_dealloc */ + (destructor)DiffIter_dealloc, /* tp_dealloc */ 0, /* tp_print */ 0, /* tp_getattr */ 0, /* tp_setattr */ @@ -223,7 +223,7 @@ PyTypeObject DiffIterType = { 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ PyObject_SelfIter, /* tp_iter */ - (iternextfunc) DiffIter_iternext, /* tp_iternext */ + (iternextfunc) DiffIter_iternext, /* tp_iternext */ }; diff --git a/src/index.c b/src/index.c index 7eb3b43..30abfbb 100644 --- a/src/index.c +++ b/src/index.c @@ -460,7 +460,7 @@ PyDoc_STRVAR(Index__doc__, "Index file."); PyTypeObject IndexType = { PyVarObject_HEAD_INIT(NULL, 0) - "_pygit2.Index", /* tp_name */ + "_pygit2.Index", /* tp_name */ sizeof(Index), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)Index_dealloc, /* tp_dealloc */ @@ -526,7 +526,7 @@ IndexIter_iternext(IndexIter *self) PyDoc_STRVAR(IndexIter__doc__, "Index iterator."); PyTypeObject IndexIterType = { - PyVarObject_HEAD_INIT(NULL, 0) + PyVarObject_HEAD_INIT(&PyType_Type, 0) "_pygit2.IndexIter", /* tp_name */ sizeof(IndexIter), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/src/note.c b/src/note.c index c887036..07df574 100644 --- a/src/note.c +++ b/src/note.c @@ -181,7 +181,7 @@ NoteIter_dealloc(NoteIter *self) PyDoc_STRVAR(NoteIter__doc__, "Note iterator object."); PyTypeObject NoteIterType = { - PyVarObject_HEAD_INIT(NULL, 0) + PyVarObject_HEAD_INIT(&PyType_Type, 0) "_pygit2.NoteIter", /* tp_name */ sizeof(NoteIter), /* tp_basicsize */ 0, /* tp_itemsize */ diff --git a/src/reference.c b/src/reference.c index 774166b..1191dcf 100644 --- a/src/reference.c +++ b/src/reference.c @@ -75,8 +75,8 @@ PyObject* RefLogIter_iternext(RefLogIter *self) PyDoc_STRVAR(RefLogIterType__doc__, "Internal reflog iterator object."); PyTypeObject RefLogIterType = { - PyVarObject_HEAD_INIT(NULL, 0) - "_libgit2.RefLogIter", /* tp_name */ + PyVarObject_HEAD_INIT(&PyType_Type, 0) + "_pygit2.RefLogIter", /* tp_name */ sizeof(RefLogIter), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)RefLogIter_dealloc, /* tp_dealloc */ @@ -101,7 +101,7 @@ PyTypeObject RefLogIterType = { 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ PyObject_SelfIter, /* tp_iter */ - (iternextfunc)RefLogIter_iternext /* tp_iternext */ + (iternextfunc)RefLogIter_iternext, /* tp_iternext */ }; void diff --git a/src/tree.c b/src/tree.c index d2e5deb..e79c532 100644 --- a/src/tree.c +++ b/src/tree.c @@ -446,7 +446,7 @@ TreeIter_iternext(TreeIter *self) PyDoc_STRVAR(TreeIter__doc__, "Tree iterator."); PyTypeObject TreeIterType = { - PyVarObject_HEAD_INIT(NULL, 0) + PyVarObject_HEAD_INIT(&PyType_Type, 0) "_pygit2.TreeIter", /* tp_name */ sizeof(TreeIter), /* tp_basicsize */ 0, /* tp_itemsize */