de-__P()

8 files changed, 159 insertions, 175 deletions

diff --git a/usr.sbin/atm/atmarpd/atmarp_var.h b/usr.sbin/atm/atmarpd/atmarp_var.h
index f11d982..91a235f 100644
--- a/usr.sbin/atm/atmarpd/atmarp_var.h
+++ b/usr.sbin/atm/atmarpd/atmarp_var.h
@@ -180,46 +180,45 @@ extern FILE		*atmarp_log_file;
  */
 
 /* atmarp_config.c */
-extern int	atmarp_cfg_netif __P((char *));
+extern int	atmarp_cfg_netif(char *);
 
 /* atmarp_log.c */
 #if __STDC__
-extern void	atmarp_log __P((const int, const char *, ...));
+extern void	atmarp_log(const int, const char *, ...);
 #else
-extern void	atmarp_log __P((int, char *, va_alist));
+extern void	atmarp_log(int, char *, va_alist);
 #endif
-extern void	atmarp_mem_err __P((char *));
+extern void	atmarp_mem_err(char *);
 
 /* atmarp_scsp.c */
-extern int	atmarp_scsp_cache __P((Atmarp_intf *, Scsp_if_msg *));
-extern int	atmarp_scsp_update __P((Atmarp *, int));
-extern int	atmarp_scsp_update_in __P((Atmarp_intf *,
-			Scsp_if_msg *));
-extern int	atmarp_scsp_read __P((Atmarp_intf *));
-extern int	atmarp_scsp_out __P((Atmarp_intf *, char *, int));
-extern int	atmarp_scsp_connect __P((Atmarp_intf *));
-extern void	atmarp_scsp_close __P((Atmarp_intf *));
-extern int	atmarp_scsp_disconnect __P((Atmarp_intf *));
+extern int	atmarp_scsp_cache(Atmarp_intf *, Scsp_if_msg *);
+extern int	atmarp_scsp_update(Atmarp *, int);
+extern int	atmarp_scsp_update_in(Atmarp_intf *, Scsp_if_msg *);
+extern int	atmarp_scsp_read(Atmarp_intf *);
+extern int	atmarp_scsp_out(Atmarp_intf *, char *, int);
+extern int	atmarp_scsp_connect(Atmarp_intf *);
+extern void	atmarp_scsp_close(Atmarp_intf *);
+extern int	atmarp_scsp_disconnect(Atmarp_intf *);
 
 /* atmarp_subr.c */
-extern Atmarp_intf	 *atmarp_find_intf_sock __P((int));
-extern Atmarp_intf	 *atmarp_find_intf_name __P((char *));
-extern void	atmarp_clear_marks __P(());
-extern int	atmarp_is_server __P((Atmarp_intf *));
-extern int	atmarp_if_ready __P((Atmarp_intf *));
-extern Atmarp *	atmarp_copy_cache_entry __P((struct air_arp_rsp *));
-extern int	atmarp_update_kernel __P((Atmarp *));
-extern void	atmarp_get_updated_cache __P(());
-extern void	atmarp_process_cache_entry __P((struct air_arp_rsp *));
-extern void	print_atmarp_intf __P((FILE *, Atmarp_intf *));
-extern void	print_atmarp_cache __P((FILE *, Atmarp *));
-extern void	dump_atmarp_cache __P((FILE *, Atmarp_intf *));
-extern void	atmarp_sigint __P((int));
+extern Atmarp_intf	 *atmarp_find_intf_sock(int);
+extern Atmarp_intf	 *atmarp_find_intf_name(char *);
+extern void	atmarp_clear_marks();
+extern int	atmarp_is_server(Atmarp_intf *);
+extern int	atmarp_if_ready(Atmarp_intf *);
+extern Atmarp *	atmarp_copy_cache_entry(struct air_arp_rsp *);
+extern int	atmarp_update_kernel(Atmarp *);
+extern void	atmarp_get_updated_cache();
+extern void	atmarp_process_cache_entry(struct air_arp_rsp *);
+extern void	print_atmarp_intf(FILE *, Atmarp_intf *);
+extern void	print_atmarp_cache(FILE *, Atmarp *);
+extern void	dump_atmarp_cache(FILE *, Atmarp_intf *);
+extern void	atmarp_sigint(int);
 
 /* atmarp_timer.c */
