X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/d8b378471c7e11b71d5accb62cee6474a33025aa..637b91402d2497db1318debd3cb3868a5abb8f01:/key.c

diff --git a/key.c b/key.c
index 9745764..b6a8c6a 100644
--- a/key.c
+++ b/key.c
@@ -96,7 +96,7 @@ done:
   return (rc);
 }
 
-static PyMethodDef keyexc_pymethods[] = {
+static const PyMethodDef keyexc_pymethods[] = {
 #define METHNAME(func) kxmeth_##func
   METH	(__init__,	"KeyError(CODE)")
   METH	(__str__,	"E.__str__() -> STRING")
@@ -463,7 +463,7 @@ end:
 static PyObject *kdget_flags(PyObject *me, void *hunoz)
   { return (getulong(KEYDATA_KD(me)->e)); }
 
-static PyMethodDef keydata_pymethods[] = {
+static const PyMethodDef keydata_pymethods[] = {
 #define METHNAME(func) kdmeth_##func
   METH	(matchp,	"KD.matchp(FILTER) -> BOOL")
   METH	(split,		"KD.split()")
@@ -476,7 +476,7 @@ static PyMethodDef keydata_pymethods[] = {
   { 0 }
 };
 
-static PyGetSetDef keydata_pygetset[] = {
+static const PyGetSetDef keydata_pygetset[] = {
 #define GETSETNAME(op, name) kd##op##_##name
   GET	(flags,		"KD.flags -> FLAGS")
 #undef GETSETNAME
@@ -516,9 +516,9 @@ static PyTypeObject keydata_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  keydata_pymethods,			/* @tp_methods@ */
+  PYMETHODS(keydata),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  keydata_pygetset,			/* @tp_getset@ */
+  PYGETSET(keydata),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -553,7 +553,7 @@ static PyObject *kdbget_bin(PyObject *me, void *hunoz)
   { return (bytestring_pywrap(KEYDATA_KD(me)->u.k.k,
 			      KEYDATA_KD(me)->u.k.sz)); }
 
-static PyGetSetDef keydatabin_pygetset[] = {
+static const PyGetSetDef keydatabin_pygetset[] = {
 #define GETSETNAME(op, name) kdb##op##_##name
   GET	(bin,		"KD.bin -> BYTES")
 #undef GETSETNAME
@@ -595,7 +595,7 @@ static PyTypeObject keydatabin_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  keydatabin_pygetset,			/* @tp_getset@ */
+  PYGETSET(keydatabin),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -680,7 +680,7 @@ end:
 
 #define kdeget_ct kdbget_bin
 
-static PyMethodDef keydataenc_pymethods[] = {
+static const PyMethodDef keydataenc_pymethods[] = {
 #define METHNAME(func) kdemeth_##func
   METH	(plock,		"KD.plock(TAG) -> ENCRYPTED-KD")
   METH	(lock,		"KD.lock(KEY) -> ENCRYPTED-KD")
@@ -690,7 +690,7 @@ static PyMethodDef keydataenc_pymethods[] = {
   { 0 }
 };
 
-static PyGetSetDef keydataenc_pygetset[] = {
+static const PyGetSetDef keydataenc_pygetset[] = {
 #define GETSETNAME(op, name) kde##op##_##name
   GET	(ct,		"KD.ct -> BYTES")
 #undef GETSETNAME
@@ -730,9 +730,9 @@ static PyTypeObject keydataenc_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  keydataenc_pymethods,			/* @tp_methods@ */
+  PYMETHODS(keydataenc),		/* @tp_methods@ */
   0,					/* @tp_members@ */
-  keydataenc_pygetset,			/* @tp_getset@ */
+  PYGETSET(keydataenc),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -766,7 +766,7 @@ end:
 static PyObject *kdmget_mp(PyObject *me, void *hunoz)
   { return (mp_pywrap(MP_COPY(KEYDATA_KD(me)->u.m))); }
 
-static PyGetSetDef keydatamp_pygetset[] = {
+static const PyGetSetDef keydatamp_pygetset[] = {
 #define GETSETNAME(op, name) kdm##op##_##name
   GET	(mp,		"KD.mp -> X")
 #undef GETSETNAME
@@ -808,7 +808,7 @@ static PyTypeObject keydatamp_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  keydatamp_pygetset,			/* @tp_getset@ */
+  PYGETSET(keydatamp),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -841,7 +841,7 @@ end:
 static PyObject *kdsget_str(PyObject *me, void *hunoz)
   { return (PyString_FromString(KEYDATA_KD(me)->u.p)); }
 
-static PyGetSetDef keydatastr_pygetset[] = {
+static const PyGetSetDef keydatastr_pygetset[] = {
 #define GETSETNAME(op, name) kds##op##_##name
   GET	(str,		"KD.str -> STRING")
 #undef GETSETNAME
@@ -883,7 +883,7 @@ static PyTypeObject keydatastr_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  keydatastr_pygetset,			/* @tp_getset@ */
+  PYGETSET(keydatastr),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -921,7 +921,7 @@ static PyObject *kdeget_ecpt(PyObject *me, void *hunoz)
   return (ecpt_pywrapout(ecpt_pytype, &pt));
 }
 
-static PyGetSetDef keydataec_pygetset[] = {
+static const PyGetSetDef keydataec_pygetset[] = {
 #define GETSETNAME(op, name) kde##op##_##name
   GET	(ecpt,		"KD.ecpt -> ECPT")
 #undef GETSETNAME
@@ -963,7 +963,7 @@ static PyTypeObject keydataec_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  keydataec_pygetset,			/* @tp_getset@ */
+  PYGETSET(keydataec),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -1128,7 +1128,7 @@ end:
   return (rc);
 }
 
-static PyMappingMethods keydatastruct_pymapping = {
+static const PyMappingMethods keydatastruct_pymapping = {
   gmap_pysize,				/* @mp_length@ */
   keydatastruct_pylookup,		/* @mp_subscript@ */
   keydatastruct_pystore			/* @mp_ass_subscript@ */
@@ -1148,7 +1148,7 @@ static PyTypeObject keydatastruct_pytype_skel = {
   0,					/* @tp_repr@ */
   0,					/* @tp_as_number@ */
   0,					/* @tp_as_sequence@ */
-  &keydatastruct_pymapping,		/* @tp_as_mapping@ */
+  PYMAPPING(keydatastruct),		/* @tp_as_mapping@ */
   0,					/* @tp_hash@ */
   0,					/* @tp_call@ */
   0,					/* @tp_str@ */
@@ -1167,7 +1167,7 @@ static PyTypeObject keydatastruct_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   subkeyiter_make,			/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  gmap_pymethods,			/* @tp_methods@ */
+  PYMETHODS(gmap),			/* @tp_methods@ */
   0,					/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
@@ -1314,7 +1314,7 @@ static void keyattrs_pydealloc(PyObject *me)
   FREEOBJ(me);
 }
 
-static PyMappingMethods keyattrs_pymapping = {
+static const PyMappingMethods keyattrs_pymapping = {
   gmap_pysize,				/* @mp_length@ */
   keyattrs_pylookup,			/* @mp_subscript@ */
   keyattrs_pystore			/* @mp_ass_subscript@ */
@@ -1333,8 +1333,8 @@ static PyTypeObject keyattrs_pytype_skel = {
   0,					/* @tp_compare@ */
   0,					/* @tp_repr@ */
   0,					/* @tp_as_number@ */
-  &gmap_pysequence,			/* @tp_as_sequence@ */
-  &keyattrs_pymapping,			/* @tp_as_mapping@ */
+  PYSEQUENCE(gmap),			/* @tp_as_sequence@ */
+  PYMAPPING(keyattrs),			/* @tp_as_mapping@ */
   0,					/* @tp_hash@ */
   0,					/* @tp_call@ */
   0,					/* @tp_str@ */
@@ -1353,7 +1353,7 @@ static PyTypeObject keyattrs_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   keyattriter_make,			/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  gmap_pymethods,			/* @tp_methods@ */
+  PYMETHODS(gmap),			/* @tp_methods@ */
   0,					/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
@@ -1597,7 +1597,7 @@ end:
   return (-1);
 }
 
-static PyMethodDef key_pymethods[] = {
+static const PyMethodDef key_pymethods[] = {
 #define METHNAME(func) kmeth_##func
   METH	(delete,	"KEY.delete()")
   METH	(expire,	"KEY.expire()")
@@ -1608,7 +1608,7 @@ static PyMethodDef key_pymethods[] = {
   { 0 }
 };
 
-static PyGetSetDef key_pygetset[] = {
+static const PyGetSetDef key_pygetset[] = {
 #define GETSETNAME(op, name) k##op##_##name
   GET	(file,		"KEY.file -> KF")
   GET	(id,		"KEY.id -> ID")
@@ -1658,9 +1658,9 @@ static PyTypeObject key_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  key_pymethods,			/* @tp_methods@ */
+  PYMETHODS(key),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  key_pygetset,				/* @tp_getset@ */
+  PYGETSET(key),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -1990,7 +1990,7 @@ static PyObject *kfget_writep(PyObject *me, void *hunoz)
 static PyObject *kfget_filep(PyObject *me, void *hunoz)
   { return (getbool(!!KEYFILE_KF(me)->fp)); }
 
-static PyMethodDef keyfile_pymethods[] = {
+static const PyMethodDef keyfile_pymethods[] = {
 #define METHNAME(func) kfmeth_##func
   METH	(save,		"KF.save()")
   KWMETH(merge,		"KF.merge(FILE, [report = <built-in-reporter>])")
@@ -2005,7 +2005,7 @@ static PyMethodDef keyfile_pymethods[] = {
   { 0 }
 };
 
-static PyGetSetDef keyfile_pygetset[] = {
+static const PyGetSetDef keyfile_pygetset[] = {
 #define GETSETNAME(op, name) kf##op##_##name
   GET	(name,		"KF.name -> file name")
   GET	(modifiedp,	"KF.modifiedp -> has keyring been modified?")
@@ -2015,7 +2015,7 @@ static PyGetSetDef keyfile_pygetset[] = {
   { 0 }
 };
 
-static PyMappingMethods keyfile_pymapping = {
+static const PyMappingMethods keyfile_pymapping = {
   gmap_pysize,
   keyfile_pylookup,
   0
@@ -2034,8 +2034,8 @@ static PyTypeObject keyfile_pytype_skel = {
   0,					/* @tp_compare@ */
   0,					/* @tp_repr@ */
   0,					/* @tp_as_number@ */
-  &gmap_pysequence,			/* @tp_as_sequence@ */
-  &keyfile_pymapping,			/* @tp_as_mapping@ */
+  PYSEQUENCE(gmap),			/* @tp_as_sequence@ */
+  PYMAPPING(keyfile),			/* @tp_as_mapping@ */
   0,					/* @tp_hash@ */
   0,					/* @tp_call@ */
   0,					/* @tp_str@ */
@@ -2055,9 +2055,9 @@ static PyTypeObject keyfile_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   keyiter_new,				/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  keyfile_pymethods,			/* @tp_methods@ */
+  PYMETHODS(keyfile),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  keyfile_pygetset,			/* @tp_getset@ */
+  PYGETSET(keyfile),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */