diff options
| -rw-r--r-- | source4/lib/events/events_standard.c | 3 | ||||
| -rw-r--r-- | source4/lib/time.c | 16 |
2 files changed, 10 insertions, 9 deletions
diff --git a/source4/lib/events/events_standard.c b/source4/lib/events/events_standard.c index 16c9464fd0..810e8bbca3 100644 --- a/source4/lib/events/events_standard.c +++ b/source4/lib/events/events_standard.c @@ -311,7 +311,8 @@ static struct timed_event *std_event_add_timed(struct event_context *ev, TALLOC_ for (cur_te = std_ev->timed_events; cur_te; cur_te = cur_te->next) { /* if the new event comes before the current one break */ if (!timeval_is_zero(&cur_te->next_event) && - timeval_compare(&cur_te->next_event, &te->next_event) < 0) { + timeval_compare(&te->next_event, + &cur_te->next_event) < 0) { break; } diff --git a/source4/lib/time.c b/source4/lib/time.c index 3bc97dddc9..61e92b8c00 100644 --- a/source4/lib/time.c +++ b/source4/lib/time.c @@ -497,16 +497,16 @@ struct timeval timeval_current_ofs(uint32_t secs, uint32_t usecs) /* compare two timeval structures. - Return 1 if tv2 > tv1 - Return 0 if tv2 == tv1 - Return -1 if tv2 < tv1 + Return -1 if tv1 < tv2 + Return 0 if tv1 == tv2 + Return 1 if tv1 > tv2 */ int timeval_compare(const struct timeval *tv1, const struct timeval *tv2) { - if (tv2->tv_sec > tv1->tv_sec) return 1; - if (tv2->tv_sec < tv1->tv_sec) return -1; - if (tv2->tv_usec > tv1->tv_usec) return 1; - if (tv2->tv_usec < tv1->tv_usec) return -1; + if (tv1->tv_sec > tv2->tv_sec) return 1; + if (tv1->tv_sec < tv2->tv_sec) return -1; + if (tv1->tv_usec > tv2->tv_usec) return 1; + if (tv1->tv_usec < tv2->tv_usec) return -1; return 0; } @@ -572,7 +572,7 @@ struct timeval timeval_until(const struct timeval *tv1, const struct timeval *tv2) { struct timeval t; - if (timeval_compare(tv2, tv1) >= 0) { + if (timeval_compare(tv1, tv2) >= 0) { return timeval_zero(); } t.tv_sec = tv2->tv_sec - tv1->tv_sec; |