-extern void	atmarp_cache_timeout __P((Harp_timer *));
-extern void	atmarp_perm_timeout __P((Harp_timer *));
-extern void	atmarp_keepalive_timeout __P((Harp_timer *));
+extern void	atmarp_cache_timeout(Harp_timer *);
+extern void	atmarp_perm_timeout(Harp_timer *);
+extern void	atmarp_keepalive_timeout(Harp_timer *);
 
 
 #endif	/* _ATMARP_ATMARP_VAR_H */
diff --git a/usr.sbin/atm/scspd/scsp_cafsm.c b/usr.sbin/atm/scspd/scsp_cafsm.c
index 80fcfa0..05a1e24 100644
--- a/usr.sbin/atm/scspd/scsp_cafsm.c
+++ b/usr.sbin/atm/scspd/scsp_cafsm.c
@@ -69,26 +69,26 @@ __RCSID("@(#) $FreeBSD$");
  * CA FSM actions
  */
 #define	CA_ACTION_CNT	20
-int	scsp_ca_act_00 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_01 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_02 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_03 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_04 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_05 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_06 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_07 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_08 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_09 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_10 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_11 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_12 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_13 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_14 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_15 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_16 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_17 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_18 __P((Scsp_dcs *, void *));
-int	scsp_ca_act_19 __P((Scsp_dcs *, void *));
+int	scsp_ca_act_00(Scsp_dcs *, void *);
+int	scsp_ca_act_01(Scsp_dcs *, void *);
+int	scsp_ca_act_02(Scsp_dcs *, void *);
+int	scsp_ca_act_03(Scsp_dcs *, void *);
+int	scsp_ca_act_04(Scsp_dcs *, void *);
+int	scsp_ca_act_05(Scsp_dcs *, void *);
+int	scsp_ca_act_06(Scsp_dcs *, void *);
+int	scsp_ca_act_07(Scsp_dcs *, void *);
+int	scsp_ca_act_08(Scsp_dcs *, void *);
+int	scsp_ca_act_09(Scsp_dcs *, void *);
+int	scsp_ca_act_10(Scsp_dcs *, void *);
+int	scsp_ca_act_11(Scsp_dcs *, void *);
+int	scsp_ca_act_12(Scsp_dcs *, void *);
+int	scsp_ca_act_13(Scsp_dcs *, void *);
+int	scsp_ca_act_14(Scsp_dcs *, void *);
+int	scsp_ca_act_15(Scsp_dcs *, void *);
+int	scsp_ca_act_16(Scsp_dcs *, void *);
+int	scsp_ca_act_17(Scsp_dcs *, void *);
+int	scsp_ca_act_18(Scsp_dcs *, void *);
+int	scsp_ca_act_19(Scsp_dcs *, void *);
 
 static int (*scsp_ca_act_vec[CA_ACTION_CNT])() = {
 	scsp_ca_act_00,
diff --git a/usr.sbin/atm/scspd/scsp_config.c b/usr.sbin/atm/scspd/scsp_config.c
index 324d250..f692069 100644
--- a/usr.sbin/atm/scspd/scsp_config.c
+++ b/usr.sbin/atm/scspd/scsp_config.c
@@ -64,7 +64,7 @@ __RCSID("@(#) $FreeBSD$");
 #endif
 
 
-extern int	yyparse __P((void));
+extern int	yyparse(void);
 
 /*
  * Global variables
diff --git a/usr.sbin/atm/scspd/scsp_config_parse.y b/usr.sbin/atm/scspd/scsp_config_parse.y
index 168974e..b5c34b9 100644
--- a/usr.sbin/atm/scspd/scsp_config_parse.y
+++ b/usr.sbin/atm/scspd/scsp_config_parse.y
@@ -70,7 +70,7 @@ __RCSID("@(#) $FreeBSD$");
 #endif
 
 
-void	yyerror __P((char *));
+void	yyerror(char *);
 %}
 
 
diff --git a/usr.sbin/atm/scspd/scsp_hfsm.c b/usr.sbin/atm/scspd/scsp_hfsm.c
index d1bec16..8010290 100644
--- a/usr.sbin/atm/scspd/scsp_hfsm.c
+++ b/usr.sbin/atm/scspd/scsp_hfsm.c
@@ -66,13 +66,13 @@ __RCSID("@(#) $FreeBSD$");
  * HELLO FSM actions
  */
 #define	HELLO_ACTION_CNT	7
-int	scsp_hello_act_00 __P((Scsp_dcs *, Scsp_msg *));
-int	scsp_hello_act_01 __P((Scsp_dcs *, Scsp_msg *));
-int	scsp_hello_act_02 __P((Scsp_dcs *, Scsp_msg *));
-int	scsp_hello_act_03 __P((Scsp_dcs *, Scsp_msg *));
-int	scsp_hello_act_04 __P((Scsp_dcs *, Scsp_msg *));
-int	scsp_hello_act_05 __P((Scsp_dcs *, Scsp_msg *));
-int	scsp_hello_act_06 __P((Scsp_dcs *, Scsp_msg *));
+int	scsp_hello_act_00(Scsp_dcs *, Scsp_msg *);
+int	scsp_hello_act_01(Scsp_dcs *, Scsp_msg *);
+int	scsp_hello_act_02(Scsp_dcs *, Scsp_msg *);
+int	scsp_hello_act_03(Scsp_dcs *, Scsp_msg *);
+int	scsp_hello_act_04(Scsp_dcs *, Scsp_msg *);
+int	scsp_hello_act_05(Scsp_dcs *, Scsp_msg *);
+int	scsp_hello_act_06(Scsp_dcs *, Scsp_msg *);
 
 static int (*scsp_action_vector[HELLO_ACTION_CNT])() = {
 	scsp_hello_act_00,
diff --git a/usr.sbin/atm/scspd/scsp_if.c b/usr.sbin/atm/scspd/scsp_if.c
index 18638c2..9d88f0a 100644
--- a/usr.sbin/atm/scspd/scsp_if.c
+++ b/usr.sbin/atm/scspd/scsp_if.c
@@ -70,28 +70,17 @@ __RCSID("@(#) $FreeBSD$");
  * SCSP client server interface FSM actions
  */
 #define	SCSP_CIFSM_ACTION_CNT	11
-int	scsp_client_act_00
-			__P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *));
-int	scsp_client_act_01
-			__P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *));
-int	scsp_client_act_02
-			__P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *));
-int	scsp_client_act_03
-			__P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *));
-int	scsp_client_act_04
-			__P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *));
-int	scsp_client_act_05
-			__P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *));
-int	scsp_client_act_06
-			__P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *));
-int	scsp_client_act_07
-			__P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *));
-int	scsp_client_act_08
-			__P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *));
-int	scsp_client_act_09
-			__P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *));
-int	scsp_client_act_10
-			__P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *));
+int	scsp_client_act_00(Scsp_dcs *, Scsp_msg *, Scsp_if_msg *);
+int	scsp_client_act_01(Scsp_dcs *, Scsp_msg *, Scsp_if_msg *);
+int	scsp_client_act_02(Scsp_dcs *, Scsp_msg *, Scsp_if_msg *);
+int	scsp_client_act_03(Scsp_dcs *, Scsp_msg *, Scsp_if_msg *);
+int	scsp_client_act_04(Scsp_dcs *, Scsp_msg *, Scsp_if_msg *);
+int	scsp_client_act_05(Scsp_dcs *, Scsp_msg *, Scsp_if_msg *);
+int	scsp_client_act_06(Scsp_dcs *, Scsp_msg *, Scsp_if_msg *);
+int	scsp_client_act_07(Scsp_dcs *, Scsp_msg *, Scsp_if_msg *);
+int	scsp_client_act_08(Scsp_dcs *, Scsp_msg *, Scsp_if_msg *);
+int	scsp_client_act_09(Scsp_dcs *, Scsp_msg *, Scsp_if_msg *);
+int	scsp_client_act_10(Scsp_dcs *, Scsp_msg *, Scsp_if_msg *);
 
 static int (*scsp_action_vector[SCSP_CIFSM_ACTION_CNT])() = {
 	scsp_client_act_00,
diff --git a/usr.sbin/atm/scspd/scsp_input.c b/usr.sbin/atm/scspd/scsp_input.c
index 20bd249..2e3fbb0 100644
--- a/usr.sbin/atm/scspd/scsp_input.c
+++ b/usr.sbin/atm/scspd/scsp_input.c
@@ -65,7 +65,7 @@ __RCSID("@(#) $FreeBSD$");
 #endif
 
 
-static int scsp_parse_atmarp __P((char *, int, Scsp_atmarp_csa **));
+static int scsp_parse_atmarp(char *, int, Scsp_atmarp_csa **);
 
 
 /*
diff --git a/usr.sbin/atm/scspd/scsp_var.h b/usr.sbin/atm/scspd/scsp_var.h
index 115ec42..fbbddc7 100644
--- a/usr.sbin/atm/scspd/scsp_var.h
+++ b/usr.sbin/atm/scspd/scsp_var.h
@@ -333,132 +333,128 @@ extern FILE		*scsp_trace_file;
  * Executable functions
  */
 /* scsp_cafsm.c */
-extern int	scsp_cafsm __P((Scsp_dcs *, int, void *));
+extern int	scsp_cafsm(Scsp_dcs *, int, void *);
 
 /* scsp_config.c */
-extern int	scsp_config __P((char *));
-extern int	start_dcs __P((void));
-extern int	finish_dcs __P((void));
-extern int	set_dcs_addr __P((char *, char *));
-extern int	set_dcs_ca_rexmit __P((int));
-extern int	set_dcs_csus_rexmit __P((int));
-extern int	set_dcs_csu_rexmit __P((int));
-extern int	set_dcs_csu_rexmit_max __P((int));
-extern int	set_dcs_hello_df __P((int));
-extern int	set_dcs_hello_int __P((int));
-extern int	set_dcs_hops __P((int));
-extern int	set_dcs_id __P((char *));
-extern int	set_intf __P((char *));
-extern int	set_protocol __P((int));
-extern int	set_server_group __P((int));
-extern int	start_server __P((char *));
-extern int	finish_server __P((void));
-extern int	set_log_file __P((char *));
+extern int	scsp_config(char *);
+extern int	start_dcs(void);
+extern int	finish_dcs(void);
+extern int	set_dcs_addr(char *, char *);
+extern int	set_dcs_ca_rexmit(int);
+extern int	set_dcs_csus_rexmit(int);
+extern int	set_dcs_csu_rexmit(int);
+extern int	set_dcs_csu_rexmit_max(int);
+extern int	set_dcs_hello_df(int);
+extern int	set_dcs_hello_int(int);
+extern int	set_dcs_hops(int);
+extern int	set_dcs_id(char *);
+extern int	set_intf(char *);
+extern int	set_protocol(int);
+extern int	set_server_group(int);
+extern int	start_server(char *);
+extern int	finish_server(void);
+extern int	set_log_file(char *);
 
 /* scsp_config_lex.c */
-extern int	yylex __P((void));
+extern int	yylex(void);
 
 /* scsp_config_parse.y */
 #if __STDC__
-extern void	parse_error __P((const char *, ...));
+extern void	parse_error(const char *, ...);
 #else
-extern void	parse_error __P((char *, va_alist));
+extern void	parse_error(char *, va_alist);
 #endif
 
 /* scsp_hfsm.c */
-extern int	scsp_hfsm __P((Scsp_dcs *, int, Scsp_msg *));
+extern int	scsp_hfsm(Scsp_dcs *, int, Scsp_msg *);
 
 /* scsp_if.c */
-extern int	scsp_cfsm __P((Scsp_dcs *, int, Scsp_msg *,
-			Scsp_if_msg *));
+extern int	scsp_cfsm(Scsp_dcs *, int, Scsp_msg *, Scsp_if_msg *);
 
 /* scsp_input.c */
-extern void	scsp_free_msg __P((Scsp_msg *));
-extern Scsp_msg	*scsp_parse_msg __P((char *, int));
+extern void	scsp_free_msg(Scsp_msg *);
+extern Scsp_msg	*scsp_parse_msg(char *, int);
 
 /* scsp_log.c */
 #if __STDC__
-extern void	scsp_log __P((const int, const char *, ...));
-extern void	scsp_trace __P((const char *, ...));
+extern void	scsp_log(const int, const char *, ...);
+extern void	scsp_trace(const char *, ...);
 #else
-extern void	scsp_log __P((int, char *, va_alist));
-extern void	scsp_trace __P((const char *, va_alist));
+extern void	scsp_log(int, char *, va_alist);
+extern void	scsp_trace(const char *, va_alist);
 #endif
-extern void	scsp_open_trace __P(());
-extern void	scsp_trace_msg __P((Scsp_dcs *, Scsp_msg *, int));
-extern void	scsp_mem_err __P((char *));
+extern void	scsp_open_trace();
+extern void	scsp_trace_msg(Scsp_dcs *, Scsp_msg *, int);
+extern void	scsp_mem_err(char *);
 
 /* scsp_msg.c */
-extern void	scsp_csus_ack __P((Scsp_dcs *, Scsp_msg *));
-extern int	scsp_send_ca __P((Scsp_dcs *));
-extern int	scsp_send_csus __P((Scsp_dcs *));
-extern int	scsp_send_csu_req __P((Scsp_dcs *, Scsp_csa *));
-extern int	scsp_send_csu_reply __P((Scsp_dcs *, Scsp_csa *));
-extern int	scsp_send_hello __P((Scsp_dcs *));
+extern void	scsp_csus_ack(Scsp_dcs *, Scsp_msg *);
+extern int	scsp_send_ca(Scsp_dcs *);
+extern int	scsp_send_csus(Scsp_dcs *);
+extern int	scsp_send_csu_req(Scsp_dcs *, Scsp_csa *);
+extern int	scsp_send_csu_reply(Scsp_dcs *, Scsp_csa *);
+extern int	scsp_send_hello(Scsp_dcs *);
 
 /* scsp_output.c */
-extern int	scsp_format_msg __P((Scsp_dcs *, Scsp_msg *, char **));
-extern int	scsp_send_msg __P((Scsp_dcs *, Scsp_msg *));
+extern int	scsp_format_msg(Scsp_dcs *, Scsp_msg *, char **);
+extern int	scsp_send_msg(Scsp_dcs *, Scsp_msg *);
 
 /* scsp_print.c */
-extern char	*format_hfsm_state __P((int));
-extern char	*format_hfsm_event __P((int));
-extern char	*format_cafsm_state __P((int));
-extern char	*format_cafsm_event __P((int));
-extern char	*format_cifsm_state __P((int));
-extern char	*format_cifsm_event __P((int));
-extern void	print_scsp_cse __P((FILE *, Scsp_cse *));
-extern void	print_scsp_msg __P((FILE *, Scsp_msg *));
-extern void	print_scsp_if_msg __P((FILE *, Scsp_if_msg *));
-extern void	print_scsp_pending __P((FILE *, Scsp_pending *));
-extern void	print_scsp_server __P((FILE *, Scsp_server *));
-extern void	print_scsp_dcs __P((FILE *, Scsp_dcs *));
-extern void	print_scsp_dump __P(());
+extern char	*format_hfsm_state(int);
+extern char	*format_hfsm_event(int);
+extern char	*format_cafsm_state(int);
+extern char	*format_cafsm_event(int);
+extern char	*format_cifsm_state(int);
+extern char	*format_cifsm_event(int);
+extern void	print_scsp_cse(FILE *, Scsp_cse *);
+extern void	print_scsp_msg(FILE *, Scsp_msg *);
+extern void	print_scsp_if_msg(FILE *, Scsp_if_msg *);
+extern void	print_scsp_pending(FILE *, Scsp_pending *);
+extern void	print_scsp_server(FILE *, Scsp_server *);
+extern void	print_scsp_dcs(FILE *, Scsp_dcs *);
+extern void	print_scsp_dump();
 
 /* scsp_socket.c */
-extern Scsp_dcs *	scsp_find_dcs __P((int));
-extern Scsp_server *	scsp_find_server __P((int));
-extern int		scsp_dcs_connect __P((Scsp_dcs *));
-extern int		scsp_dcs_listen __P((Scsp_server *));
-extern Scsp_dcs *	scsp_dcs_accept __P((Scsp_server *));
-extern int		scsp_dcs_read __P((Scsp_dcs *));
-extern int		scsp_server_listen __P(());
-extern int		scsp_server_accept __P((int));
-extern Scsp_if_msg *	scsp_if_sock_read __P((int));
-extern int		scsp_if_sock_write __P((int, Scsp_if_msg *));
-extern int		scsp_server_read __P((Scsp_server *));
-extern int		scsp_send_cache_ind __P((Scsp_server *));
-extern int		scsp_pending_read __P((Scsp_pending *));
+extern Scsp_dcs *	scsp_find_dcs(int);
+extern Scsp_server *	scsp_find_server(int);
+extern int		scsp_dcs_connect(Scsp_dcs *);
+extern int		scsp_dcs_listen(Scsp_server *);
+extern Scsp_dcs *	scsp_dcs_accept(Scsp_server *);
+extern int		scsp_dcs_read(Scsp_dcs *);
+extern int		scsp_server_listen();
+extern int		scsp_server_accept(int);
+extern Scsp_if_msg *	scsp_if_sock_read(int);
+extern int		scsp_if_sock_write(int, Scsp_if_msg *);
+extern int		scsp_server_read(Scsp_server *);
+extern int		scsp_send_cache_ind(Scsp_server *);
+extern int		scsp_pending_read(Scsp_pending *);
 
 /* scsp_subr.c */
-extern int		scsp_hash __P((Scsp_ckey *));
-extern int		scsp_cmp_id __P((Scsp_id *, Scsp_id *));
-extern int		scsp_cmp_key __P((Scsp_ckey *, Scsp_ckey *));
-extern int		scsp_is_atmarp_server __P((char *));
-extern Scsp_cse *	scsp_dup_cse __P((Scsp_cse *));
-extern Scsp_csa *	scsp_dup_csa __P((Scsp_csa *));
-extern Scsp_csa *	scsp_cse2csas __P((Scsp_cse *));
-extern void		scsp_dcs_cleanup __P((Scsp_dcs *));
-extern void		scsp_dcs_delete __P((Scsp_dcs *));
-extern void		scsp_server_shutdown __P((Scsp_server *));
-extern void		scsp_server_delete __P((Scsp_server *));
-extern int		scsp_get_server_info __P((Scsp_server *));
-extern void		scsp_process_ca __P((Scsp_dcs *, Scsp_ca *));
-extern void		scsp_process_cache_rsp __P((Scsp_server *,
-				Scsp_if_msg *));
-extern int		scsp_propagate_csa __P(( Scsp_dcs *,
-				Scsp_csa *));
-extern void		scsp_update_cache __P(( Scsp_dcs *,
-				Scsp_csa *));
-extern void		scsp_reconfigure __P(());
+extern int		scsp_hash(Scsp_ckey *);
+extern int		scsp_cmp_id(Scsp_id *, Scsp_id *);
+extern int		scsp_cmp_key(Scsp_ckey *, Scsp_ckey *);
+extern int		scsp_is_atmarp_server(char *);
+extern Scsp_cse *	scsp_dup_cse(Scsp_cse *);
+extern Scsp_csa *	scsp_dup_csa(Scsp_csa *);
+extern Scsp_csa *	scsp_cse2csas(Scsp_cse *);
+extern void		scsp_dcs_cleanup(Scsp_dcs *);
+extern void		scsp_dcs_delete(Scsp_dcs *);
+extern void		scsp_server_shutdown(Scsp_server *);
+extern void		scsp_server_delete(Scsp_server *);
+extern int		scsp_get_server_info(Scsp_server *);
+extern void		scsp_process_ca(Scsp_dcs *, Scsp_ca *);
+extern void		scsp_process_cache_rsp(Scsp_server *, Scsp_if_msg *);
+extern int		scsp_propagate_csa( Scsp_dcs *, Scsp_csa *);
+extern void		scsp_update_cache( Scsp_dcs *, Scsp_csa *);
+extern void		scsp_reconfigure();
 
 /* scsp_timer.c */
-extern void	scsp_open_timeout __P((Harp_timer *));
-extern void	scsp_hello_timeout __P((Harp_timer *));
-extern void	scsp_hello_rcv_timeout __P((Harp_timer *));
-extern void	scsp_ca_retran_timeout __P((Harp_timer *));
-extern void	scsp_csus_retran_timeout __P((Harp_timer *));
-extern void	scsp_csu_req_retran_timeout __P((Harp_timer *));
+extern void	scsp_open_timeout(Harp_timer *);
+extern void	scsp_hello_timeout(Harp_timer *);
+extern void	scsp_hello_rcv_timeout(Harp_timer *);
+extern void	scsp_ca_retran_timeout(Harp_timer *);
+extern void	scsp_csus_retran_timeout(Harp_timer *);
+extern void	scsp_csu_req_retran_timeout(Harp_timer *);