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/smbd | |
| 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/smbd')
| -rw-r--r-- | source3/smbd/blocking.c | 3 | ||||
| -rw-r--r-- | source3/smbd/smb2_lock.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index ca4106b346..fd77e3d15b 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -208,8 +208,7 @@ bool push_blocking_lock_request( struct byte_range_lock *br_lck, blr->expire_time.tv_sec = 0; blr->expire_time.tv_usec = 0; /* Never expire. */ } else { - blr->expire_time = timeval_current_ofs(lock_timeout/1000, - (lock_timeout % 1000) * 1000); + blr->expire_time = timeval_current_ofs_msec(lock_timeout); } blr->lock_num = lock_num; blr->smblctx = smblctx; diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c index 712558481c..5d615e1bed 100644 --- a/source3/smbd/smb2_lock.c +++ b/source3/smbd/smb2_lock.c @@ -628,9 +628,7 @@ bool push_blocking_lock_request_smb2( struct byte_range_lock *br_lck, blr->expire_time.tv_sec = 0; blr->expire_time.tv_usec = 0; /* Never expire. */ } else { - blr->expire_time = timeval_current_ofs( - lock_timeout/1000, - (lock_timeout % 1000) * 1000); + blr->expire_time = timeval_current_ofs_msec(lock_timeout); } blr->lock_num = lock_num; |