chiark / gitweb /
Extract Subversion ignore data.
authorMark Wooding <mdw@distorted.org.uk>
Mon, 6 Feb 2006 18:19:16 +0000 (18:19 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 6 Feb 2006 18:19:16 +0000 (18:19 +0000)
12 files changed:
.gitignore [new file with mode: 0644]
bres.pyx
conn.pyx
debian/.gitignore [new file with mode: 0644]
defs.pxi
ident.pyx
sel-base.pyx
sel-file.pyx
sel-timer.pyx
selbuf.pyx
selpk.pyx
sig.pyx

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..5275305
--- /dev/null
@@ -0,0 +1,20 @@
+deb-build
+atom.c
+base32.c
+base32.pyx
+base64.c
+base64.pyx
+build-stamp
+crc32.c
+hex.c
+hex.pyx
+report.c
+select.c
+sym.c
+unihash.c
+build
+.gdbinit
+MANIFEST
+dist
+mLib.c
+
index ebc6262..162ff02 100644 (file)
--- a/bres.pyx
+++ b/bres.pyx
@@ -88,7 +88,7 @@ cdef class SelResolveByAddr (SelResolve):
   def __init__(me, addr, resolvedproc = None, failedproc = None):
     pass
 
-cdef void _resfunc2(hostent *h, void *arg):
+cdef void _resfunc(hostent *h, void *arg):
   cdef SelResolve r
   cdef int i
   r = <SelResolve>arg
@@ -107,10 +107,6 @@ cdef void _resfunc2(hostent *h, void *arg):
       addr.append(inet_ntoa((<in_addr *>h.h_addr_list[i])[0]))
       i = i + 1
     r.resolved(h.h_name, alias, addr)
-cdef void _resfunc(hostent *h, void *arg):
-  PyEval_AcquireLock()
-  _resfunc2(h, arg)
-  PyEval_ReleaseLock()
 
 bres_exec(NULL)
 bres_init(&_sel)
index 0bb0ee7..e485f5d 100644 (file)
--- a/conn.pyx
+++ b/conn.pyx
@@ -74,7 +74,7 @@ cdef class SelConnect:
   def error(me, errno, strerror):
     return _maybecall(me._error, ())
 
-cdef void _connfunc2(int fd, void *arg):
+cdef void _connfunc(int fd, void *arg):
   cdef SelConnect c
   c = <SelConnect>arg
   c._dead()
@@ -83,9 +83,5 @@ cdef void _connfunc2(int fd, void *arg):
     c.error(errno, strerror(errno))
   else:
     c.connected()
-cdef void _connfunc(int fd, void *arg):
-  PyEval_AcquireLock()
-  _connfunc2(fd, arg)
-  PyEval_ReleaseLock()
 
 #----- That's all, folks ----------------------------------------------------
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644 (file)
index 0000000..8cc7db2
--- /dev/null
@@ -0,0 +1,9 @@
+files
+tmp
+substvars
+*.substvars
+*.debhelper
+python-mlib
+python2.3-mlib
+python2.4-mlib
+
index c579c1d..10502f7 100644 (file)
--- a/defs.pxi
+++ b/defs.pxi
@@ -94,9 +94,6 @@ cdef extern from 'Python.h':
   object PyInt_FromLong(long i)
   object PyLong_FromUnsignedLong(unsigned long i)
 
-  void PyEval_AcquireLock()
-  void PyEval_ReleaseLock()
-
   ctypedef struct PyObject:
     pass
   ctypedef struct PyTypeObject:
index e7c05d2..d19c3a4 100644 (file)
--- a/ident.pyx
+++ b/ident.pyx
@@ -157,7 +157,7 @@ cdef class SelIdentify:
   def bogus(me):
     return _maybecall(me._bogus, ())
 
-cdef void _identfunc2(ident_reply *i, void *arg):
+cdef void _identfunc(ident_reply *i, void *arg):
   cdef SelIdentify id
   id = <SelIdentify>arg
   id._dead()
@@ -167,9 +167,5 @@ cdef void _identfunc2(ident_reply *i, void *arg):
     id.error(i.u.error)
   elif i.type == IDENT_USERID:
     id.user(i.u.userid.os, i.u.userid.user)
-cdef void _identfunc(ident_reply *i, void *arg):
-  PyEval_AcquireLock()
-  _identfunc2(i, arg)
-  PyEval_ReleaseLock()
 
 #----- That's all, folks ----------------------------------------------------
index 6a5e2c3..e7b4fbe 100644 (file)
 cdef sel_state _sel
 
 def select():
-  cdef int rc
-  PyEval_ReleaseLock()
-  rc = sel_select(&_sel)
-  PyEval_AcquireLock()
-  if rc and errno != EINTR and errno != EAGAIN:
+  if sel_select(&_sel) and errno != EINTR and errno != EAGAIN:
     _oserror()
 
 sel_init(&_sel)
index aba288f..72ff166 100644 (file)
@@ -88,13 +88,9 @@ cdef class SelFile:
   def ready(me):
     return _maybecall(me._ready, ())
 
-cdef void _filefunc2(void *arg):
+cdef void _filefunc(int fd, unsigned mode, void *arg):
   cdef SelFile sf
   sf = <SelFile>arg
   sf.ready()
-cdef void _filefunc(int fd, unsigned mode, void *arg):
-  PyEval_AcquireLock()
-  _filefunc2(arg)
-  PyEval_ReleaseLock()
 
 #----- That's all, folks ----------------------------------------------------
index db61a6c..261ecde 100644 (file)
@@ -72,14 +72,10 @@ cdef class SelTimer:
   def timer(me, now):
     return _maybecall(me._timer, ())
 
-cdef void _timerfunc2(timeval *now, void *arg):
+cdef void _timerfunc(timeval *now, void *arg):
   cdef SelTimer st
   st = <SelTimer>arg
   st._dead()
   st.timer(_tvtofloat(now))
-cdef void _timerfunc(timeval *now, void *arg):
-  PyEval_AcquireLock()
-  _timerfunc2(now, arg)
-  PyEval_ReleaseLock()
 
 #----- That's all, folks ----------------------------------------------------
index b8fae43..4a5a288 100644 (file)
@@ -95,16 +95,12 @@ cdef class SelLineBuffer:
   def eof(me):
     return _maybecall(me._eof, ())
 
-cdef void _selbfunc2(char *s, size_t n, void *arg):
+cdef void _selbfunc(char *s, size_t n, void *arg):
   cdef SelLineBuffer sb
   sb = <SelLineBuffer>arg
   if s is NULL:
     sb.eof()
   else:
     sb.line(PyString_FromStringAndSize(s, n))
-cdef void _selbfunc(char *s, size_t n, void *arg):
-  PyEval_AcquireLock()
-  _selbfunc2(s, n, arg)
-  PyEval_ReleaseLock()
 
 #----- That's all, folks ----------------------------------------------------
index 5d7e9cb..fe85a9f 100644 (file)
--- a/selpk.pyx
+++ b/selpk.pyx
@@ -84,8 +84,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 +101,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 ----------------------------------------------------
diff --git a/sig.pyx b/sig.pyx
index 937f29b..17237f3 100644 (file)
--- a/sig.pyx
+++ b/sig.pyx
@@ -76,14 +76,10 @@ cdef class SelSignal:
   def signalled(me):
     return _maybecall(me._signalled, ())
 
-cdef void _sigfunc2(void *arg):
+cdef void _sigfunc(int sig, void *arg):
   cdef SelSignal s
   s = <SelSignal>arg
   s.signalled()
-cdef void _sigfunc(int sig, void *arg):
-  PyEval_AcquireLock()
-  _sigfunc2(arg)
-  PyEval_ReleaseLock()
 
 sig_init(&_sel)