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.h b/ospfd/ospf_zebra.h
index e8ad979..7fe87b7 100644
--- a/ospfd/ospf_zebra.h
+++ b/ospfd/ospf_zebra.h
@@ -40,37 +40,39 @@
};
/* Prototypes */
-void ospf_zclient_start ();
+extern void ospf_zclient_start (void);
-void ospf_zebra_add (struct prefix_ipv4 *, struct ospf_route *);
-void ospf_zebra_delete (struct prefix_ipv4 *, struct ospf_route *);
+extern void ospf_zebra_add (struct prefix_ipv4 *, struct ospf_route *);
+extern void ospf_zebra_delete (struct prefix_ipv4 *, struct ospf_route *);
-void ospf_zebra_add_discard (struct prefix_ipv4 *);
-void ospf_zebra_delete_discard (struct prefix_ipv4 *);
+extern void ospf_zebra_add_discard (struct prefix_ipv4 *);
+extern void ospf_zebra_delete_discard (struct prefix_ipv4 *);
-int ospf_default_originate_timer (struct thread *);
+extern int ospf_default_originate_timer (struct thread *);
-int ospf_redistribute_check (struct ospf *, struct external_info *, int *);
-int ospf_distribute_check_connected (struct ospf *, struct external_info *);
-void ospf_distribute_list_update (struct ospf *, int);
+extern int ospf_redistribute_check (struct ospf *, struct external_info *,
+ int *);
+extern int ospf_distribute_check_connected (struct ospf *,
+ struct external_info *);
+extern void ospf_distribute_list_update (struct ospf *, int);
-int ospf_is_type_redistributed (int);
-void ospf_distance_reset (struct ospf *);
-u_char ospf_distance_apply (struct prefix_ipv4 *, struct ospf_route *);
+extern int ospf_is_type_redistributed (int);
+extern void ospf_distance_reset (struct ospf *);
+extern u_char ospf_distance_apply (struct prefix_ipv4 *, struct ospf_route *);
-struct vty;
-
-int ospf_redistribute_set (struct ospf *, int, int, int);
-int ospf_redistribute_unset (struct ospf *, int);
-int ospf_redistribute_default_set (struct ospf *, int, int, int);
-int ospf_redistribute_default_unset (struct ospf *);
-int ospf_distribute_list_out_set (struct ospf *, int, const char *);
-int ospf_distribute_list_out_unset (struct ospf *, int, const char *);
-void ospf_routemap_set (struct ospf *, int, const char *);
-void ospf_routemap_unset (struct ospf *, int);
-int ospf_distance_set (struct vty *, struct ospf *, const char *, const char *, const char *);
-int ospf_distance_unset (struct vty *, struct ospf *, const char *, const char *, const char *);
-void ospf_zebra_init ();
+extern int ospf_redistribute_set (struct ospf *, int, int, int);
+extern int ospf_redistribute_unset (struct ospf *, int);
+extern int ospf_redistribute_default_set (struct ospf *, int, int, int);
+extern int ospf_redistribute_default_unset (struct ospf *);
+extern int ospf_distribute_list_out_set (struct ospf *, int, const char *);
+extern int ospf_distribute_list_out_unset (struct ospf *, int, const char *);
+extern void ospf_routemap_set (struct ospf *, int, const char *);
+extern void ospf_routemap_unset (struct ospf *, int);
+extern int ospf_distance_set (struct vty *, struct ospf *, const char *,
+ const char *, const char *);
+extern int ospf_distance_unset (struct vty *, struct ospf *, const char *,
+ const char *, const char *);
+extern void ospf_zebra_init (void);
#endif /* _ZEBRA_OSPF_ZEBRA_H */