Further fixing to use `Py_ssize_t' in place of int.

This addresses the remaining compiler warnings when building for 64-bit
targets.

diff --git a/buffer.c b/buffer.c
index 507e6b8a753c97f811362f626d2c130498c372f4..65695162e814f3b13cc31e129f1a9853945b0521 100644 (file)
--- a/buffer.c
+++ b/buffer.c
@@ -77,10 +77,10 @@ static void buf_pydealloc(PyObject *me)
   FREEOBJ(me);
 }
 
-static int rbuf_pysegcount(PyObject *me, int *nn)
+static Py_ssize_t rbuf_pysegcount(PyObject *me, Py_ssize_t *nn)
   { if (nn) *nn = BSZ(BUF_B(me)); return (1); }
 
-static int rbuf_pyreadbuf(PyObject *me, int seg, void **q)
+static Py_ssize_t rbuf_pyreadbuf(PyObject *me, Py_ssize_t seg, void **q)
   { assert(seg == 0); *q = BCUR(BUF_B(me)); return (BLEFT(BUF_B(me))); }
 
 static PyObject *rbmeth_skip(PyObject *me, PyObject *arg)
@@ -367,10 +367,10 @@ end:
   return ((PyObject *)me);
 }
 
-static int wbuf_pysegcount(PyObject *me, int *nn)
+static Py_ssize_t wbuf_pysegcount(PyObject *me, Py_ssize_t *nn)
   { if (nn) *nn = BLEN(BUF_B(me)); return (1); }
 
-static int wbuf_pyreadbuf(PyObject *me, int seg, void **q)
+static Py_ssize_t wbuf_pyreadbuf(PyObject *me, Py_ssize_t seg, void **q)
   { assert(seg == 0); *q = BBASE(BUF_B(me)); return (BLEN(BUF_B(me))); }
 
 static PyObject *wbmeth_zero(PyObject *me, PyObject *arg)

diff --git a/catacomb-python.h b/catacomb-python.h
index b287450280a5318114e098e62708a5b49ae09b28..a379e1d4d02cb74214dd5a56e75ae2aa3d1f9ed8 100644 (file)
--- a/catacomb-python.h
+++ b/catacomb-python.h
@@ -282,7 +282,7 @@ extern PyMethodDef *donemethods(void);
 GMAP_DOMETHODS(GMAP_METHDECL, GMAP_KWMETHDECL)
 #define GMAP_ROMETHODS GMAP_DOROMETHODS(GMAP_METH, GMAP_KWMETH)
 #define GMAP_METHODS GMAP_DOMETHODS(GMAP_METH, GMAP_KWMETH)
-extern int gmap_pysize(PyObject *);
+extern Py_ssize_t gmap_pysize(PyObject *);
 extern PySequenceMethods gmap_pysequence;
 extern PyMethodDef gmap_pymethods[];
 

diff --git a/util.c b/util.c
index 8a0c06c0e75c58955c40a8f783f8abb8fa75686c..ed56e99a23bbcdb21cd881ff76a6c75b8522301b 100644 (file)
--- a/util.c
+++ b/util.c
@@ -413,7 +413,7 @@ PySequenceMethods gmap_pysequence = {
   0                                    /* @sq_inplace_repeat@ */
 };
 
-int gmap_pysize(PyObject *me)
+Py_ssize_t gmap_pysize(PyObject *me)
 {
   PyObject *i = 0, *x = 0;
   int rc = -1;