~mdw
/
catacomb-python
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
catacomb/__init__.py: Implement equality and hashing for `KeyData' objects.
[catacomb-python]
/
field.c
diff --git
a/field.c
b/field.c
index
ba7badb
..
fa424df
100644
(file)
--- a/
field.c
+++ b/
field.c
@@
-218,7
+218,7
@@
end:
return (rc);
}
return (rc);
}
-static
long
fe_pyhash(PyObject *me)
+static
Py_hash_t
fe_pyhash(PyObject *me)
{ return (mphash(FE_X(me))); }
static int fe_pycoerce(PyObject **x, PyObject **y)
{ return (mphash(FE_X(me))); }
static int fe_pycoerce(PyObject **x, PyObject **y)
@@
-394,7
+394,7
@@
static const PyNumberMethods fe_pynumber = {
};
static const PyTypeObject fe_pytype_skel = {
};
static const PyTypeObject fe_pytype_skel = {
- Py
Object_HEAD_INIT(0) 0,
/* Header */
+ Py
VarObject_HEAD_INIT(0, 0)
/* Header */
"FE", /* @tp_name@ */
sizeof(fe_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
"FE", /* @tp_name@ */
sizeof(fe_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
@@
-512,7
+512,7
@@
static PyObject *fget_noctets(PyObject *me, void *hunoz)
{ return (PyInt_FromLong(FIELD_F(me)->noctets)); }
static PyObject *fget_name(PyObject *me, void *hunoz)
{ return (PyInt_FromLong(FIELD_F(me)->noctets)); }
static PyObject *fget_name(PyObject *me, void *hunoz)
- { return (
PyString_FromString
(F_NAME(FIELD_F(me)))); }
+ { return (
TEXT_FROMSTR
(F_NAME(FIELD_F(me)))); }
static PyObject *fget_type(PyObject *me, void *hunoz)
{ return (PyInt_FromLong(F_TYPE(FIELD_F(me)))); }
static PyObject *fget_type(PyObject *me, void *hunoz)
{ return (PyInt_FromLong(F_TYPE(FIELD_F(me)))); }
@@
-540,7
+540,7
@@
static const PyMethodDef field_pymethods[] = {
};
static const PyTypeObject field_pytype_skel = {
};
static const PyTypeObject field_pytype_skel = {
- Py
Object_HEAD_INIT(0) 0,
/* Header */
+ Py
VarObject_HEAD_INIT(0, 0)
/* Header */
"Field", /* @tp_name@ */
sizeof(field_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
"Field", /* @tp_name@ */
sizeof(field_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
@@
-618,7
+618,7
@@
static const PyGetSetDef primefield_pygetset[] = {
};
static const PyTypeObject primefield_pytype_skel = {
};
static const PyTypeObject primefield_pytype_skel = {
- Py
Object_HEAD_INIT(0) 0,
/* Header */
+ Py
VarObject_HEAD_INIT(0, 0)
/* Header */
"PrimeField", /* @tp_name@ */
sizeof(field_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
"PrimeField", /* @tp_name@ */
sizeof(field_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
@@
-685,7
+685,7
@@
end:
}
static const PyTypeObject niceprimefield_pytype_skel = {
}
static const PyTypeObject niceprimefield_pytype_skel = {
- Py
Object_HEAD_INIT(0) 0,
/* Header */
+ Py
VarObject_HEAD_INIT(0, 0)
/* Header */
"NicePrimeField", /* @tp_name@ */
sizeof(field_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
"NicePrimeField", /* @tp_name@ */
sizeof(field_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
@@
-749,7
+749,7
@@
static const PyGetSetDef binfield_pygetset[] = {
};
static const PyTypeObject binfield_pytype_skel = {
};
static const PyTypeObject binfield_pytype_skel = {
- Py
Object_HEAD_INIT(0) 0,
/* Header */
+ Py
VarObject_HEAD_INIT(0, 0)
/* Header */
"BinField", /* @tp_name@ */
sizeof(field_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
"BinField", /* @tp_name@ */
sizeof(field_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
@@
-815,7
+815,7
@@
end:
}
static const PyTypeObject binpolyfield_pytype_skel = {
}
static const PyTypeObject binpolyfield_pytype_skel = {
- Py
Object_HEAD_INIT(0) 0,
/* Header */
+ Py
VarObject_HEAD_INIT(0, 0)
/* Header */
"BinPolyField", /* @tp_name@ */
sizeof(field_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
"BinPolyField", /* @tp_name@ */
sizeof(field_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
@@
-894,7
+894,7
@@
static const PyGetSetDef binnormfield_pygetset[] = {
};
static const PyTypeObject binnormfield_pytype_skel = {
};
static const PyTypeObject binnormfield_pytype_skel = {
- Py
Object_HEAD_INIT(0) 0,
/* Header */
+ Py
VarObject_HEAD_INIT(0, 0)
/* Header */
"BinNormField", /* @tp_name@ */
sizeof(field_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
"BinNormField", /* @tp_name@ */
sizeof(field_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */