From fa3791e1a7df72dae386c39862c6dad9fb7a5304 Mon Sep 17 00:00:00 2001 From: kevlo Date: Wed, 7 Nov 2007 10:53:41 +0000 Subject: Cleanup of userland __P use --- usr.sbin/faithd/faithd.c | 30 +++++++++++++++--------------- usr.sbin/faithd/faithd.h | 12 ++++++------ usr.sbin/faithd/ftp.c | 10 +++++----- usr.sbin/faithd/prefix.c | 8 ++++---- usr.sbin/faithd/prefix.h | 8 ++++---- usr.sbin/faithd/tcp.c | 12 ++++++------ 6 files changed, 40 insertions(+), 40 deletions(-) (limited to 'usr.sbin/faithd') diff --git a/usr.sbin/faithd/faithd.c b/usr.sbin/faithd/faithd.c index 2191f55..f192fbd 100644 --- a/usr.sbin/faithd/faithd.c +++ b/usr.sbin/faithd/faithd.c @@ -100,22 +100,22 @@ static int pflag = 0; static int inetd = 0; static char *configfile = NULL; -int main __P((int, char **)); -static int inetd_main __P((int, char **)); -static int daemon_main __P((int, char **)); -static void play_service __P((int)); -static void play_child __P((int, struct sockaddr *)); -static int faith_prefix __P((struct sockaddr *)); -static int map6to4 __P((struct sockaddr_in6 *, struct sockaddr_in *)); -static void sig_child __P((int)); -static void sig_terminate __P((int)); -static void start_daemon __P((void)); -static void exit_stderr __P((const char *, ...)) +int main(int, char **); +static int inetd_main(int, char **); +static int daemon_main(int, char **); +static void play_service(int); +static void play_child(int, struct sockaddr *); +static int faith_prefix(struct sockaddr *); +static int map6to4(struct sockaddr_in6 *, struct sockaddr_in *); +static void sig_child(int); +static void sig_terminate(int); +static void start_daemon(void); +static void exit_stderr(const char *, ...) __attribute__((__format__(__printf__, 1, 2))); -static void grab_myaddrs __P((void)); -static void free_myaddrs __P((void)); -static void update_myaddrs __P((void)); -static void usage __P((void)); +static void grab_myaddrs(void); +static void free_myaddrs(void); +static void update_myaddrs(void); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/faithd/faithd.h b/usr.sbin/faithd/faithd.h index f422432..c578d46 100644 --- a/usr.sbin/faithd/faithd.h +++ b/usr.sbin/faithd/faithd.h @@ -34,13 +34,13 @@ extern char logname[]; extern int dflag; -extern void tcp_relay __P((int, int, const char *)); -extern void ftp_relay __P((int, int)); -extern int ftp_active __P((int, int, int *, int *)); -extern int ftp_passive __P((int, int, int *, int *)); -extern void exit_success __P((const char *, ...)) +extern void tcp_relay(int, int, const char *); +extern void ftp_relay(int, int); +extern int ftp_active(int, int, int *, int *); +extern int ftp_passive(int, int, int *, int *); +extern void exit_success(const char *, ...) __attribute__((__format__(__printf__, 1, 2))); -extern void exit_failure __P((const char *, ...)) +extern void exit_failure(const char *, ...) __attribute__((__format__(__printf__, 1, 2))); #define DEFAULT_PORT_NAME "telnet" diff --git a/usr.sbin/faithd/ftp.c b/usr.sbin/faithd/ftp.c index 19ad5ee..c54371a 100644 --- a/usr.sbin/faithd/ftp.c +++ b/usr.sbin/faithd/ftp.c @@ -67,11 +67,11 @@ static int epsvall = 0; enum state { NONE, LPRT, EPRT, LPSV, EPSV }; -static int ftp_activeconn __P((void)); -static int ftp_passiveconn __P((void)); -static int ftp_copy __P((int, int)); -static int ftp_copyresult __P((int, int, enum state)); -static int ftp_copycommand __P((int, int, enum state *)); +static int ftp_activeconn(void); +static int ftp_passiveconn(void); +static int ftp_copy(int, int); +static int ftp_copyresult(int, int, enum state); +static int ftp_copycommand(int, int, enum state *); void ftp_relay(int ctl6, int ctl4) diff --git a/usr.sbin/faithd/prefix.c b/usr.sbin/faithd/prefix.c index 138c948..6a3f66b 100644 --- a/usr.sbin/faithd/prefix.c +++ b/usr.sbin/faithd/prefix.c @@ -47,11 +47,11 @@ #include "faithd.h" #include "prefix.h" -static int prefix_set __P((const char *, struct prefix *, int)); -static struct config *config_load1 __P((const char *)); +static int prefix_set(const char *, struct prefix *, int); +static struct config *config_load1(const char *); #if 0 -static void config_show1 __P((const struct config *)); -static void config_show __P((void)); +static void config_show1(const struct config *); +static void config_show(void); #endif struct config *config_list = NULL; diff --git a/usr.sbin/faithd/prefix.h b/usr.sbin/faithd/prefix.h index 2a29639..4d6b3d5 100644 --- a/usr.sbin/faithd/prefix.h +++ b/usr.sbin/faithd/prefix.h @@ -46,7 +46,7 @@ struct config { #define _PATH_PREFIX_CONF "/etc/faithd.conf" -extern const char *prefix_string __P((const struct prefix *)); -extern int prefix_match __P((const struct prefix *, const struct sockaddr *)); -extern int config_load __P((const char *)); -extern const struct config *config_match __P((struct sockaddr *, struct sockaddr *)); +extern const char *prefix_string(const struct prefix *); +extern int prefix_match(const struct prefix *, const struct sockaddr *); +extern int config_load(const char *); +extern const struct config *config_match(struct sockaddr *, struct sockaddr *); diff --git a/usr.sbin/faithd/tcp.c b/usr.sbin/faithd/tcp.c index 825ea35..2197694 100644 --- a/usr.sbin/faithd/tcp.c +++ b/usr.sbin/faithd/tcp.c @@ -64,12 +64,12 @@ static pid_t ppid = (pid_t)0; volatile time_t child_lastactive = (time_t)0; static time_t parent_lastactive = (time_t)0; -static void sig_ctimeout __P((int)); -static void sig_child __P((int)); -static void notify_inactive __P((void)); -static void notify_active __P((void)); -static void send_data __P((int, int, const char *, int)); -static void relay __P((int, int, const char *, int)); +static void sig_ctimeout(int); +static void sig_child(int); +static void notify_inactive(void); +static void notify_active(void); +static void send_data(int, int, const char *, int); +static void relay(int, int, const char *, int); /* * Inactivity timer: -- cgit v1.1