X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib-python/blobdiff_plain/b3c87d862e8f44754113ee9bf374e9fcfbc9e7ac..47929c32b676f79b64750eefc7a64a0b413b7dc8:/selpk.pyx

diff --git a/selpk.pyx b/selpk.pyx
index 5d7e9cb..42d15dd 100644
--- 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')
@@ -84,8 +82,8 @@ cdef class SelPacketBuffer:
   def eof(me):
     return _maybecall(me._eof, ())
 
-cdef void _selpkfunc2(unsigned char *p, size_t n, pkbuf *pk,
-                      size_t *keep, void *arg):
+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
@@ -101,10 +99,5 @@ cdef void _selpkfunc2(unsigned char *p, size_t n, pkbuf *pk,
       if rn:
         memcpy(p + n - rn, rp, rn)
         keep[0] = rn
-cdef void _selpkfunc(unsigned char *p, size_t n, pkbuf *pk,
-                     size_t *keep, void *arg):
-  PyEval_AcquireLock()
-  _selpkfunc2(p, n, pk, keep, arg)
-  PyEval_ReleaseLock()
 
-#----- That's all, folks ----------------------------------------------------
+###----- That's all, folks --------------------------------------------------