X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/blobdiff_plain/4eb1c80eca9980f0131f323c5ef76cb3f9c7928a..cb46f06b084bb7574b6f7cde13bf413f58a1e91c:/util.c?ds=inline

diff --git a/util.c b/util.c
index cfd4115..8a4b87e 100644
--- a/util.c
+++ b/util.c
@@ -28,6 +28,8 @@
 
 #include "catacomb-python.h"
 
+/* #undef HAVE_LONG_LONG */
+
 /*----- External values ---------------------------------------------------*/
 
 static PyObject *modname = 0;
@@ -42,12 +44,17 @@ PyObject *getulong(unsigned long w)
     return (PyLong_FromUnsignedLong(w));
 }
 
+#ifndef HAVE_LONG_LONG
 static PyObject *i32 = 0;
 static int init_i32(void)
   { if (!i32 && (i32 = PyInt_FromLong(32)) == 0) return (-1); return (0); }
+#endif
 
 PyObject *getk64(kludge64 u)
 {
+#ifdef HAVE_LONG_LONG
+  return (PyLong_FromUnsignedLongLong(GET64(unsigned PY_LONG_LONG, u)));
+#else
   PyObject *i = 0, *j = 0, *t;
   PyObject *rc = 0;
 
@@ -63,6 +70,7 @@ end:
   if (i) Py_DECREF(i);
   if (j) Py_DECREF(j);
   return (rc);
+#endif
 }
 
 PyObject *getbool(int b)
@@ -146,11 +154,22 @@ end:
 
 int convk64(PyObject *o, void *pp)
 {
-  PyObject *i = 0, *t;
+  PyObject *i = 0;
   int rc = 0;
+#if HAVE_LONG_LONG
+  unsigned PY_LONG_LONG t;
+#else
+  PyObject *t;
   uint32 lo, hi;
+#endif
 
   if (!o) VALERR("can't delete");
+#if HAVE_LONG_LONG
+  if ((i = PyNumber_Long(o)) == 0) goto end;
+  t = PyLong_AsUnsignedLongLong(i);
+  if (t == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred()) goto end;
+  ASSIGN64(*(kludge64 *)pp, t);
+#else
   if (init_i32()) goto end;
   if ((i = PyNumber_Int(o)) == 0) goto end;
   lo = PyInt_AsUnsignedLongMask(i);
@@ -161,7 +180,9 @@ int convk64(PyObject *o, void *pp)
   Py_DECREF(i); i = t;
   if (PyObject_IsTrue(i)) VALERR("out of range");
   SET64(*(kludge64 *)pp, hi, lo);
+#endif
   rc = 1;
+
 end:
   if (i) Py_DECREF(i);
   return (rc);
@@ -386,7 +407,7 @@ static PyTypeObject itemiter_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Iterates over the items of a mapping.",
+"Iterates over the keys of a mapping.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -444,7 +465,7 @@ static PyTypeObject valiter_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Iterates over the items of a mapping.",
+"Iterates over the values of a mapping.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -483,8 +504,7 @@ PySequenceMethods gmap_pysequence = {
 Py_ssize_t gmap_pysize(PyObject *me)
 {
   PyObject *i = 0, *x = 0;
-  int rc = -1;
-  int n = 0;
+  Py_ssize_t rc = -1, n = 0;
 
   if ((i = PyObject_GetIter(me)) == 0) goto done;
   while ((x = PyIter_Next(i)) != 0) { n++; Py_DECREF(x); x = 0; }