diff options
| -rw-r--r-- | release/picobsd/tinyware/login/pico-login.c | 38 | ||||
| -rw-r--r-- | release/picobsd/tinyware/oinit/oinit.c | 22 | ||||
| -rw-r--r-- | release/picobsd/tinyware/passwd/pw_copy.c | 2 | ||||
| -rw-r--r-- | release/picobsd/tinyware/view/view.c | 2 | ||||
| -rw-r--r-- | sbin/atm/atm/atm.h | 134 | ||||
| -rw-r--r-- | sbin/atm/atm/atm_show.c | 6 | ||||
| -rw-r--r-- | sbin/atm/ilmid/ilmid.c | 6 | ||||
| -rw-r--r-- | share/man/man9/accept_filter.9 | 9 | ||||
| -rw-r--r-- | share/man/man9/domain.9 | 8 | ||||
| -rw-r--r-- | share/man/man9/kthread.9 | 2 | ||||
| -rw-r--r-- | share/man/man9/vnode.9 | 2 | ||||
| -rw-r--r-- | usr.sbin/atm/atmarpd/atmarp_var.h | 57 | ||||
| -rw-r--r-- | usr.sbin/atm/scspd/scsp_cafsm.c | 40 | ||||
| -rw-r--r-- | usr.sbin/atm/scspd/scsp_config.c | 2 | ||||
| -rw-r--r-- | usr.sbin/atm/scspd/scsp_config_parse.y | 2 | ||||
| -rw-r--r-- | usr.sbin/atm/scspd/scsp_hfsm.c | 14 | ||||
| -rw-r--r-- | usr.sbin/atm/scspd/scsp_if.c | 33 | ||||
| -rw-r--r-- | usr.sbin/atm/scspd/scsp_input.c | 2 | ||||
| -rw-r--r-- | usr.sbin/atm/scspd/scsp_var.h | 184 |
19 files changed, 273 insertions, 292 deletions
diff --git a/release/picobsd/tinyware/login/pico-login.c b/release/picobsd/tinyware/login/pico-login.c index 2df7a7d..9d3ef4c 100644 --- a/release/picobsd/tinyware/login/pico-login.c +++ b/release/picobsd/tinyware/login/pico-login.c @@ -91,24 +91,24 @@ static const char rcsid[] = #define NI_WITHSCOPEID 0 #endif -void badlogin __P((char *)); -void checknologin __P((void)); -void dolastlog __P((int)); -void getloginname __P((void)); -void motd __P((const char *)); -int rootterm __P((char *)); -void sigint __P((int)); -void sleepexit __P((int)); -void refused __P((char *,char *,int)); -char *stypeof __P((char *)); -void timedout __P((int)); -int login_access __P((char *, char *)); -void login_fbtab __P((char *, uid_t, gid_t)); +void badlogin(char *); +void checknologin(void); +void dolastlog(int); +void getloginname(void); +void motd(const char *); +int rootterm(char *); +void sigint(int); +void sleepexit(int); +void refused(char *,char *,int); +char *stypeof(char *); +void timedout(int); +int login_access(char *, char *); +void login_fbtab(char *, uid_t, gid_t); #ifdef USE_PAM -static int auth_pam __P((void)); -static int export_pam_environment __P((void)); -static int ok_to_export __P((const char *)); +static int auth_pam(void); +static int export_pam_environment(void); +static int ok_to_export(const char *); static pam_handle_t *pamh = NULL; static char **environ_pam; @@ -123,9 +123,9 @@ static char **environ_pam; } #endif -static int auth_traditional __P((void)); -extern void login __P((struct utmp *)); -static void usage __P((void)); +static int auth_traditional(void); +extern void login(struct utmp *); +static void usage(void); #define TTYGRPNAME "tty" /* name of group to own ttys */ #define DEFAULT_BACKOFF 3 diff --git a/release/picobsd/tinyware/oinit/oinit.c b/release/picobsd/tinyware/oinit/oinit.c index 87b2448..b02434a 100644 --- a/release/picobsd/tinyware/oinit/oinit.c +++ b/release/picobsd/tinyware/oinit/oinit.c @@ -99,17 +99,17 @@ struct command { }; /* Prototypes */ -int cd __P((char *)); -int pwd __P((char *)); -int echo __P((char *)); -int xit __P((char *)); -int set __P((char *)); -int unset __P((char *)); -int env __P((char *)); -int help __P((char *)); -int sourcer __P((char *)); -void do_command __P((int shell, char *cmdline)); -void transition_handler __P((int)); +int cd(char *); +int pwd(char *); +int echo(char *); +int xit(char *); +int set(char *); +int unset(char *); +int env(char *); +int help(char *); +int sourcer(char *); +void do_command(int shell, char *cmdline); +void transition_handler(int); /* Table of built-in functions */ struct command bltins[]={ diff --git a/release/picobsd/tinyware/passwd/pw_copy.c b/release/picobsd/tinyware/passwd/pw_copy.c index 681eea8..f9efa12 100644 --- a/release/picobsd/tinyware/passwd/pw_copy.c +++ b/release/picobsd/tinyware/passwd/pw_copy.c @@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$"); #include <pw_scan.h> #endif extern int pw_big_ids_warning; -extern int pw_scan __P((char *, struct passwd *)); +extern int pw_scan(char *, struct passwd *); #include <pw_util.h> diff --git a/release/picobsd/tinyware/view/view.c b/release/picobsd/tinyware/view/view.c index 1cdc0aa..2727ebe 100644 --- a/release/picobsd/tinyware/view/view.c +++ b/release/picobsd/tinyware/view/view.c @@ -48,7 +48,7 @@ extern char *optarg; extern int optind; /* Prototypes */ -int kbd_action __P((int x, int y, char hotkey)); +int kbd_action(int x, int y, char hotkey); struct action { int zoom; diff --git a/sbin/atm/atm/atm.h b/sbin/atm/atm/atm.h index 6255680..ff006b4 100644 --- a/sbin/atm/atm/atm.h +++ b/sbin/atm/atm/atm.h @@ -54,7 +54,7 @@ struct cmd { int minp; /* Minimum number of parameters */ int maxp; /* Maximum number of parameters */ void (*func) /* Processing function */ - __P((int, char **, struct cmd *)); +(int, char **, struct cmd *); char *help; /* User help string */ }; @@ -128,86 +128,86 @@ extern char prefix[]; /* Current command prefix */ * Global function declarations */ /* atm.c */ -int do_cmd __P((struct cmd *, int, char **)); -void usage __P((struct cmd *, char *)); -void attach __P((int, char **, struct cmd *)); -void detach __P((int, char **, struct cmd *)); -void pvc_add __P((int, char **, struct cmd *)); -void arp_add __P((int, char **, struct cmd *)); -void pvc_dlt __P((int, char **, struct cmd *)); -void svc_dlt __P((int, char **, struct cmd *)); -void vcc_dlt __P((int, char **, struct cmd *, struct atmdelreq *)); -void arp_dlt __P((int, char **, struct cmd *)); -void help __P((int, char **, struct cmd *)); +int do_cmd(struct cmd *, int, char **); +void usage(struct cmd *, char *); +void attach(int, char **, struct cmd *); +void detach(int, char **, struct cmd *); +void pvc_add(int, char **, struct cmd *); +void arp_add(int, char **, struct cmd *); +void pvc_dlt(int, char **, struct cmd *); +void svc_dlt(int, char **, struct cmd *); +void vcc_dlt(int, char **, struct cmd *, struct atmdelreq *); +void arp_dlt(int, char **, struct cmd *); +void help(int, char **, struct cmd *); /* atm_eni.c */ -void show_eni_stats __P((char *, int, char **)); -void print_eni_oc3 __P((struct air_vinfo_rsp *)); -void print_eni_atm __P((struct air_vinfo_rsp *)); -void print_eni_aal0 __P((struct air_vinfo_rsp *)); -void print_eni_aal5 __P((struct air_vinfo_rsp *)); -void print_eni_driver __P((struct air_vinfo_rsp *)); +void show_eni_stats(char *, int, char **); +void print_eni_oc3(struct air_vinfo_rsp *); +void print_eni_atm(struct air_vinfo_rsp *); +void print_eni_aal0(struct air_vinfo_rsp *); +void print_eni_aal5(struct air_vinfo_rsp *); +void print_eni_driver(struct air_vinfo_rsp *); /* atm_fore200.c */ -void show_fore200_stats __P((char *, int, char **)); -void print_fore200_taxi __P((struct air_vinfo_rsp *)); -void print_fore200_oc3 __P((struct air_vinfo_rsp *)); -void print_fore200_dev __P((struct air_vinfo_rsp *)); -void print_fore200_atm __P((struct air_vinfo_rsp *)); -void print_fore200_aal0 __P((struct air_vinfo_rsp *)); -void print_fore200_aal4 __P((struct air_vinfo_rsp *)); -void print_fore200_aal5 __P((struct air_vinfo_rsp *)); -void print_fore200_driver __P((struct air_vinfo_rsp *)); +void show_fore200_stats(char *, int, char **); +void print_fore200_taxi(struct air_vinfo_rsp *); +void print_fore200_oc3(struct air_vinfo_rsp *); +void print_fore200_dev(struct air_vinfo_rsp *); +void print_fore200_atm(struct air_vinfo_rsp *); +void print_fore200_aal0(struct air_vinfo_rsp *); +void print_fore200_aal4(struct air_vinfo_rsp *); +void print_fore200_aal5(struct air_vinfo_rsp *); +void print_fore200_driver(struct air_vinfo_rsp *); /* atm_inet.c */ void ip_pvcadd __P((int, char **, struct cmd *, struct atmaddreq *, struct air_int_rsp *)); /* atm_print.c */ -void print_arp_info __P((struct air_arp_rsp *)); -void print_asrv_info __P((struct air_asrv_rsp *)); -void print_cfg_info __P((struct air_cfg_rsp *)); -void print_intf_info __P((struct air_int_rsp *)); -void print_ip_vcc_info __P((struct air_ip_vcc_rsp *)); -void print_netif_info __P((struct air_netif_rsp *)); -void print_intf_stats __P((struct air_phy_stat_rsp *)); -void print_vcc_stats __P((struct air_vcc_rsp *)); -void print_vcc_info __P((struct air_vcc_rsp *)); -void print_version_info __P((struct air_version_rsp *)); +void print_arp_info(struct air_arp_rsp *); +void print_asrv_info(struct air_asrv_rsp *); +void print_cfg_info(struct air_cfg_rsp *); +void print_intf_info(struct air_int_rsp *); +void print_ip_vcc_info(struct air_ip_vcc_rsp *); +void print_netif_info(struct air_netif_rsp *); +void print_intf_stats(struct air_phy_stat_rsp *); +void print_vcc_stats(struct air_vcc_rsp *); +void print_vcc_info(struct air_vcc_rsp *); +void print_version_info(struct air_version_rsp *); /* atm_set.c */ -void set_arpserver __P((int, char **, struct cmd *)); -void set_macaddr __P((int, char **, struct cmd *)); -void set_netif __P((int, char **, struct cmd *)); -void set_prefix __P((int, char **, struct cmd *)); +void set_arpserver(int, char **, struct cmd *); +void set_macaddr(int, char **, struct cmd *); +void set_netif(int, char **, struct cmd *); +void set_prefix(int, char **, struct cmd *); /* atm_show.c */ -void show_arp __P((int, char **, struct cmd *)); -void show_arpserv __P((int, char **, struct cmd *)); -void show_config __P((int, char **, struct cmd *)); -void show_intf __P((int, char **, struct cmd *)); -void show_ip_vcc __P((int, char **, struct cmd *)); -void show_netif __P((int, char **, struct cmd *)); -void show_intf_stats __P((int, char **, struct cmd *)); -void show_vcc_stats __P((int, char **, struct cmd *)); -void show_vcc __P((int, char **, struct cmd *)); -void show_version __P((int, char **, struct cmd *)); +void show_arp(int, char **, struct cmd *); +void show_arpserv(int, char **, struct cmd *); +void show_config(int, char **, struct cmd *); +void show_intf(int, char **, struct cmd *); +void show_ip_vcc(int, char **, struct cmd *); +void show_netif(int, char **, struct cmd *); +void show_intf_stats(int, char **, struct cmd *); +void show_vcc_stats(int, char **, struct cmd *); +void show_vcc(int, char **, struct cmd *); +void show_version(int, char **, struct cmd *); /* atm_subr.c */ -char * get_vendor __P((int)); -char * get_adapter __P((int)); -char * get_media_type __P((int)); -char * get_bus_type __P((int)); -char * get_bus_slot_info __P((int, u_long)); -char * get_adapter_name __P((char *)); -int do_info_ioctl __P((struct atminfreq *, int)); -int get_vcc_info __P((char *, struct air_vcc_rsp **)); -int verify_nif_name __P((char *)); +char * get_vendor(int); +char * get_adapter(int); +char * get_media_type(int); +char * get_bus_type(int); +char * get_bus_slot_info(int, u_long); +char * get_adapter_name(char *); +int do_info_ioctl(struct atminfreq *, int); +int get_vcc_info(char *, struct air_vcc_rsp **); +int verify_nif_name(char *); struct sockaddr_in * - get_ip_addr __P((char *)); -int get_hex_addr __P((char *, u_char *, int)); -char * format_mac_addr __P((Mac_addr *)); -int parse_ip_prefix __P((char *, struct in_addr *)); -int compress_prefix_list __P((struct in_addr *, int)); -void check_netif_name __P((char *)); -void sock_error __P((int)); + get_ip_addr(char *); +int get_hex_addr(char *, u_char *, int); +char * format_mac_addr(Mac_addr *); +int parse_ip_prefix(char *, struct in_addr *); +int compress_prefix_list(struct in_addr *, int); +void check_netif_name(char *); +void sock_error(int); diff --git a/sbin/atm/atm/atm_show.c b/sbin/atm/atm/atm_show.c index 10db673..a6a3bc8 100644 --- a/sbin/atm/atm/atm_show.c +++ b/sbin/atm/atm/atm_show.c @@ -63,9 +63,9 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static int vcc_compare __P((const void *, const void *)); -static int ip_vcc_compare __P((const void *, const void *)); -static int arp_compare __P((const void *, const void *)); +static int vcc_compare(const void *, const void *); +static int ip_vcc_compare(const void *, const void *); +static int arp_compare(const void *, const void *); /* diff --git a/sbin/atm/ilmid/ilmid.c b/sbin/atm/ilmid/ilmid.c index 2a194c0..40b7771 100644 --- a/sbin/atm/ilmid/ilmid.c +++ b/sbin/atm/ilmid/ilmid.c @@ -335,9 +335,9 @@ char hostname[80]; #define LOG_FILE "/var/log/ilmid" FILE *Log; /* File descriptor for log messages */ -void set_reqid __P ( ( u_char *, int ) ); -void Increment_DL __P ( ( int ) ); -void Decrement_DL __P ( ( int ) ); +void set_reqid( u_char *, int ); +void Increment_DL( int ); +void Decrement_DL( int ); static char *Months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; diff --git a/share/man/man9/accept_filter.9 b/share/man/man9/accept_filter.9 index 80bd4e3..eb791ae 100644 --- a/share/man/man9/accept_filter.9 +++ b/share/man/man9/accept_filter.9 @@ -64,12 +64,9 @@ must provide a struct accept_filter to the system: .Bd -literal struct accept_filter { char accf_name[16]; - void (*accf_callback) - __P((struct socket *so, void *arg, int waitflag)); - void * (*accf_create) - __P((struct socket *so, char *arg)); - void (*accf_destroy) - __P((struct socket *so)); + void (*accf_callback)(struct socket *so, void *arg, int waitflag); + void * (*accf_create)(struct socket *so, char *arg); + void (*accf_destroy)(struct socket *so); SLIST_ENTRY(accept_filter) accf_next; /* next on the list */ }; .Ed diff --git a/share/man/man9/domain.9 b/share/man/man9/domain.9 index f3d403f..56164ac 100644 --- a/share/man/man9/domain.9 +++ b/share/man/man9/domain.9 @@ -66,15 +66,15 @@ struct domain { int dom_family; /* AF_xxx */ char *dom_name; void (*dom_init) /* initialize domain data structures */ - __P((void)); + (void); int (*dom_externalize) /* externalize access rights */ - __P((struct mbuf *, struct mbuf **)); + (struct mbuf *, struct mbuf **); void (*dom_dispose) /* dispose of internalized rights */ - __P((struct mbuf *)); + (struct mbuf *); struct protosw *dom_protosw, *dom_protoswNPROTOSW; struct domain *dom_next; int (*dom_rtattach) /* initialize routing table */ - __P((void **, int)); + (void **, int); int dom_rtoffset; /* an arg to rtattach, in bits */ int dom_maxrtkey; /* for routing layer */ }; diff --git a/share/man/man9/kthread.9 b/share/man/man9/kthread.9 index 6091404..150efed 100644 --- a/share/man/man9/kthread.9 +++ b/share/man/man9/kthread.9 @@ -69,7 +69,7 @@ which describes the kernel thread that should be created: .Bd -literal -offset indent struct kproc_desc { char *arg0; - void (*func) __P((void)); + void (*func)(void); struct proc **global_procpp; }; .Ed diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9 index 4c17884..84510f2 100644 --- a/share/man/man9/vnode.9 +++ b/share/man/man9/vnode.9 @@ -62,7 +62,7 @@ enum vtagtype { */ TAILQ_HEAD(buflists, buf); -typedef int vop_t __P((void *)); +typedef int vop_t(void *); struct namecache; /* 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 *); |
