Module Name: src
Committed By: ozaki-r
Date: Fri Oct 21 09:01:44 UTC 2016
Modified Files:
src/sys/net: route.c route.h
Log Message:
Make some rt_timer functions and variables static
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/net/route.c
cvs rdiff -u -r1.104 -r1.105 src/sys/net/route.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/route.c
diff -u src/sys/net/route.c:1.176 src/sys/net/route.c:1.177
--- src/sys/net/route.c:1.176 Fri Oct 21 03:04:33 2016
+++ src/sys/net/route.c Fri Oct 21 09:01:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.176 2016/10/21 03:04:33 ozaki-r Exp $ */
+/* $NetBSD: route.c,v 1.177 2016/10/21 09:01:44 ozaki-r Exp $ */
/*-
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.176 2016/10/21 03:04:33 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.177 2016/10/21 09:01:44 ozaki-r Exp $");
#include <sys/param.h>
#ifdef RTFLUSH_DEBUG
@@ -138,8 +138,13 @@ static struct pool rtentry_pool;
static struct pool rttimer_pool;
static struct callout rt_timer_ch; /* callout for rt_timer_timer() */
-struct workqueue *rt_timer_wq;
-struct work rt_timer_wk;
+static struct workqueue *rt_timer_wq;
+static struct work rt_timer_wk;
+
+static void rt_timer_init(void);
+static void rt_timer_queue_remove_all(struct rttimer_queue *, int);
+static void rt_timer_remove_all(struct rtentry *, int);
+static void rt_timer_timer(void *);
#ifdef RTFLUSH_DEBUG
static int _rtcache_debug = 0;
@@ -1236,7 +1241,7 @@ static int rt_init_done = 0;
static void rt_timer_work(struct work *, void *);
-void
+static void
rt_timer_init(void)
{
int error;
@@ -1280,7 +1285,7 @@ rt_timer_queue_change(struct rttimer_que
rtq->rtq_timeout = timeout;
}
-void
+static void
rt_timer_queue_remove_all(struct rttimer_queue *rtq, int destroy)
{
struct rttimer *r;
@@ -1319,7 +1324,7 @@ rt_timer_count(struct rttimer_queue *rtq
return rtq->rtq_count;
}
-void
+static void
rt_timer_remove_all(struct rtentry *rt, int destroy)
{
struct rttimer *r;
@@ -1409,7 +1414,7 @@ rt_timer_work(struct work *wk, void *arg
callout_reset(&rt_timer_ch, hz, rt_timer_timer, NULL);
}
-void
+static void
rt_timer_timer(void *arg)
{
Index: src/sys/net/route.h
diff -u src/sys/net/route.h:1.104 src/sys/net/route.h:1.105
--- src/sys/net/route.h:1.104 Tue Oct 18 09:43:20 2016
+++ src/sys/net/route.h Fri Oct 21 09:01:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: route.h,v 1.104 2016/10/18 09:43:20 ozaki-r Exp $ */
+/* $NetBSD: route.h,v 1.105 2016/10/21 09:01:44 ozaki-r Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -371,14 +371,10 @@ int rt_timer_add(struct rtentry *,
struct rttimer_queue *);
unsigned long
rt_timer_count(struct rttimer_queue *);
-void rt_timer_init(void);
void rt_timer_queue_change(struct rttimer_queue *, long);
struct rttimer_queue *
rt_timer_queue_create(u_int);
void rt_timer_queue_destroy(struct rttimer_queue *, int);
-void rt_timer_queue_remove_all(struct rttimer_queue *, int);
-void rt_timer_remove_all(struct rtentry *, int);
-void rt_timer_timer(void *);
void rt_newmsg(const int, const struct rtentry *);
struct rtentry *
