diff --git a/usr.sbin/inetd/builtins.c b/usr.sbin/inetd/builtins.c index bf4413c87db6..d0988bec4f9b 100644 --- a/usr.sbin/inetd/builtins.c +++ b/usr.sbin/inetd/builtins.c @@ -52,21 +52,21 @@ #include "inetd.h" -void chargen_dg __P((int, struct servtab *)); -void chargen_stream __P((int, struct servtab *)); -void daytime_dg __P((int, struct servtab *)); -void daytime_stream __P((int, struct servtab *)); -void discard_dg __P((int, struct servtab *)); -void discard_stream __P((int, struct servtab *)); -void echo_dg __P((int, struct servtab *)); -void echo_stream __P((int, struct servtab *)); -static int getline __P((int, char *, int)); -void iderror __P((int, int, int, const char *)); -void ident_stream __P((int, struct servtab *)); -void initring __P((void)); -unsigned long machtime __P((void)); -void machtime_dg __P((int, struct servtab *)); -void machtime_stream __P((int, struct servtab *)); +void chargen_dg(int, struct servtab *); +void chargen_stream(int, struct servtab *); +void daytime_dg(int, struct servtab *); +void daytime_stream(int, struct servtab *); +void discard_dg(int, struct servtab *); +void discard_stream(int, struct servtab *); +void echo_dg(int, struct servtab *); +void echo_stream(int, struct servtab *); +static int getline(int, char *, int); +void iderror(int, int, int, const char *); +void ident_stream(int, struct servtab *); +void initring(void); +unsigned long machtime(void); +void machtime_dg(int, struct servtab *); +void machtime_stream(int, struct servtab *); char ring[128]; char *endring; diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index 8f882af3cec9..60fa9406bd99 100644 --- a/usr.sbin/inetd/inetd.c +++ b/usr.sbin/inetd/inetd.c @@ -204,30 +204,30 @@ static const char rcsid[] = #define SIGBLOCK (sigmask(SIGCHLD)|sigmask(SIGHUP)|sigmask(SIGALRM)) -void close_sep __P((struct servtab *)); -void flag_signal __P((int)); -void flag_config __P((int)); -void config __P((void)); -int cpmip __P((const struct servtab *, int)); -void endconfig __P((void)); -struct servtab *enter __P((struct servtab *)); -void freeconfig __P((struct servtab *)); -struct servtab *getconfigent __P((void)); -int matchservent __P((const char *, const char *, const char *)); -char *nextline __P((FILE *)); -void addchild __P((struct servtab *, int)); -void flag_reapchild __P((int)); -void reapchild __P((void)); -void enable __P((struct servtab *)); -void disable __P((struct servtab *)); -void flag_retry __P((int)); -void retry __P((void)); -int setconfig __P((void)); -void setup __P((struct servtab *)); +void close_sep(struct servtab *); +void flag_signal(int); +void flag_config(int); +void config(void); +int cpmip(const struct servtab *, int); +void endconfig(void); +struct servtab *enter(struct servtab *); +void freeconfig(struct servtab *); +struct servtab *getconfigent(void); +int matchservent(const char *, const char *, const char *); +char *nextline(FILE *); +void addchild(struct servtab *, int); +void flag_reapchild(int); +void reapchild(void); +void enable(struct servtab *); +void disable(struct servtab *); +void flag_retry(int); +void retry(void); +int setconfig(void); +void setup(struct servtab *); #ifdef IPSEC -void ipsecsetup __P((struct servtab *)); +void ipsecsetup(struct servtab *); #endif -void unregisterrpc __P((register struct servtab *sep)); +void unregisterrpc(register struct servtab *sep); int allow_severity; int deny_severity; diff --git a/usr.sbin/inetd/inetd.h b/usr.sbin/inetd/inetd.h index 116f1da41961..1e0f088acc9f 100644 --- a/usr.sbin/inetd/inetd.h +++ b/usr.sbin/inetd/inetd.h @@ -110,19 +110,19 @@ struct servtab { #define se_nomapped se_flags.se_nomapped #define se_reset se_flags.se_reset -int check_loop __P((const struct sockaddr *, const struct servtab *sep)); -int getvalue __P((const char *, int *, const char *)); -char *newstr __P((const char *)); -void inetd_setproctitle __P((const char *, int)); -void print_service __P((const char *, const struct servtab *)); -char *sskip __P((char **)); -char *skip __P((char **)); -struct servtab *tcpmux __P((int)); +int check_loop(const struct sockaddr *, const struct servtab *sep); +int getvalue(const char *, int *, const char *); +char *newstr(const char *); +void inetd_setproctitle(const char *, int); +void print_service(const char *, const struct servtab *); +char *sskip(char **); +char *skip(char **); +struct servtab *tcpmux(int); extern int debug; extern struct servtab *servtab; -typedef void (bi_fn_t) __P((int, struct servtab *)); +typedef void (bi_fn_t)(int, struct servtab *); struct biltin { const char *bi_service; /* internally provided service name */