Commit 1d582c97 authored by Sjoerd Mullender's avatar Sjoerd Mullender

Fixed a couple of bugs: getargs doesn't use % escapes, and seconds

must be set after timeout is initialized.
parent 29294d31
...@@ -125,12 +125,12 @@ select_select(self, args) ...@@ -125,12 +125,12 @@ select_select(self, args)
/* Get args. Looks funny because of optional timeout argument */ /* Get args. Looks funny because of optional timeout argument */
if ( getargs(args, "(OOOO)", &ifdlist, &ofdlist, &efdlist, &tout) ) { if ( getargs(args, "(OOOO)", &ifdlist, &ofdlist, &efdlist, &tout) ) {
seconds = (int)timeout;
if (tout == None) if (tout == None)
tvp = (struct timeval *)0; tvp = (struct timeval *)0;
else { else {
if (!getargs(tout, "%d;timeout must be float or None", &timeout)) if (!getargs(tout, "d;timeout must be float or None", &timeout))
return NULL; return NULL;
seconds = (int)timeout;
timeout = timeout - (double)seconds; timeout = timeout - (double)seconds;
tv.tv_sec = seconds; tv.tv_sec = seconds;
tv.tv_usec = (int)(timeout*1000000.0); tv.tv_usec = (int)(timeout*1000000.0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment