*.c: Split the constant definitions into the various submodules.

[catacomb-python] / passphrase.c

diff --git a/passphrase.c b/passphrase.c
index 4c8caf4..6720d65 100644 (file)
--- a/passphrase.c
+++ b/passphrase.c
@@ -118,7 +118,7 @@ static PyObject *pixmeth_cancel(PyObject *me, PyObject *arg)
   RETURN_ME;
 }
 
-static PyMethodDef pixie_pymethods[] = {
+static const PyMethodDef pixie_pymethods[] = {
 #define METHNAME(name) pixmeth_##name
   KWMETH(read,         "P.read(TAG, [mode = PMODE_READ]) -> STRING")
   METH (set,           "P.set(TAG, PHRASE)")
@@ -127,7 +127,7 @@ static PyMethodDef pixie_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject pixie_pytype_skel = {
+static const PyTypeObject pixie_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,             /* Header */
   "Pixie",                             /* @tp_name@ */
   sizeof(pixie_pyobj),                 /* @tp_basicsize@ */
@@ -160,7 +160,7 @@ static PyTypeObject pixie_pytype_skel = {
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
   0,                                   /* @tp_iternext@ */
-  pixie_pymethods,                     /* @tp_methods@ */
+  PYMETHODS(pixie),                    /* @tp_methods@ */
   0,                                   /* @tp_members@ */
   0,                                   /* @tp_getset@ */
   0,                                   /* @tp_base@ */
@@ -177,6 +177,11 @@ static PyTypeObject pixie_pytype_skel = {
 
 /*----- Main code ---------------------------------------------------------*/
 
+static const struct nameval consts[] = {
+  CONST(PMODE_READ), CONST(PMODE_VERIFY),
+  { 0 }
+};
+
 static PyObject *meth_ppread(PyObject *me, PyObject *arg, PyObject *kw)
 {
   char *tag;
@@ -220,7 +225,7 @@ end:
   return (rc);
 }
 
-static PyMethodDef methods[] = {
+static const PyMethodDef methods[] = {
 #define METHNAME(name) meth_##name
   KWMETH(ppread,       "ppread(TAG, [mode = PMODE_READ]) -> STRING")
   METH (ppcancel,      "ppcancel(TAG)")
@@ -238,6 +243,7 @@ void passphrase_pyinit(void)
 void passphrase_pyinsert(PyObject *mod)
 {
   INSERT("Pixie", pixie_pytype);
+  setconstants(mod, consts);
 }
 
 /*----- That's all, folks -------------------------------------------------*/