*: auto-convert to SPDX License IDs

[mirror_frr.git] / pimd / pim_time.c

diff --git a/pimd/pim_time.c b/pimd/pim_time.c
index f12f767537512e272408dd99744789cc3b4dc717..c9555f5310cd361bd606b4e27bf7cae996633d1e 100644 (file)
--- a/pimd/pim_time.c
+++ b/pimd/pim_time.c
@@ -1,20 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * PIM for Quagga
  * Copyright (C) 2008  Everton da Silva Marques
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -37,7 +24,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;
@@ -54,7 +41,7 @@ int64_t pim_time_monotonic_sec(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;
        }
 
@@ -73,7 +60,7 @@ int64_t pim_time_monotonic_dsec(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;
        }
 
@@ -91,7 +78,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 +93,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 +109,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 +143,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 +158,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;
 }