Remove the various `getuNN' functions and replace them with getulong().

They weren't doing any real good anyway, and the implementation was
randomly buggy.

diff --git a/catacomb-python.h b/catacomb-python.h
index fa99298..722d7ad 100644 (file)
--- a/catacomb-python.h
+++ b/catacomb-python.h
@@ -237,8 +237,7 @@ extern int convszt(PyObject *, void *);
 extern int convbool(PyObject *, void *);
 extern PyObject *abstract_pynew(PyTypeObject *, PyObject *, PyObject *);
 extern PyObject *getbool(int);
-#define DECL_GETU_(n) extern PyObject *getu##n(uint##n);
-DOUINTSZ(DECL_GETU_)
+extern PyObject *getulong(unsigned long);
 extern void *newtype(PyTypeObject *, const PyTypeObject *, const char *);
 
 extern PyObject * mkexc(PyObject *, PyObject *, const char *, PyMethodDef *);

diff --git a/util.c b/util.c
index 27af83a..166cdbb 100644 (file)
--- a/util.c
+++ b/util.c
@@ -32,15 +32,13 @@
 
 /*----- Conversions -------------------------------------------------------*/
 
-#define GETU_(n)                                                       \
-  PyObject *getu##n(uint##n w)                                         \
-  {                                                                    \
-    if (w <= MASK##n)                                                  \
-      return (PyInt_FromLong(w));                                      \
-    else                                                               \
-      return (PyLong_FromUnsignedLong(w));                             \
-  }
-DOUINTSZ(GETU_)
+PyObject *getulong(unsigned long w)
+{
+  if (w <= MASK32)
+    return (PyInt_FromLong(w));
+  else
+    return (PyLong_FromUnsignedLong(w));
+}
 
 PyObject *getbool(int b)
 {