Sync with latest KAME

Obtained from:	KAME

1 files changed, 24 insertions, 21 deletions

diff --git a/usr.sbin/rtadvd/timer.h b/usr.sbin/rtadvd/timer.h
index e9f2c35..9a97c91 100644
--- a/usr.sbin/rtadvd/timer.h
+++ b/usr.sbin/rtadvd/timer.h
@@ -1,7 +1,9 @@
+/*	$KAME: timer.h,v 1.2 2000/05/16 13:34:14 itojun Exp $	*/
+
 /*
  * Copyright (C) 1998 WIDE Project.
  * All rights reserved.
- *
+ * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +15,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- *
+ * 
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -30,34 +32,35 @@
  */
 
 /* a < b */
-#define	TIMEVAL_LT(a, b) (((a).tv_sec < (b).tv_sec) ||\
+#define TIMEVAL_LT(a, b) (((a).tv_sec < (b).tv_sec) ||\
 			  (((a).tv_sec == (b).tv_sec) && \
 			    ((a).tv_usec < (b).tv_usec)))
 
 /* a <= b */
-#define	TIMEVAL_LEQ(a, b) (((a).tv_sec < (b).tv_sec) ||\
+#define TIMEVAL_LEQ(a, b) (((a).tv_sec < (b).tv_sec) ||\
 			   (((a).tv_sec == (b).tv_sec) &&\
  			    ((a).tv_usec <= (b).tv_usec)))
 
 struct rtadvd_timer {
-	struct	rtadvd_timer *next;
-	struct	rtadvd_timer *prev;
-	struct	rainfo *rai;
-	struct	timeval tm;
+	struct rtadvd_timer *next;
+	struct rtadvd_timer *prev;
+	struct rainfo *rai;
+	struct timeval tm;
 
-	void	(*expire) __P((void *));	/* expiration function */
-	void	*expire_data;
-	void	(*update) __P((void *, struct timeval *));	/* update function */
-	void	*update_data;
+	void (*expire) __P((void *));	/* expiration function */
+	void *expire_data;
+	void (*update) __P((void *, struct timeval *));	/* update function */
+	void *update_data;
 };
 
-void	rtadvd_timer_init __P((void));
-struct	rtadvd_timer *rtadvd_add_timer __P((void (*) __P((void *)),
+void rtadvd_timer_init __P((void));
+struct rtadvd_timer *rtadvd_add_timer __P((void (*) __P((void *)),
 		void (*) __P((void *, struct timeval *)), void *, void *));
-void	rtadvd_set_timer __P((struct timeval *, struct rtadvd_timer *));
-struct	timeval * rtadvd_check_timer __P((void));
-struct	timeval * rtadvd_timer_rest __P((struct rtadvd_timer *));
-void	TIMEVAL_ADD __P((struct timeval *, struct timeval *,
-		      struct timeval *));
-void	TIMEVAL_SUB __P((struct timeval *, struct timeval *,
-		      struct timeval *));
+void rtadvd_set_timer __P((struct timeval *, struct rtadvd_timer *));
+void rtadvd_remove_timer __P((struct rtadvd_timer **));
+struct timeval * rtadvd_check_timer __P((void));
+struct timeval * rtadvd_timer_rest __P((struct rtadvd_timer *));
+void TIMEVAL_ADD __P((struct timeval *, struct timeval *,
+		      struct timeval *)); 
+void TIMEVAL_SUB __P((struct timeval *, struct timeval *,
+		      struct timeval *));