selpk.pyx: Fix bad cut-and-paste in the callback property.

[mLib-python] / selpk.pyx

diff --git a/selpk.pyx b/selpk.pyx
index 59d500f305b1613535c8d6d63d8563250048b6dc..ee27302ce8cd754776d079d759c238b979c1a54e 100644 (file)
--- a/selpk.pyx
+++ b/selpk.pyx
@@ -1,35 +1,33 @@
-# -*-pyrex-*-
-#
-# $Id$
-#
-# Selecting packet-buffer
-#
-# (c) 2005 Straylight/Edgeware
-#
+### -*-pyrex-*-
+###
+### Selecting packet-buffer
+###
+### (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 SelPacketBuffer:
   cdef selpk p
   cdef _packet
   cdef _eof
-  def __new__(me, fd, packetproc = None, eofproc = None, *hunoz, **hukairz):
+  def __cinit__(me, fd, packetproc = None, eofproc = None, *hunoz, **hukairz):
     selpk_init(&me.p, &_sel, _getfd(fd), _selpkfunc, <void *>me)
     selpk_disable(&me.p)
     me._packet = _checkcallable(packetproc, 'packet proc')
@@ -49,13 +47,13 @@ cdef class SelPacketBuffer:
       if n <= 0:
         raise TypeError, 'size must be positive'
       selpk_want(&me.p, n)
-  property lineproc:
+  property packetproc:
     def __get__(me):
-      return me._line
+      return me._packet
     def __set__(me, proc):
-      me._line = _checkcallable(proc, 'line proc')
+      me._packet = _checkcallable(proc, 'packet proc')
     def __del__(me):
-      me._line = None
+      me._packet = None
   property eofproc:
     def __get__(me):
       return me._eof
@@ -88,18 +86,18 @@ cdef void _selpkfunc(unsigned char *p, size_t n, pkbuf *pk,
                      size_t *keep, void *arg):
   cdef SelPacketBuffer pb
   cdef void *rp
-  cdef int rn
+  cdef Py_ssize_t rn
   pb = <SelPacketBuffer>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 --------------------------------------------------