OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update.

Browse Source 
* sunrpc/clnt_tcp.c (clnt_call): Don't use timeout in tests with zero,
	use ct->ct_wait.
	* sunrpc/clnt_unix.c (clnt_call): Likewise.
This commit is contained in:
Ulrich Drepper 2000-11-01 09:06:22 +00:00
parent 25b3dd49a7
commit a69a8d9c70
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -23,6 +23,9 @@
clnt_control for any protocol. This would make it impossible for clnt_control for any protocol. This would make it impossible for
the user to provide one in clnt_call(). the user to provide one in clnt_call().
Reported by Hitoshi Guutara Maruyama <maruyama@sh.rim.or.jp>. Reported by Hitoshi Guutara Maruyama <maruyama@sh.rim.or.jp>.
* sunrpc/clnt_tcp.c (clnt_call): Don't use timeout in tests with zero,
use ct->ct_wait.
* sunrpc/clnt_unix.c (clnt_call): Likewise.
2000-10-31 Jes Sorensen <jes@linuxcare.com> 2000-10-31 Jes Sorensen <jes@linuxcare.com>

6
sunrpc/clnt_tcp.c
View File

@ -253,8 +253,8 @@ clnttcp_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
} }
shipnow = shipnow =
(xdr_results == (xdrproc_t) 0 && timeout.tv_sec == 0 (xdr_results == (xdrproc_t) 0 && ct->ct_wait.tv_sec == 0
&& timeout.tv_usec == 0) ? FALSE : TRUE; && ct->ct_wait.tv_usec == 0) ? FALSE : TRUE;
call_again: call_again:
xdrs->x_op = XDR_ENCODE; xdrs->x_op = XDR_ENCODE;
@ -277,7 +277,7 @@ call_again:
/* /*
* Hack to provide rpc-based message passing * Hack to provide rpc-based message passing
*/ */
if (timeout.tv_sec == 0 && timeout.tv_usec == 0) if (ct->ct_wait.tv_sec == 0 && ct->ct_wait.tv_usec == 0)
{ {
return ct->ct_error.re_status = RPC_TIMEDOUT; return ct->ct_error.re_status = RPC_TIMEDOUT;
} }

6
sunrpc/clnt_unix.c
View File

@ -232,8 +232,8 @@ clntunix_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
} }
shipnow = shipnow =
(xdr_results == (xdrproc_t) 0 && timeout.tv_sec == 0 (xdr_results == (xdrproc_t) 0 && ct->ct_wait.tv_sec == 0
&& timeout.tv_usec == 0) ? FALSE : TRUE; && ct->ct_wait.tv_usec == 0) ? FALSE : TRUE;
call_again: call_again:
xdrs->x_op = XDR_ENCODE; xdrs->x_op = XDR_ENCODE;
@ -256,7 +256,7 @@ call_again:
/* /*
* Hack to provide rpc-based message passing * Hack to provide rpc-based message passing
*/ */
if (timeout.tv_sec == 0 && timeout.tv_usec == 0) if (ct->ct_wait.tv_sec == 0 && ct->ct_wait.tv_usec == 0)
return ct->ct_error.re_status = RPC_TIMEDOUT; return ct->ct_error.re_status = RPC_TIMEDOUT;