util: Actually initialize the utilities properly.

Failure to do this cases segfaults when we actually come to do things
like iteration.

diff --git a/catacomb-python.h b/catacomb-python.h
index dafe0fd1b082b4bb83ff4906c65f6c2cefa90548..bd9a8e5574548c98a314f88777c82188fb5a7fa7 100644 (file)
--- a/catacomb-python.h
+++ b/catacomb-python.h
@@ -191,7 +191,8 @@
   _(bytestring) _(buffer)                                              \
   _(rand) _(algorithms) _(pubkey) _(pgen)                              \
   _(mp) _(field) _(ec) _(group)                                                \
   _(bytestring) _(buffer)                                              \
   _(rand) _(algorithms) _(pubkey) _(pgen)                              \
   _(mp) _(field) _(ec) _(group)                                                \

-  _(passphrase) _(share) _(key)
+  _(passphrase) _(share) _(key)                                                \
+  _(util)

 #define DOMODINIT(m) m##_pyinit();
 #define DOMODINSERT(m) m##_pyinsert(mod);
 #define INIT_MODULES do { MODULES(DOMODINIT) } while (0)
 #define DOMODINIT(m) m##_pyinit();
 #define DOMODINSERT(m) m##_pyinsert(mod);
 #define INIT_MODULES do { MODULES(DOMODINIT) } while (0)

diff --git a/util.c b/util.c
index 89130cbe75e6abeffaa413e66bbb72de4f97eb85..c1d0ad877c1b27370a34c217c03cc0308f203dbf 100644 (file)
--- a/util.c
+++ b/util.c
@@ -634,13 +634,13 @@ PyMethodDef gmap_pymethods[] = {
 
 /*----- Initialization ----------------------------------------------------*/
 
 
 /*----- Initialization ----------------------------------------------------*/
 

-void util_init(void)
+void util_pyinit(void)

 {
   INITTYPE(itemiter, root);
   INITTYPE(valiter, root);
 }
 
 {
   INITTYPE(itemiter, root);
   INITTYPE(valiter, root);
 }
 

-void util_insert(PyObject *mod)
+void util_pyinsert(PyObject *mod)

 {
   INSERT("ItemIter", itemiter_pytype);
   INSERT("ValueIter", valiter_pytype);
 {
   INSERT("ItemIter", itemiter_pytype);
   INSERT("ValueIter", valiter_pytype);