Staticized lots of local functions.

This commit is contained in:
Martin Mares 2004-06-05 09:58:23 +00:00
parent 598b984d1f
commit 9831e5916f
9 changed files with 15 additions and 16 deletions

View file

@ -50,7 +50,7 @@
#define CMP_ERROR 999 #define CMP_ERROR 999
struct adata * static struct adata *
adata_empty(struct linpool *pool) adata_empty(struct linpool *pool)
{ {
struct adata *res = lp_alloc(pool, sizeof(struct adata)); struct adata *res = lp_alloc(pool, sizeof(struct adata));
@ -122,7 +122,7 @@ val_compare(struct f_val v1, struct f_val v2)
/* /*
* val_simple_in_range - check if @v1 ~ @v2 for everything except sets * val_simple_in_range - check if @v1 ~ @v2 for everything except sets
*/ */
int static int
val_simple_in_range(struct f_val v1, struct f_val v2) val_simple_in_range(struct f_val v1, struct f_val v2)
{ {
if ((v1.type == T_PATH) && (v2.type == T_PATH_MASK)) if ((v1.type == T_PATH) && (v2.type == T_PATH_MASK))
@ -161,7 +161,7 @@ val_simple_in_range(struct f_val v1, struct f_val v2)
* Checks if @v1 is element (|~| operator) of @v2. Sets are internally represented as balanced trees, see * Checks if @v1 is element (|~| operator) of @v2. Sets are internally represented as balanced trees, see
* |tree.c| module (this is not limited to sets, but for non-set cases, val_simple_in_range() is called early). * |tree.c| module (this is not limited to sets, but for non-set cases, val_simple_in_range() is called early).
*/ */
int static int
val_in_range(struct f_val v1, struct f_val v2) val_in_range(struct f_val v1, struct f_val v2)
{ {
int res; int res;
@ -240,7 +240,7 @@ static rta *f_rta_copy;
/* /*
* rta_cow - prepare rta for modification by filter * rta_cow - prepare rta for modification by filter
*/ */
void static void
rta_cow(void) rta_cow(void)
{ {
if (!f_rta_copy) { if (!f_rta_copy) {

View file

@ -188,7 +188,7 @@ sl_new(pool *p, unsigned size)
return s; return s;
} }
struct sl_head * static struct sl_head *
sl_new_head(slab *s) sl_new_head(slab *s)
{ {
struct sl_head *h = xmalloc(SLAB_SIZE); struct sl_head *h = xmalloc(SLAB_SIZE);

View file

@ -76,7 +76,7 @@ static void bgp_connect(struct bgp_proto *p);
static void bgp_initiate(struct bgp_proto *p); static void bgp_initiate(struct bgp_proto *p);
static void bgp_setup_listen_sk(void); static void bgp_setup_listen_sk(void);
void static void
bgp_close(struct bgp_proto *p UNUSED) bgp_close(struct bgp_proto *p UNUSED)
{ {
ASSERT(bgp_counter); ASSERT(bgp_counter);

View file

@ -147,7 +147,7 @@ ospf_dbdes_send(struct ospf_neighbor *n)
} }
} }
void static void
ospf_dbdes_reqladd(struct ospf_dbdes_packet *ps, struct ospf_neighbor *n) ospf_dbdes_reqladd(struct ospf_dbdes_packet *ps, struct ospf_neighbor *n)
{ {
struct ospf_lsa_header *plsa, lsa; struct ospf_lsa_header *plsa, lsa;

View file

@ -16,19 +16,19 @@ char *ospf_ism[]={ "interface up", "wait timer fired", "backup seen",
char *ospf_it[]={ "broadcast", "nbma", "point-to-point", "virtual link" }; char *ospf_it[]={ "broadcast", "nbma", "point-to-point", "virtual link" };
void static void
poll_timer_hook(timer *timer) poll_timer_hook(timer *timer)
{ {
ospf_hello_send(timer, 1, NULL); ospf_hello_send(timer, 1, NULL);
} }
void static void
hello_timer_hook(timer *timer) hello_timer_hook(timer *timer)
{ {
ospf_hello_send(timer, 0, NULL); ospf_hello_send(timer, 0, NULL);
} }
void static void
wait_timer_hook(timer *timer) wait_timer_hook(timer *timer)
{ {
struct ospf_iface *ifa; struct ospf_iface *ifa;

View file

@ -210,7 +210,7 @@ electdr(list nl)
return(n); return(n);
} }
int static int
can_do_adj(struct ospf_neighbor *n) can_do_adj(struct ospf_neighbor *n)
{ {
struct ospf_iface *ifa; struct ospf_iface *ifa;
@ -569,7 +569,6 @@ void
rxmt_timer_hook(timer *timer) rxmt_timer_hook(timer *timer)
{ {
struct ospf_neighbor *n = (struct ospf_neighbor *)timer->data; struct ospf_neighbor *n = (struct ospf_neighbor *)timer->data;
struct ospf_iface *ifa = n->ifa;
struct top_hash_entry *en; struct top_hash_entry *en;
DBG("%s: RXMT timer fired on interface %s for neigh: %I.\n", DBG("%s: RXMT timer fired on interface %s for neigh: %I.\n",

View file

@ -36,7 +36,7 @@ ospf_tx_authenticate (struct ospf_iface *ifa, struct ospf_packet *pkt)
return; return;
} }
int static int
ospf_rx_authenticate (struct ospf_iface *ifa, struct ospf_packet *pkt) ospf_rx_authenticate (struct ospf_iface *ifa, struct ospf_packet *pkt)
{ {
int i; int i;

View file

@ -20,7 +20,7 @@
#define HASH_LO_STEP 2 #define HASH_LO_STEP 2
#define HASH_LO_MIN 8 #define HASH_LO_MIN 8
void * static void *
originate_rt_lsa_body(struct ospf_area *oa, u16 *length, struct proto_ospf *p) originate_rt_lsa_body(struct ospf_area *oa, u16 *length, struct proto_ospf *p)
{ {
struct ospf_iface *ifa; struct ospf_iface *ifa;
@ -216,7 +216,7 @@ originate_rt_lsa(struct ospf_area *oa)
oa->origrt=0; oa->origrt=0;
} }
void * static void *
originate_net_lsa_body(struct ospf_iface *ifa, u16 *length, originate_net_lsa_body(struct ospf_iface *ifa, u16 *length,
struct proto_ospf *po) struct proto_ospf *po)
{ {

View file

@ -541,7 +541,7 @@ krt_set_notify(struct krt_proto *p, net *n UNUSED, rte *new, rte *old)
} }
} }
struct iface * static struct iface *
krt_temp_iface(struct krt_proto *p, unsigned index) krt_temp_iface(struct krt_proto *p, unsigned index)
{ {
struct iface *i, *j; struct iface *i, *j;