~mdw
/
catacomb-python
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gitignore: Ignore the COPYING file.
[catacomb-python]
/
passphrase.c
diff --git
a/passphrase.c
b/passphrase.c
index
a72bd90
..
42c1863
100644
(file)
--- a/
passphrase.c
+++ b/
passphrase.c
@@
-41,6
+41,7
@@
static PyTypeObject *pixie_pytype;
#define PIXIE_PYCHECK(o) PyObject_TypeCheck((o), pixie_pytype)
#define PIXIE_FD(o) (((pixie_pyobj *)(o))->fd)
#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))
static int convpixie(PyObject *o, void *p)
{
if (!PIXIE_PYCHECK(o))
@@
-50,6
+51,7
@@
static int convpixie(PyObject *o, void *p)
end:
return (0);
}
end:
return (0);
}
+#endif
static PyObject *pixie_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
{
static PyObject *pixie_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
{
@@
-71,8
+73,7
@@
end:
static void pixie_pydealloc(PyObject *me)
{
close(PIXIE_FD(me));
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)
}
static PyObject *pixmeth_read(PyObject *me, PyObject *arg, PyObject *kw)
@@
-129,7
+130,7
@@
static PyMethodDef pixie_pymethods[] = {
};
static PyTypeObject pixie_pytype_skel = {
};
static PyTypeObject pixie_pytype_skel = {
- PyObject_HEAD_INIT(
&PyType_Type) 0,
/* Header */
+ PyObject_HEAD_INIT(
0) 0,
/* Header */
"catacomb.Pixie", /* @tp_name@ */
sizeof(pixie_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
"catacomb.Pixie", /* @tp_name@ */
sizeof(pixie_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
@@
-160,7
+161,7
@@
static PyTypeObject pixie_pytype_skel = {
0, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
0, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternex
r
@ */
+ 0, /* @tp_iternex
t
@ */
pixie_pymethods, /* @tp_methods@ */
0, /* @tp_members@ */
0, /* @tp_getset@ */
pixie_pymethods, /* @tp_methods@ */
0, /* @tp_members@ */
0, /* @tp_getset@ */
@@
-172,7
+173,7
@@
static PyTypeObject pixie_pytype_skel = {
0, /* @tp_init@ */
PyType_GenericAlloc, /* @tp_alloc@ */
pixie_pynew, /* @tp_new@ */
0, /* @tp_init@ */
PyType_GenericAlloc, /* @tp_alloc@ */
pixie_pynew, /* @tp_new@ */
-
_PyObject_Del,
/* @tp_free@ */
+
0,
/* @tp_free@ */
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};