r18336@catbus: nickm | 2008-02-21 09:33:15 -0500

Patch from Sebastian Hahn: remove obsolete timeval manipulation functions.


svn:r13653

src/common/util.c

@@ -969,43 +969,6 @@ tv_udiff(const struct timeval *start, const struct timeval *end)
   return udiff;
 }
 
-/** Return -1 if *a \< *b, 0 if *a==*b, and 1 if *a \> *b.
- */
-int
-tv_cmp(const struct timeval *a, const struct timeval *b)
-{
-  if (a->tv_sec > b->tv_sec)
-    return 1;
-  if (a->tv_sec < b->tv_sec)
-    return -1;
-  if (a->tv_usec > b->tv_usec)
-    return 1;
-  if (a->tv_usec < b->tv_usec)
-    return -1;
-  return 0;
-}
-
-/** Increment *a by the number of seconds and microseconds in *b.
- */
-void
-tv_add(struct timeval *a, const struct timeval *b)
-{
-  a->tv_usec += b->tv_usec;
-  a->tv_sec += b->tv_sec + (a->tv_usec / 1000000);
-  a->tv_usec %= 1000000;
-}
-
-/** Increment *a by <b>ms</b> milliseconds.
- */
-void
-tv_addms(struct timeval *a, long ms)
-{
-  uint64_t us = ms * 1000;
-  a->tv_usec += us % 1000000;
-  a->tv_sec += (us / 1000000) + (a->tv_usec / 1000000);
-  a->tv_usec %= 1000000;
-}
-
 /** Yield true iff <b>y</b> is a leap-year. */
 #define IS_LEAPYEAR(y) (!(y % 4) && ((y % 100) || !(y % 400)))
 /** Helper: Return the number of leap-days between Jan 1, y1 and Jan 1, y2. */

src/common/util.h

@@ -193,9 +193,6 @@ int base16_decode(char *dest, size_t destlen, const char *src, size_t srclen);
 
 /* Time helpers */
 long tv_udiff(const struct timeval *start, const struct timeval *end);
-void tv_addms(struct timeval *a, long ms);
-void tv_add(struct timeval *a, const struct timeval *b);
-int tv_cmp(const struct timeval *a, const struct timeval *b);
 time_t tor_timegm(struct tm *tm);
 #define RFC1123_TIME_LEN 29
 void format_rfc1123_time(char *buf, time_t t);

src/or/test.c

@@ -723,10 +723,6 @@ test_util(void)
 
   end.tv_usec = 7000;
 
-  test_assert(tv_cmp(&start, &end)<0);
-  test_assert(tv_cmp(&end, &start)>0);
-  test_assert(tv_cmp(&end, &end)==0);
-
   test_eq(2000L, tv_udiff(&start, &end));
 
   end.tv_sec = 6;
@@ -741,16 +737,9 @@ test_util(void)
 
   test_eq(-1005000L, tv_udiff(&start, &end));
 
-  tv_addms(&end, 5090);
-  test_eq(end.tv_sec, 9);
-  test_eq(end.tv_usec, 90000);
-
   end.tv_usec = 999990;
   start.tv_sec = 1;
   start.tv_usec = 500;
-  tv_add(&start, &end);
-  test_eq(start.tv_sec, 11);
-  test_eq(start.tv_usec, 490);
 
   /* The test values here are confirmed to be correct on a platform
    * with a working timegm. */