X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/blobdiff_plain/d7ab1bab81155baa763449d5afa81e16df98dbe7..f1b0cf0da6b3bcc530d7f72982278510d94f6456:/passphrase.c

diff --git a/passphrase.c b/passphrase.c
index a72bd90..7e28f93 100644
--- a/passphrase.c
+++ b/passphrase.c
@@ -1,13 +1,11 @@
 /* -*-c-*-
- *
- * $Id$
  *
  * Reading and writing passphrases
  *
  * (c) 2005 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the Python interface to Catacomb.
  *
@@ -15,12 +13,12 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * Catacomb/Python is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with Catacomb/Python; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -41,6 +39,7 @@ static PyTypeObject *pixie_pytype;
 #define PIXIE_PYCHECK(o) PyObject_TypeCheck((o), pixie_pytype)
 #define PIXIE_FD(o) (((pixie_pyobj *)(o))->fd)
 
+#ifdef WANT_CONVPIXIE
 static int convpixie(PyObject *o, void *p)
 {
   if (!PIXIE_PYCHECK(o))
@@ -50,6 +49,7 @@ static int convpixie(PyObject *o, void *p)
 end:
   return (0);
 }
+#endif
 
 static PyObject *pixie_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {
@@ -71,8 +71,7 @@ end:
 static void pixie_pydealloc(PyObject *me)
 {
   close(PIXIE_FD(me));
-  PyObject_DEL(me);
-  
+  FREEOBJ(me);
 }
 
 static PyObject *pixmeth_read(PyObject *me, PyObject *arg, PyObject *kw)
@@ -129,8 +128,8 @@ static PyMethodDef pixie_pymethods[] = {
 };
 
 static PyTypeObject pixie_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,	/* Header */
-  "catacomb.Pixie",			/* @tp_name@ */
+  PyObject_HEAD_INIT(0) 0,		/* Header */
+  "Pixie",				/* @tp_name@ */
   sizeof(pixie_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -160,7 +159,7 @@ static PyTypeObject pixie_pytype_skel = {
   0,					/* @tp_richcompare@ */
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
-  0,					/* @tp_iternexr@ */
+  0,					/* @tp_iternext@ */
   pixie_pymethods,			/* @tp_methods@ */
   0,					/* @tp_members@ */
   0,					/* @tp_getset@ */
@@ -172,7 +171,7 @@ static PyTypeObject pixie_pytype_skel = {
   0,					/* @tp_init@ */
   PyType_GenericAlloc,			/* @tp_alloc@ */
   pixie_pynew,				/* @tp_new@ */
-  _PyObject_Del,			/* @tp_free@ */
+  0,					/* @tp_free@ */
   0					/* @tp_is_gc@ */
 };