r8875: Rename timeval_diff to timeval_until and revert the arguments. timeval_diff is

not strictly a subtraction function, there can't be negative timevals.

Volker
(This used to be commit 525d75dd24f6a8810f1ed2043d170c70b060f1f0)

2 files changed, 9 insertions, 9 deletions

diff --git a/source4/lib/events/events_standard.c b/source4/lib/events/events_standard.c
index 5a64a42b28..16c9464fd0 100644
--- a/source4/lib/events/events_standard.c
+++ b/source4/lib/events/events_standard.c
@@ -488,7 +488,7 @@ static int std_event_loop_once(struct event_context *ev)
 	/* work out the right timeout for all timed events */
 	if (std_ev->timed_events) {
 		struct timeval t = timeval_current();
-		tval = timeval_diff(&std_ev->timed_events->next_event, &t);
+		tval = timeval_until(&t, &std_ev->timed_events->next_event);
 		if (timeval_is_zero(&tval)) {
 			std_event_loop_timer(ev);
 			return 0;
diff --git a/source4/lib/time.c b/source4/lib/time.c
index 7b371f58dd..1fce5af06d 100644
--- a/source4/lib/time.c
+++ b/source4/lib/time.c
@@ -561,21 +561,21 @@ struct timeval timeval_max(struct timeval *tv1, struct timeval *tv2)
 
 /*
   return the difference between two timevals as a timeval
-  if tv2 comes after tv1, then return a zero timeval
-  (this is *tv1 - *tv2)
+  if tv1 comes after tv2, then return a zero timeval
+  (this is *tv2 - *tv1)
 */
-struct timeval timeval_diff(struct timeval *tv1, struct timeval *tv2)
+struct timeval timeval_until(struct timeval *tv1, struct timeval *tv2)
 {
 	struct timeval t;
-	if (timeval_compare(tv1, tv2) >= 0) {
+	if (timeval_compare(tv2, tv1) >= 0) {
 		return timeval_zero();
 	}
-	t.tv_sec = tv1->tv_sec - tv2->tv_sec;
-	if (tv2->tv_usec > tv1->tv_usec) {
+	t.tv_sec = tv2->tv_sec - tv1->tv_sec;
+	if (tv1->tv_usec > tv2->tv_usec) {
 		t.tv_sec--;
-		t.tv_usec = 1000000 - (tv2->tv_usec - tv1->tv_usec);
+		t.tv_usec = 1000000 - (tv1->tv_usec - tv2->tv_usec);
 	} else {
-		t.tv_usec = tv1->tv_usec - tv2->tv_usec;
+		t.tv_usec = tv2->tv_usec - tv1->tv_usec;
 	}
 	return t;
 }