From 8ca231751365b4d081eb22f58f652aa237d17a50 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 5 Apr 2008 00:55:18 +0100
Subject: [PATCH] util: Actually initialize the utilities properly.

Failure to do this cases segfaults when we actually come to do things
like iteration.
---
 catacomb-python.h | 3 ++-
 util.c            | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/catacomb-python.h b/catacomb-python.h
index dafe0fd..bd9a8e5 100644
--- a/catacomb-python.h
+++ b/catacomb-python.h
@@ -191,7 +191,8 @@
   _(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)
diff --git a/util.c b/util.c
index 89130cb..c1d0ad8 100644
--- a/util.c
+++ b/util.c
@@ -634,13 +634,13 @@ PyMethodDef gmap_pymethods[] = {
 
 /*----- Initialization ----------------------------------------------------*/
 
-void util_init(void)
+void util_pyinit(void)
 {
   INITTYPE(itemiter, root);
   INITTYPE(valiter, root);
 }
 
-void util_insert(PyObject *mod)
+void util_pyinsert(PyObject *mod)
 {
   INSERT("ItemIter", itemiter_pytype);
   INSERT("ValueIter", valiter_pytype);
-- 
2.11.0