sel-timer: Pyrex now wants explicit truncations to integer.

[mLib-python] / selpk.pyx

diff --git a/selpk.pyx b/selpk.pyx
index 5d7e9cbc780316cb7f796c12f3f72ccd901fe5d9..59d500f305b1613535c8d6d63d8563250048b6dc 100644 (file)
--- a/selpk.pyx
+++ b/selpk.pyx
@@ -15,12 +15,12 @@
 # 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.
 # 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.
 # 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.
 # 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.


@@ -84,8 +84,8 @@ cdef class SelPacketBuffer:
   def eof(me):
     return _maybecall(me._eof, ())
 
   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
   cdef SelPacketBuffer pb
   cdef void *rp
   cdef int rn


@@ -101,10 +101,5 @@ cdef void _selpkfunc2(unsigned char *p, size_t n, pkbuf *pk,
       if rn:
         memcpy(p + n - rn, rp, rn)
         keep[0] = rn
       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 ----------------------------------------------------