assoc.pyx, sym.pyx: Mark arguments as `not None'.

[mLib-python] / pkbuf.pyx

diff --git a/pkbuf.pyx b/pkbuf.pyx
index 9bad2680055fbc52766472e2e45df959f1fa7b92..2544aaaf554d7183d539c4510d9d51f7df6caa28 100644 (file)
--- a/pkbuf.pyx
+++ b/pkbuf.pyx
@@ -1,35 +1,33 @@
-# -*-pyrex-*-
-#
-# $Id$
-#
-# Packet buffering
-#
-# (c) 2005 Straylight/Edgeware
-#
+### -*-pyrex-*-
+###
+### Packet buffering
+###
+### (c) 2005 Straylight/Edgeware
+###
 
-#----- Licensing notice -----------------------------------------------------
-#
-# This file is part of the Python interface to mLib.
-#
-# mLib/Python is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# mLib/Python is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with mLib/Python; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+###----- Licensing notice ---------------------------------------------------
+###
+### This file is part of the Python interface to mLib.
+###
+### mLib/Python is free software; you can redistribute it and/or modify
+### it under the terms of the GNU General Public License as published by
+### the Free Software Foundation; either version 2 of the License, or
+### (at your option) any later version.
+###
+### mLib/Python is distributed in the hope that it will be useful,
+### but WITHOUT ANY WARRANTY; without even the implied warranty of
+### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+### GNU General Public License for more details.
+###
+### You should have received a copy of the GNU General Public License
+### along with mLib/Python; if not, write to the Free Software Foundation,
+### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 cdef class PacketBuffer:
   cdef pkbuf pk
   cdef _packet
   cdef _eof
-  def __new__(me, packetproc = None, eofproc = None, *hunoz, **hukairz):
+  def __cinit__(me, packetproc = None, eofproc = None, *hunoz, **hukairz):
     pkbuf_init(&me.pk, _pkfunc, <void *>me)
     me._packet = _checkcallable(packetproc, 'packet proc')
     me._eof = _checkcallable(eofproc, 'eof proc')
@@ -81,11 +79,11 @@ cdef class PacketBuffer:
       cdef unsigned char *p
       return pkbuf_free(&me.pk, &p)
   def flush(me, str):
-    cdef int len
+    cdef Py_ssize_t len
     cdef unsigned char *p
     cdef unsigned char *q
     cdef size_t n
-    PyObject_AsReadBuffer(str, <void **>&p, &len)
+    PyObject_AsReadBuffer(str, <cvp *>&p, &len)
     while len > 0:
       n = pkbuf_free(&me.pk, &q)
       if n > len:
@@ -110,18 +108,18 @@ cdef void _pkfunc(unsigned char *p, size_t n, pkbuf *pk,
                   size_t *keep, void *arg):
   cdef PacketBuffer pb
   cdef void *rp
-  cdef int rn
+  cdef Py_ssize_t rn
   pb = <PacketBuffer>arg
   if p is NULL:
     pb.eof()
   else:
     r = pb.packet(PyString_FromStringAndSize(<char *>p, n))
     if r is not None:
-      PyObject_AsReadBuffer(r, &rp, &rn)
+      PyObject_AsReadBuffer(r, <cvp *>&rp, &rn)
       if rn > n:
         raise ValueError, 'remaining buffer too large'
       if rn:
         memcpy(p + n - rn, rp, rn)
         keep[0] = rn
 
-#----- That's all, folks ----------------------------------------------------
+###----- That's all, folks --------------------------------------------------