summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2010-09-16 19:02:27 +0200
committerBjörn Jacke <bj@sernet.de>2010-09-16 21:38:20 +0200
commitaada7196940377ca6942eed470fc2e0e42f71b32 (patch)
tree1d9cf93c95d88340cb25a9b22adac8f35386b887 /source3
parentec643df212e521fc19119820b1e4fac15986bf28 (diff)
downloadsamba-aada7196940377ca6942eed470fc2e0e42f71b32.tar.gz
samba-aada7196940377ca6942eed470fc2e0e42f71b32.tar.bz2
samba-aada7196940377ca6942eed470fc2e0e42f71b32.zip
s3: use nsec_time_diff instead of TspecDiff
Diffstat (limited to 'source3')
-rw-r--r--source3/client/client.c4
-rw-r--r--source3/libsmb/namequery.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index c911559911..cb9ba24e16 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1119,7 +1119,7 @@ static int do_get(const char *rname, const char *lname_in, bool reget)
int this_time;
clock_gettime_mono(&tp_end);
- this_time = TspecDiff(&tp_start,&tp_end);
+ this_time = nsec_time_diff(&tp_start,&tp_end)/1000000;
get_total_time_ms += this_time;
get_total_size += nread;
@@ -1768,7 +1768,7 @@ static int do_put(const char *rname, const char *lname, bool reput)
int this_time;
clock_gettime_mono(&tp_end);
- this_time = TspecDiff(&tp_start,&tp_end);
+ this_time = nsec_time_diff(&tp_start,&tp_end)/1000000;
put_total_time_ms += this_time;
put_total_size += state.nread;
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index c949d3bcb4..00a3b97a98 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -307,7 +307,7 @@ NODE_STATUS_STRUCT *node_status_query(int fd,
while (1) {
struct timespec tp2;
clock_gettime_mono(&tp2);
- if (TspecDiff(&tp,&tp2) > retry_time) {
+ if (nsec_time_diff(&tp,&tp2)/1000000 > retry_time) {
if (!retries)
break;
if (!found && !send_packet(&p))
@@ -716,7 +716,7 @@ struct sockaddr_storage *name_query(int fd,
struct timespec tp2;
clock_gettime_mono(&tp2);
- if (TspecDiff(&tp,&tp2) > retry_time) {
+ if (nsec_time_diff(&tp,&tp2)/1000000 > retry_time) {
if (!retries)
break;
if (!found && !send_packet(&p))