From: David Lamparter <equinox@opensourcerouting.org>
Date: Mon, 23 Jan 2017 15:54:56 +0000 (+0100)
Subject: ospf6d: time: remove unused/duplicate helpers
X-Git-Tag: frr-3.0-branchpoint~64^2~9^2~9
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=95ac0ac5ff4146b28c13ba7d821909948b285a5d;p=matthieu%2Ffrr.git

ospf6d: time: remove unused/duplicate helpers

timersub() & timerclear() are in sys/time.h;
timerstring_local() is unused.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

diff --git a/ospf6d/ospf6d.h b/ospf6d/ospf6d.h
index b41e8ff001..f0bc022749 100644
--- a/ospf6d/ospf6d.h
+++ b/ospf6d/ospf6d.h
@@ -58,21 +58,6 @@ extern struct thread_master *master;
 #define OSPF6_NEIGHBOR(x) ((struct ospf6_neighbor *) (x))
 
 /* operation on timeval structure */
-#ifndef timerclear
-#define timerclear(a) (a)->tv_sec = (tvp)->tv_usec = 0
-#endif /*timerclear*/
-#ifndef timersub
-#define timersub(a, b, res)                           \
-  do {                                                \
-    (res)->tv_sec = (a)->tv_sec - (b)->tv_sec;        \
-    (res)->tv_usec = (a)->tv_usec - (b)->tv_usec;     \
-    if ((res)->tv_usec < 0)                           \
-      {                                               \
-        (res)->tv_sec--;                              \
-        (res)->tv_usec += 1000000;                    \
-      }                                               \
-  } while (0)
-#endif /*timersub*/
 #define timerstring(tv, buf, size)                      \
   do {                                                  \
     if ((tv)->tv_sec / 60 / 60 / 24)                    \
@@ -87,15 +72,6 @@ extern struct thread_master *master;
                 (tv)->tv_sec / 60LL % 60,               \
                 (tv)->tv_sec % 60LL);                   \
   } while (0)
-#define timerstring_local(tv, buf, size)                  \
-  do {                                                    \
-    int ret;                                              \
-    struct tm *tm;                                        \
-    tm = localtime (&(tv)->tv_sec);                       \
-    ret = strftime (buf, size, "%Y/%m/%d %H:%M:%S", tm);  \
-    if (ret == 0)                                         \
-      zlog_warn ("strftime error");                       \
-  } while (0)
 
 #define threadtimer_string(now, t, buf, size)                         \
   do {                                                                \