X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/c4ca600f0508ddec0de99aa9eb87f4f7d4cab5c5..837fa4850257bc8cc06f7b59937078d2607c1202:/buffer.c diff --git a/buffer.c b/buffer.c index 9b6e0ff..6569516 100644 --- 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) @@ -285,7 +285,7 @@ static PyBufferProcs rbuf_pybuffer = { static PyTypeObject rbuf_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ReadBuffer", /* @tp_name@ */ + "ReadBuffer", /* @tp_name@ */ sizeof(buf_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -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) @@ -491,7 +491,7 @@ static PyGetSetDef wbuf_pygetset[] = { static PyMethodDef wbuf_pymethods[] = { #define METHNAME(func) wbmeth_##func - METH (zero, "WBUF.skip(N)") + METH (zero, "WBUF.zero(N)") METH (put, "WBUF.put(BYTES)") #define WBMETH_DECL_PUTU_(n, W, w) \ METH(putu##w, "WBUF.putu" #w "(INT)") @@ -518,7 +518,7 @@ static PyBufferProcs wbuf_pybuffer = { static PyTypeObject wbuf_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.WriteBuffer", /* @tp_name@ */ + "WriteBuffer", /* @tp_name@ */ sizeof(buf_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */