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 /source4/ntvfs | |
| 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 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_lock.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c index 76bc73dad8..0d99860e59 100644 --- a/source4/ntvfs/posix/pvfs_lock.c +++ b/source4/ntvfs/posix/pvfs_lock.c @@ -324,8 +324,7 @@ NTSTATUS pvfs_lock(struct ntvfs_module_context *ntvfs, pending->req = req; pending->end_time = - timeval_current_ofs(lck->lockx.in.timeout/1000, - 1000*(lck->lockx.in.timeout%1000)); + timeval_current_ofs_msec(lck->lockx.in.timeout); } if (lck->lockx.in.mode & LOCKING_ANDX_SHARED_LOCK) { |