2005-05-06 Paul Jakma <paul.jakma@sun.com>
* (general) extern and static qualifiers added.
unspecified arguments in definitions fixed, typically they should
be 'void'.
function casts added for callbacks.
Guards added to headers which lacked them.
Proper headers included rather than relying on incomplete
definitions.
gcc noreturn function attribute where appropriate.
* ospf_opaque.c: remove the private definition of ospf_lsa's
ospf_lsa_refresh_delay.
* ospf_lsa.h: export ospf_lsa_refresh_delay
* ospf_packet.c: (ospf_make_md5_digest) make *auth_key const,
correct thing to do - removes need for the casts later.
* ospf_vty.c: Use vty.h's VTY_GET_INTEGER rather than ospf_vty's
home-brewed versions, shuts up several warnings.
* ospf_vty.h: remove VTY_GET_UINT32. VTY_GET_IPV4_ADDRESS and
VTY_GET_IPV4_PREFIX moved to lib/vty.h.
* ospf_zebra.c: (ospf_distribute_list_update_timer) hacky
overloading of the THREAD_ARG pointer should at least use
uintptr_t.
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index 36e7877..9db8981 100644
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -57,7 +57,7 @@
struct in_addr router_id_zebra;
/* Router-id update message from zebra. */
-int
+static int
ospf_router_id_update_zebra (int command, struct zclient *zclient,
zebra_size_t length)
{
@@ -78,7 +78,7 @@
}
/* Inteface addition message from zebra. */
-int
+static int
ospf_interface_add (int command, struct zclient *zclient, zebra_size_t length)
{
struct interface *ifp;
@@ -109,7 +109,7 @@
return 0;
}
-int
+static int
ospf_interface_delete (int command, struct zclient *zclient,
zebra_size_t length)
{
@@ -158,7 +158,7 @@
strnlen(ifname_tmp, INTERFACE_NAMSIZ));
}
-int
+static int
ospf_interface_state_up (int command, struct zclient *zclient,
zebra_size_t length)
{
@@ -220,7 +220,7 @@
return 0;
}
-int
+static int
ospf_interface_state_down (int command, struct zclient *zclient,
zebra_size_t length)
{
@@ -246,7 +246,7 @@
return 0;
}
-int
+static int
ospf_interface_address_add (int command, struct zclient *zclient,
zebra_size_t length)
{
@@ -269,7 +269,7 @@
return 0;
}
-int
+static int
ospf_interface_address_delete (int command, struct zclient *zclient,
zebra_size_t length)
{
@@ -645,7 +645,7 @@
return CMD_SUCCESS;
}
-int
+static int
ospf_external_lsa_originate_check (struct ospf *ospf,
struct external_info *ei)
{
@@ -770,7 +770,7 @@
}
/* Zebra route add and delete treatment. */
-int
+static int
ospf_zebra_read_ipv4 (int command, struct zclient *zclient,
zebra_size_t length)
{
@@ -916,17 +916,17 @@
}
/* distribute-list update timer. */
-int
+static int
ospf_distribute_list_update_timer (struct thread *thread)
{
struct route_node *rn;
struct external_info *ei;
struct route_table *rt;
struct ospf_lsa *lsa;
- int type;
+ intptr_t type;
struct ospf *ospf;
- type = (int) THREAD_ARG (thread);
+ type = (intptr_t)THREAD_ARG (thread);
assert (type < ZEBRA_ROUTE_MAX);
rt = EXTERNAL_INFO (type);
@@ -977,7 +977,7 @@
}
/* If access-list is updated, apply some check. */
-void
+static void
ospf_filter_update (struct access_list *access)
{
struct ospf *ospf;
@@ -1098,8 +1098,8 @@
ospf_schedule_abr_task (ospf);
}
-struct ospf_distance *
-ospf_distance_new ()
+static struct ospf_distance *
+ospf_distance_new (void)
{
struct ospf_distance *new;
new = XMALLOC (MTYPE_OSPF_DISTANCE, sizeof (struct ospf_distance));
@@ -1107,7 +1107,7 @@
return new;
}
-void
+static void
ospf_distance_free (struct ospf_distance *odistance)
{
XFREE (MTYPE_OSPF_DISTANCE, odistance);