[SCM] Samba Shared Repository - branch v3-6-test updated

[Björn Jacke]

The branch, v3-6-test has been updated
       via  cd4945d s3: fix order of arguments in nsec_time_diff call
      from  318f727 s3: remove TspecDiff macro, we can use the shared nsec_time_diff function

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit cd4945d3f0f17a28a9f1a1835dd19d3847f45d31
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Sep 17 13:47:05 2010 +0200

    s3: fix order of arguments in nsec_time_diff call

-----------------------------------------------------------------------

Summary of changes:
 source3/client/client.c    |    4 ++--
 source3/libsmb/namequery.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/client/client.c b/source3/client/client.c
index 62ff5d1..2731c03 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1106,7 +1106,7 @@ static int do_get(const char *rname, const char *lname_in, bool reget)
 		int this_time;
 
 		clock_gettime_mono(&tp_end);
-		this_time = nsec_time_diff(&tp_start,&tp_end)/1000000;
+		this_time = nsec_time_diff(&tp_end,&tp_start)/1000000;
 		get_total_time_ms += this_time;
 		get_total_size += nread;
 
@@ -1749,7 +1749,7 @@ static int do_put(const char *rname, const char *lname, bool reput)
 		int this_time;
 
 		clock_gettime_mono(&tp_end);
-		this_time = nsec_time_diff(&tp_start,&tp_end)/1000000;
+		this_time = nsec_time_diff(&tp_end,&tp_start)/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 00a3b97..d1fb5ab 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 (nsec_time_diff(&tp,&tp2)/1000000 > retry_time) {
+		if (nsec_time_diff(&tp2,&tp)/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 (nsec_time_diff(&tp,&tp2)/1000000 > retry_time) {
+		if (nsec_time_diff(&tp2,&tp)/1000000 > retry_time) {
 			if (!retries)
 				break;
 			if (!found && !send_packet(&p))


-- 
Samba Shared Repository