diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-06-01 11:21:15 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-06-01 10:38:47 +0200 |
| commit | 56e72337b01216dc7cba418f040a5cc928e5fc6f (patch) | |
| tree | 7d64feee26bfeede2ab07ea6045ac11ebb4ea3c2 /source3/rpc_client/rpc_transport_tstream.c | |
| parent | 9bd695c83f43cacfc08566f3c18db44b61f7ed75 (diff) | |
| download | samba-56e72337b01216dc7cba418f040a5cc928e5fc6f.tar.gz samba-56e72337b01216dc7cba418f040a5cc928e5fc6f.tar.bz2 samba-56e72337b01216dc7cba418f040a5cc928e5fc6f.zip | |
lib/util/time.c: timeval_current_ofs_msec
Several places want "milliseconds from current time", and several were
simply doing "msec * 1000" which can (and does in one place) result in
a usec value over 1 a million.
Using a helper to do this is safer and more readable.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'source3/rpc_client/rpc_transport_tstream.c')
| -rw-r--r-- | source3/rpc_client/rpc_transport_tstream.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/rpc_client/rpc_transport_tstream.c b/source3/rpc_client/rpc_transport_tstream.c index e62ab4b2bb..488c093d3b 100644 --- a/source3/rpc_client/rpc_transport_tstream.c +++ b/source3/rpc_client/rpc_transport_tstream.c @@ -202,7 +202,7 @@ static struct tevent_req *rpc_tstream_read_send(TALLOC_CTX *mem_ctx, return tevent_req_post(req, ev); } - endtime = timeval_current_ofs(0, transp->timeout * 1000); + endtime = timeval_current_ofs_msec(transp->timeout); if (!tevent_req_set_endtime(subreq, ev, endtime)) { goto fail; } @@ -286,7 +286,7 @@ static struct tevent_req *rpc_tstream_write_send(TALLOC_CTX *mem_ctx, goto fail; } - endtime = timeval_current_ofs(0, transp->timeout * 1000); + endtime = timeval_current_ofs_msec(transp->timeout); if (!tevent_req_set_endtime(subreq, ev, endtime)) { goto fail; } @@ -374,7 +374,7 @@ static struct tevent_req *rpc_tstream_trans_send(TALLOC_CTX *mem_ctx, state->req.iov_base = discard_const_p(void *, data); state->max_rdata_len = max_rdata_len; - endtime = timeval_current_ofs(0, transp->timeout * 1000); + endtime = timeval_current_ofs_msec(transp->timeout); subreq = tstream_writev_queue_send(state, ev, transp->stream, |