Merge pull request #11918 from patrasar/show_ipv6_mld_interface_fix

[mirror_frr.git] / pimd / pim_time.c

diff --git a/pimd/pim_time.c b/pimd/pim_time.c
index 23c85c2fa8e7225d3725b1cf445339ba8ebaeba5..93aaffb6a4d084d4619a58051ccbc65581fc241c 100644 (file)
--- a/pimd/pim_time.c
+++ b/pimd/pim_time.c
@@ -37,7 +37,7 @@ static int gettime_monotonic(struct timeval *tv)
        if (result) {
                flog_err_sys(EC_LIB_SYSTEM_CALL,
                             "%s: gettimeofday() failure: errno=%d: %s",
-                            __PRETTY_FUNCTION__, errno, safe_strerror(errno));
+                            __func__, errno, safe_strerror(errno));
        }
 
        return result;
@@ -47,14 +47,14 @@ static int gettime_monotonic(struct timeval *tv)
   pim_time_monotonic_sec():
   number of seconds since some unspecified starting point
 */
-int64_t pim_time_monotonic_sec()
+int64_t pim_time_monotonic_sec(void)
 {
        struct timeval now_tv;
 
        if (gettime_monotonic(&now_tv)) {
                flog_err_sys(EC_LIB_SYSTEM_CALL,
                             "%s: gettime_monotonic() failure: errno=%d: %s",
-                            __PRETTY_FUNCTION__, errno, safe_strerror(errno));
+                            __func__, errno, safe_strerror(errno));
                return -1;
        }
 
@@ -65,7 +65,7 @@ int64_t pim_time_monotonic_sec()
   pim_time_monotonic_dsec():
   number of deciseconds since some unspecified starting point
 */
-int64_t pim_time_monotonic_dsec()
+int64_t pim_time_monotonic_dsec(void)
 {
        struct timeval now_tv;
        int64_t now_dsec;
@@ -73,7 +73,7 @@ int64_t pim_time_monotonic_dsec()
        if (gettime_monotonic(&now_tv)) {
                flog_err_sys(EC_LIB_SYSTEM_CALL,
                             "%s: gettime_monotonic() failure: errno=%d: %s",
-                            __PRETTY_FUNCTION__, errno, safe_strerror(errno));
+                            __func__, errno, safe_strerror(errno));
                return -1;
        }
 
@@ -91,7 +91,7 @@ int64_t pim_time_monotonic_usec(void)
        if (gettime_monotonic(&now_tv)) {
                flog_err_sys(EC_LIB_SYSTEM_CALL,
                             "%s: gettime_monotonic() failure: errno=%d: %s",
-                            __PRETTY_FUNCTION__, errno, safe_strerror(errno));
+                            __func__, errno, safe_strerror(errno));
                return -1;
        }
 
@@ -106,7 +106,7 @@ int pim_time_mmss(char *buf, int buf_size, long sec)
        long mm;
        int wr;
 
-       zassert(buf_size >= 5);
+       assert(buf_size >= 5);
 
        mm = sec / 60;
        sec %= 60;
@@ -122,7 +122,7 @@ static int pim_time_hhmmss(char *buf, int buf_size, long sec)
        long mm;
        int wr;
 
-       zassert(buf_size >= 8);
+       assert(buf_size >= 8);
 
        hh = sec / 3600;
        sec %= 3600;
@@ -156,7 +156,7 @@ void pim_time_timer_to_hhmmss(char *buf, int buf_size, struct thread *t_timer)
 
 void pim_time_uptime(char *buf, int buf_size, int64_t uptime_sec)
 {
-       zassert(buf_size >= 8);
+       assert(buf_size >= 8);
 
        pim_time_hhmmss(buf, buf_size, uptime_sec);
 }
@@ -171,9 +171,7 @@ void pim_time_uptime_begin(char *buf, int buf_size, int64_t now, int64_t begin)
 
 long pim_time_timer_remain_msec(struct thread *t_timer)
 {
-       /* FIXME: Actually fetch msec resolution from thread */
-
        /* no timer thread running means timer has expired: return 0 */
 
-       return t_timer ? 1000 * thread_timer_remain_second(t_timer) : 0;
+       return t_timer ? thread_timer_remain_msec(t_timer) : 0;
 }