Release 1.0.5.

[catacomb-python] / util.c

diff --git a/util.c b/util.c
index 89130cbe75e6abeffaa413e66bbb72de4f97eb85..f56c7fd0c52524665deb176d3ac5200b978903dc 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,6 +1,4 @@
 /* -*-c-*-
 /* -*-c-*-

- *
- * $Id$

  *
  * Miscellaneous utilities (not Catacomb-specific)
  *
  *
  * Miscellaneous utilities (not Catacomb-specific)
  *


@@ -165,7 +163,7 @@ void *newtype(PyTypeObject *metaty,
     ty->ht_name = PyString_FromString(ty->ht_type.tp_name);
   if (ty->ht_name)
     ty->ht_type.tp_name = PyString_AS_STRING(ty->ht_name);
     ty->ht_name = PyString_FromString(ty->ht_type.tp_name);
   if (ty->ht_name)
     ty->ht_type.tp_name = PyString_AS_STRING(ty->ht_name);

-  PyObject_INIT(&ty->ht_type, metaty);
+  DISCARD(PyObject_INIT(&ty->ht_type, metaty));

   Py_INCREF(metaty);
   return (ty);
 }
   Py_INCREF(metaty);
   return (ty);
 }


@@ -634,13 +632,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);