Commit f3473e38 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

XlibInt.c: scope improvements/reformat

parent 52a45828
...@@ -263,28 +263,22 @@ int _XSelect(int maxfds, fd_set *readfds, fd_set *writefds, ...@@ -263,28 +263,22 @@ int _XSelect(int maxfds, fd_set *readfds, fd_set *writefds,
fd_set t_readfds, t_writefds; fd_set t_readfds, t_writefds;
struct timeval t_timeout; struct timeval t_timeout;
int n, r, e;
#ifdef NX_TRANS_TEST #ifdef NX_TRANS_TEST
if (exceptfds != NULL) if (exceptfds != NULL)
{ {
fprintf(stderr, "_XSelect: WARNING! Can't handle exception fds in select.\n"); fprintf(stderr, "_XSelect: WARNING! Can't handle exception fds in select.\n");
} }
#endif #endif
if (readfds == NULL) if (readfds == NULL)
{ {
FD_ZERO(&t_readfds); FD_ZERO(&t_readfds);
readfds = &t_readfds; readfds = &t_readfds;
} }
if (writefds == NULL) if (writefds == NULL)
{ {
FD_ZERO(&t_writefds); FD_ZERO(&t_writefds);
writefds = &t_writefds; writefds = &t_writefds;
} }
...@@ -292,11 +286,10 @@ int _XSelect(int maxfds, fd_set *readfds, fd_set *writefds, ...@@ -292,11 +286,10 @@ int _XSelect(int maxfds, fd_set *readfds, fd_set *writefds,
{ {
t_timeout.tv_sec = 10; t_timeout.tv_sec = 10;
t_timeout.tv_usec = 0; t_timeout.tv_usec = 0;
timeout = &t_timeout; timeout = &t_timeout;
} }
n = maxfds; int n = maxfds;
/* /*
* If the transport is gone avoid * If the transport is gone avoid
...@@ -305,17 +298,17 @@ int _XSelect(int maxfds, fd_set *readfds, fd_set *writefds, ...@@ -305,17 +298,17 @@ int _XSelect(int maxfds, fd_set *readfds, fd_set *writefds,
if (NXTransPrepare(&n, readfds, writefds, timeout) != 0) if (NXTransPrepare(&n, readfds, writefds, timeout) != 0)
{ {
NXTransSelect(&r, &e, &n, readfds, writefds, timeout); int r, e;
NXTransExecute(&r, &e, &n, readfds, writefds, timeout); NXTransSelect(&r, &e, &n, readfds, writefds, timeout);
NXTransExecute(&r, &e, &n, readfds, writefds, timeout);
errno = e;
errno = e; return r;
return r;
} }
else else
{ {
return 0; return 0;
} }
} }
else else
......
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