]> granicus.if.org Git - python/commitdiff
Issue #14180: Fix select.select() compilation on BSD and a typo in kqueue_queue_control()
authorVictor Stinner <vstinner@wyplay.com>
Tue, 13 Mar 2012 14:29:08 +0000 (15:29 +0100)
committerVictor Stinner <vstinner@wyplay.com>
Tue, 13 Mar 2012 14:29:08 +0000 (15:29 +0100)
Modules/selectmodule.c

index 4d9925005d9ca5173129f9c20255606d19e96cd5..179dd61856ca0fa676cf04abdcb3832ca0aed740 100644 (file)
@@ -223,8 +223,10 @@ select_select(PyObject *self, PyObject *args)
         return NULL;
     }
     else {
-        if (_PyTime_ObjectToTimeval(tout, &tv.tv_sec, &tv.tv_usec) == -1)
+        long usec;
+        if (_PyTime_ObjectToTimeval(tout, &tv.tv_sec, &usec) == -1)
             return NULL;
+        tv.tv_usec = usec;
         if (tv.tv_sec < 0) {
             PyErr_SetString(PyExc_ValueError, "timeout must be non-negative");
             return NULL;
@@ -1837,7 +1839,7 @@ kqueue_queue_control(kqueue_queue_Object *self, PyObject *args)
     PyObject *result = NULL;
     struct kevent *evl = NULL;
     struct kevent *chl = NULL;
-    struct timespec timeoutspec;
+    struct timespec timeout;
     struct timespec *ptimeoutspec;
 
     if (self->kqfd < 0)