moparisthebest/socat
1
0
Fork 0
mirror of https://github.com/moparisthebest/socat synced 2024-08-13 16:43:48 -04:00
Code Issues Releases Wiki Activity

socat.c: adapted xiopoll() messages for struct timeval

Browse Source
This commit is contained in:
Gerhard Rieger 2008-10-14 22:15:18 +02:00
parent 32219f51fd
commit 674166acbd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
socat.c
View File

@ -684,8 +684,9 @@ int childleftdata(xiofile_t *xfd) {
} while (retval < 0 && errno == EINTR); } while (retval < 0 && errno == EINTR);
if (retval < 0) { if (retval < 0) {
Error4("xiopoll({%d,%0o}, 1, %d): %s", Error5("xiopoll({%d,%0o}, 1, {"F_tv_sec"."F_tv_usec"}): %s",
in.fd, in.events, timeout, strerror(errno)); in.fd, in.events, timeout.tv_sec, timeout.tv_usec,
strerror(errno));
return -1; return -1;
} }
if (retval == 0) { if (retval == 0) {
@ -896,10 +897,10 @@ int _socat(void) {
*/ */
if (retval < 0) { if (retval < 0) {
Error10("xiopoll({%d,%0o}{%d,%0o}{%d,%0o}{%d,%0o}, 4, %d): %s", Error11("xiopoll({%d,%0o}{%d,%0o}{%d,%0o}{%d,%0o}, 4, {"F_tv_sec"."F_tv_usec"}): %s",
fds[0].fd, fds[0].events, fds[1].fd, fds[1].events, fds[0].fd, fds[0].events, fds[1].fd, fds[1].events,
fds[2].fd, fds[2].events, fds[3].fd, fds[3].events, fds[2].fd, fds[2].events, fds[3].fd, fds[3].events,
timeout, strerror(errno)); timeout.tv_sec, timeout.tv_usec, strerror(errno));
return -1; return -1;
} else if (retval == 0) { } else if (retval == 0) {
Info2("poll timed out (no data within %ld.%06ld seconds)", Info2("poll timed out (no data within %ld.%06ld seconds)",