ident.pyx: Remove traces of bogus `failed' and `eof' callbacks.

[mLib-python] / fdutils.pyx

diff --git a/fdutils.pyx b/fdutils.pyx
index c6ba79e2c82a36465fbdb8dfb990712001aaaeb3..bb28188ae162231ea5d7adab0feee4cc5e3621f7 100644 (file)
--- a/fdutils.pyx
+++ b/fdutils.pyx
@@ -1,29 +1,27 @@
-# -*-pyrex-*-
-#
-# $Id$
-#
-# Messing with file descriptors
-#
-# (c) 2007 Straylight/Edgeware
-#
+### -*-pyrex-*-
+###
+### Messing with file descriptors
+###
+### (c) 2007 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.
 
 def fdflags(file,
             unsigned fbic = 0, unsigned fxor = 0,
@@ -36,9 +34,9 @@ def fdflags(file,
 
 def fdsend(sock, file, buffer):
   cdef void *p
-  cdef int len
+  cdef Py_ssize_t len
   cdef int rc
-  PyObject_AsReadBuffer(buffer, &p, &len)
+  PyObject_AsReadBuffer(buffer, <cvp *>&p, &len)
   rc = fdpass_send(_getfd(sock), _getfd(file), p, len)
   if rc < 0:
     _oserror()
@@ -47,10 +45,10 @@ def fdsend(sock, file, buffer):
 def fdrecv(sock, unsigned size):
   cdef void *p
   cdef buf
-  cdef int len
+  cdef Py_ssize_t len
   cdef PyObject *obj
   cdef int fd
-  buf = PyString_FromStringAndSize(NULL, len)
+  buf = PyString_FromStringAndSize(NULL, size)
   p = PyString_AS_STRING(buf)
   len = fdpass_recv(_getfd(sock), &fd, p, size)
   if len < 0:
@@ -59,4 +57,4 @@ def fdrecv(sock, unsigned size):
   _PyString_Resize(&obj, len)
   return fd, <object>obj
 
-#----- That's all, folks ----------------------------------------------------
+###----- That's all, folks --------------------------------------------------