X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=pimd%2Fpim_time.c;h=c9555f5310cd361bd606b4e27bf7cae996633d1e;hb=12906cb1c84b4de54874365d4a02a040ed9632d1;hp=9878fcf6b401f30ad7a73e46d687060609eb8d81;hpb=498897d8d837f2abee51a0064ee45c639340c5bb;p=mirror_frr.git

diff --git a/pimd/pim_time.c b/pimd/pim_time.c
index 9878fcf6b..c9555f531 100644
--- 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>
@@ -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;
 }