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.

1 files changed, 44 insertions, 36 deletions

diff --git a/ospfd/ospf_flood.h b/ospfd/ospf_flood.h
index 1a6ab979..5382e8fe 100644
--- a/ospfd/ospf_flood.h
+++ b/ospfd/ospf_flood.h
@@ -20,46 +20,54 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef _ZEBRA_OSPF_FLOODING_H
-#define _ZEBRA_OSPF_FLOODING_H
+#ifndef _ZEBRA_OSPF_FLOOD_H
+#define _ZEBRA_OSPF_FLOOD_H
 
-int ospf_flood (struct ospf_neighbor *, struct ospf_lsa *, struct ospf_lsa *);
-int ospf_flood_through (struct ospf_neighbor *, struct ospf_lsa *);
-int ospf_flood_through_area (struct ospf_area *, struct ospf_neighbor *,
-			     struct ospf_lsa *);
-int ospf_flood_through_as (struct ospf_neighbor *, struct ospf_lsa *);
+extern int ospf_flood (struct ospf *, struct ospf_neighbor *,
+		       struct ospf_lsa *, struct ospf_lsa *);
+extern int ospf_flood_through (struct ospf *, struct ospf_neighbor *,
+			       struct ospf_lsa *);
+extern int ospf_flood_through_area (struct ospf_area *,
+				    struct ospf_neighbor *,
+				    struct ospf_lsa *);
+extern int ospf_flood_through_as (struct ospf *, struct ospf_neighbor *,
+				  struct ospf_lsa *);
 
-unsigned long ospf_ls_request_count (struct ospf_neighbor *);
-int ospf_ls_request_isempty (struct ospf_neighbor *);
-struct ospf_lsa *ospf_ls_request_new (struct lsa_header *);
-void ospf_ls_request_free (struct ospf_lsa *);
-void ospf_ls_request_add (struct ospf_neighbor *, struct ospf_lsa *);
-void ospf_ls_request_delete (struct ospf_neighbor *, struct ospf_lsa *);
-void ospf_ls_request_delete_all (struct ospf_neighbor *);
-struct ospf_lsa *ospf_ls_request_lookup (struct ospf_neighbor *,
-					 struct ospf_lsa *);
+extern unsigned long ospf_ls_request_count (struct ospf_neighbor *);
+extern int ospf_ls_request_isempty (struct ospf_neighbor *);
+extern struct ospf_lsa *ospf_ls_request_new (struct lsa_header *);
+extern void ospf_ls_request_free (struct ospf_lsa *);
+extern void ospf_ls_request_add (struct ospf_neighbor *, struct ospf_lsa *);
+extern void ospf_ls_request_delete (struct ospf_neighbor *,
+				    struct ospf_lsa *);
+extern void ospf_ls_request_delete_all (struct ospf_neighbor *);
+extern struct ospf_lsa *ospf_ls_request_lookup (struct ospf_neighbor *,
+						struct ospf_lsa *);
 
-unsigned long ospf_ls_retransmit_count (struct ospf_neighbor *);
-unsigned long ospf_ls_retransmit_count_self (struct ospf_neighbor *, int);
-int ospf_ls_retransmit_isempty (struct ospf_neighbor *);
-void ospf_ls_retransmit_add (struct ospf_neighbor *, struct ospf_lsa *);
-void ospf_ls_retransmit_delete (struct ospf_neighbor *, struct ospf_lsa *);
-void ospf_ls_retransmit_clear (struct ospf_neighbor *);
-struct ospf_lsa *ospf_ls_retransmit_lookup (struct ospf_neighbor *,
+extern unsigned long ospf_ls_retransmit_count (struct ospf_neighbor *);
+extern unsigned long ospf_ls_retransmit_count_self (struct ospf_neighbor *,
+						    int);
+extern int ospf_ls_retransmit_isempty (struct ospf_neighbor *);
+extern void ospf_ls_retransmit_add (struct ospf_neighbor *,
+				    struct ospf_lsa *);
+extern void ospf_ls_retransmit_delete (struct ospf_neighbor *,
+				       struct ospf_lsa *);
+extern void ospf_ls_retransmit_clear (struct ospf_neighbor *);
+extern struct ospf_lsa *ospf_ls_retransmit_lookup (struct ospf_neighbor *,
+						   struct ospf_lsa *);
+extern void ospf_ls_retransmit_delete_nbr_area (struct ospf_area *,
+						struct ospf_lsa *);
+extern void ospf_ls_retransmit_delete_nbr_as (struct ospf *,
+					      struct ospf_lsa *);
+extern void ospf_ls_retransmit_add_nbr_all (struct ospf_interface *,
 					    struct ospf_lsa *);
-void ospf_ls_retransmit_delete_nbr_all (struct ospf_area *, struct ospf_lsa *);
-void ospf_ls_retransmit_add_nbr_all (struct ospf_interface *,
-				     struct ospf_lsa *);
 
-void ospf_flood_lsa_area (struct ospf_lsa *, struct ospf_area *);
-void ospf_flood_lsa_as (struct ospf_lsa *);
-void ospf_lsa_flush_area (struct ospf_lsa *, struct ospf_area *);
-void ospf_lsa_flush_as (struct ospf_lsa *);
-void ospf_flush_through_as (struct ospf_lsa *);
-struct external_info *ospf_external_info_check (struct ospf_lsa *);
+extern void ospf_flood_lsa_area (struct ospf_lsa *, struct ospf_area *);
+extern void ospf_flood_lsa_as (struct ospf_lsa *);
+extern void ospf_lsa_flush_area (struct ospf_lsa *, struct ospf_area *);
+extern void ospf_lsa_flush_as (struct ospf *, struct ospf_lsa *);
+extern struct external_info *ospf_external_info_check (struct ospf_lsa *);
 
-void debug_ospf_ls_retransmit (struct ospf_neighbor *);
+extern void ospf_lsdb_init (struct ospf_lsdb *);
 
-void ospf_lsdb_init (struct ospf_lsdb *);
-
-#endif /* _ZEBRA_OSPF_FLOODING_H */
+#endif /* _ZEBRA_OSPF_FLOOD_H */