summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr.sbin/ac/ac.c50
-rw-r--r--usr.sbin/accton/accton.c8
-rw-r--r--usr.sbin/apm/apm.c6
-rw-r--r--usr.sbin/apmd/apmd.c5
-rw-r--r--usr.sbin/arp/arp.c52
-rw-r--r--usr.sbin/config/gram.y17
-rw-r--r--usr.sbin/eeprom/getdate.y16
-rw-r--r--usr.sbin/mrinfo/mrinfo.c5
-rw-r--r--usr.sbin/ndp/ndp.c16
-rw-r--r--usr.sbin/pppd/chap_ms.c6
-rw-r--r--usr.sbin/rpc.lockd/lockd.c6
-rw-r--r--usr.sbin/traceroute/traceroute.c18
-rw-r--r--usr.sbin/traceroute6/traceroute6.c50
13 files changed, 95 insertions, 160 deletions
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index 84516eb27ea..a80df95c4e6 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -14,7 +14,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Id: ac.c,v 1.13 2003/03/13 09:09:37 deraadt Exp $";
+static char rcsid[] = "$Id: ac.c,v 1.14 2003/06/11 23:33:24 deraadt Exp $";
#endif
#include <sys/types.h>
@@ -99,8 +99,7 @@ void usage(void);
* open wtmp or die
*/
FILE *
-file(name)
- char *name;
+file(char *name)
{
FILE *fp;
@@ -115,11 +114,10 @@ file(name)
}
struct tty_list *
-add_tty(name)
- char *name;
+add_tty(char *name)
{
struct tty_list *tp;
- register char *rcp;
+ char *rcp;
Flags |= AC_T;
@@ -145,8 +143,7 @@ add_tty(name)
* should we process the named tty?
*/
int
-do_tty(name)
- char *name;
+do_tty(char *name)
{
struct tty_list *tp;
int def_ret = 0;
@@ -170,8 +167,7 @@ do_tty(name)
* is someone logged in on Console?
*/
int
-on_console(head)
- struct utmp_list *head;
+on_console(struct utmp_list *head)
{
struct utmp_list *up;
@@ -188,10 +184,7 @@ on_console(head)
* update user's login time
*/
struct user_list *
-update_user(head, name, secs)
- struct user_list *head;
- char *name;
- time_t secs;
+update_user(struct user_list *head, char *name, time_t secs)
{
struct user_list *up;
@@ -218,9 +211,7 @@ update_user(head, name, secs)
}
int
-main(argc, argv)
- int argc;
- char **argv;
+main(int argc, char *argv[])
{
FILE *fp;
int c;
@@ -287,17 +278,14 @@ main(argc, argv)
* print login time in decimal hours
*/
void
-show(name, secs)
- char *name;
- time_t secs;
+show(char *name, time_t secs)
{
(void)printf("\t%-*s %8.2f\n", UT_NAMESIZE, name,
((double)secs / 3600));
}
void
-show_users(list)
- struct user_list *list;
+show_users(struct user_list *list)
{
struct user_list *lp;
@@ -309,10 +297,7 @@ show_users(list)
* print total login time for 24hr period in decimal hours
*/
void
-show_today(users, logins, secs)
- struct user_list *users;
- struct utmp_list *logins;
- time_t secs;
+show_today(struct user_list *users, struct utmp_list *logins, time_t secs)
{
struct user_list *up;
struct utmp_list *lp;
@@ -345,9 +330,7 @@ show_today(users, logins, secs)
* been shut down.
*/
struct utmp_list *
-log_out(head, up)
- struct utmp_list *head;
- struct utmp *up;
+log_out(struct utmp_list *head, struct utmp *up)
{
struct utmp_list *lp, *lp2, *tlp;
time_t secs;
@@ -387,9 +370,7 @@ log_out(head, up)
* if do_tty says ok, login a user
*/
struct utmp_list *
-log_in(head, up)
- struct utmp_list *head;
- struct utmp *up;
+log_in(struct utmp_list *head, struct utmp *up)
{
struct utmp_list *lp;
@@ -453,8 +434,7 @@ log_in(head, up)
}
int
-ac(fp)
- FILE *fp;
+ac(FILE *fp)
{
struct utmp_list *lp, *head = NULL;
struct utmp usr;
@@ -545,7 +525,7 @@ ac(fp)
}
void
-usage()
+usage(void)
{
extern char *__progname;
(void)fprintf(stderr,
diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c
index 993324b39f5..79529053752 100644
--- a/usr.sbin/accton/accton.c
+++ b/usr.sbin/accton/accton.c
@@ -35,7 +35,7 @@ char copyright[] =
#ifndef lint
/* from: static char sccsid[] = "@(#)accton.c 4.3 (Berkeley) 6/1/90"; */
-static char *rcsid = "$Id: accton.c,v 1.6 2003/06/02 23:36:51 millert Exp $";
+static char *rcsid = "$Id: accton.c,v 1.7 2003/06/11 23:33:24 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -48,16 +48,14 @@ static char *rcsid = "$Id: accton.c,v 1.6 2003/06/02 23:36:51 millert Exp $";
static void usage(void);
void
-usage()
+usage(void)
{
fputs("usage: accton [file]\n", stderr);
exit(1);
}
int
-main(argc, argv)
- int argc;
- char **argv;
+main(int argc, char *argv[])
{
int ch;
diff --git a/usr.sbin/apm/apm.c b/usr.sbin/apm/apm.c
index d5750911f05..a2937839414 100644
--- a/usr.sbin/apm/apm.c
+++ b/usr.sbin/apm/apm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apm.c,v 1.7 2002/09/06 19:14:47 deraadt Exp $ */
+/* $OpenBSD: apm.c,v 1.8 2003/06/11 23:33:25 deraadt Exp $ */
/*
* Copyright (c) 1996 John T. Kohl
@@ -72,9 +72,7 @@ zzusage(void)
}
int
-send_command(int fd,
- struct apm_command *cmd,
- struct apm_reply *reply)
+send_command(int fd, struct apm_command *cmd, struct apm_reply *reply)
{
/* send a command to the apm daemon */
cmd->vno = APMD_VNO;
diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c
index a0f6b55bbda..39524c6c21b 100644
--- a/usr.sbin/apmd/apmd.c
+++ b/usr.sbin/apmd/apmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apmd.c,v 1.27 2002/09/06 19:46:52 deraadt Exp $ */
+/* $OpenBSD: apmd.c,v 1.28 2003/06/11 23:33:25 deraadt Exp $ */
/*
* Copyright (c) 1995, 1996 John T. Kohl
@@ -257,8 +257,7 @@ handle_client(int sock_fd, int ctl_fd)
int speaker_ok = TRUE;
void
-make_noise(howmany)
-int howmany;
+make_noise(int howmany)
{
int spkrfd = -1;
int trycnt;
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index c73e6d19502..5485e5193f1 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: arp.c,v 1.27 2003/06/02 23:36:52 millert Exp $ */
+/* $OpenBSD: arp.c,v 1.28 2003/06/11 23:33:25 deraadt Exp $ */
/* $NetBSD: arp.c,v 1.12 1995/04/24 13:25:18 cgd Exp $ */
/*
@@ -41,7 +41,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)arp.c 8.2 (Berkeley) 1/2/94";*/
-static char *rcsid = "$OpenBSD: arp.c,v 1.27 2003/06/02 23:36:52 millert Exp $";
+static char *rcsid = "$OpenBSD: arp.c,v 1.28 2003/06/11 23:33:25 deraadt Exp $";
#endif /* not lint */
/*
@@ -103,9 +103,7 @@ static int s = -1;
#define F_DELETE 4
int
-main(argc, argv)
- int argc;
- char **argv;
+main(int argc, char *argv[])
{
int ch, func, rtn;
@@ -183,8 +181,7 @@ main(argc, argv)
* Process a file to set standard arp entries
*/
int
-file(name)
- char *name;
+file(char *name)
{
char line[100], arg[5][50], *args[5];
int i, retval;
@@ -214,7 +211,7 @@ file(name)
}
void
-getsocket()
+getsocket(void)
{
if (s >= 0)
return;
@@ -236,9 +233,7 @@ struct {
* Set an individual arp entry
*/
int
-set(argc, argv)
- int argc;
- char **argv;
+set(int argc, char *argv[])
{
struct sockaddr_inarp *sin;
struct sockaddr_dl *sdl;
@@ -338,8 +333,7 @@ overwrite:
* Display an individual arp entry
*/
int
-get(host)
- const char *host;
+get(const char *host)
{
struct sockaddr_inarp *sin;
@@ -360,9 +354,7 @@ get(host)
* Delete an arp entry
*/
int
-delete(host, info)
- const char *host;
- const char *info;
+delete(const char *host, const char *info)
{
struct sockaddr_inarp *sin;
struct rt_msghdr *rtm;
@@ -417,11 +409,8 @@ delete:
* Search the entire arp table, and do some action on matching entries.
*/
void
-search(addr, action)
- in_addr_t addr;
- void (*action)(struct sockaddr_dl *sdl,
- struct sockaddr_inarp *sin,
- struct rt_msghdr *rtm);
+search(in_addr_t addr, void (*action)(struct sockaddr_dl *sdl,
+ struct sockaddr_inarp *sin, struct rt_msghdr *rtm))
{
int mib[6];
size_t needed;
@@ -463,10 +452,8 @@ search(addr, action)
* Display an arp entry
*/
void
-print_entry(sdl, sin, rtm)
- struct sockaddr_dl *sdl;
- struct sockaddr_inarp *sin;
- struct rt_msghdr *rtm;
+print_entry(struct sockaddr_dl *sdl, struct sockaddr_inarp *sin,
+ struct rt_msghdr *rtm)
{
char *host;
extern int h_errno;
@@ -513,10 +500,8 @@ print_entry(sdl, sin, rtm)
* Nuke an arp entry
*/
void
-nuke_entry(sdl, sin, rtm)
- struct sockaddr_dl *sdl;
- struct sockaddr_inarp *sin;
- struct rt_msghdr *rtm;
+nuke_entry(struct sockaddr_dl *sdl, struct sockaddr_inarp *sin,
+ struct rt_msghdr *rtm)
{
char ip[20];
@@ -534,7 +519,7 @@ ether_print(const char *scp)
}
void
-usage()
+usage(void)
{
(void)fprintf(stderr, "usage: arp [-n] hostname\n");
(void)fprintf(stderr, "usage: arp [-n] -a\n");
@@ -547,8 +532,7 @@ usage()
}
int
-rtmsg(cmd)
- int cmd;
+rtmsg(int cmd)
{
static int seq;
int rlen;
@@ -619,9 +603,7 @@ doit:
}
int
-getinetaddr(host, inap)
- const char *host;
- struct in_addr *inap;
+getinetaddr(const char *host, struct in_addr *inap)
{
struct hostent *hp;
diff --git a/usr.sbin/config/gram.y b/usr.sbin/config/gram.y
index 29961386f95..4356674140c 100644
--- a/usr.sbin/config/gram.y
+++ b/usr.sbin/config/gram.y
@@ -1,5 +1,5 @@
%{
-/* $OpenBSD: gram.y,v 1.15 2003/06/02 23:36:52 millert Exp $ */
+/* $OpenBSD: gram.y,v 1.16 2003/06/11 23:33:28 deraadt Exp $ */
/* $NetBSD: gram.y,v 1.14 1997/02/02 21:12:32 thorpej Exp $ */
/*
@@ -417,8 +417,7 @@ flags_opt:
%%
void
-yyerror(s)
- const char *s;
+yyerror(const char *s)
{
error("%s", s);
@@ -429,10 +428,10 @@ yyerror(s)
* allocated during parsing the current line.
*/
static void
-cleanup()
+cleanup(void)
{
- register struct nvlist **np;
- register int i;
+ struct nvlist **np;
+ int i;
for (np = alloc, i = adepth; --i >= 0; np++)
nvfree(*np);
@@ -440,9 +439,7 @@ cleanup()
}
static void
-setmachine(mch, mcharch)
- const char *mch;
- const char *mcharch;
+setmachine(const char *mch, const char *mcharch)
{
char buf[MAXPATHLEN];
@@ -466,7 +463,7 @@ setmachine(mch, mcharch)
}
static void
-check_maxpart()
+check_maxpart(void)
{
if (maxpartitions <= 0) {
stop("cannot proceed without maxpartitions specifier");
diff --git a/usr.sbin/eeprom/getdate.y b/usr.sbin/eeprom/getdate.y
index 03f56d74a3d..7ac3884f78e 100644
--- a/usr.sbin/eeprom/getdate.y
+++ b/usr.sbin/eeprom/getdate.y
@@ -1,5 +1,5 @@
%{
-/* $OpenBSD: getdate.y,v 1.4 2001/09/30 19:48:23 millert Exp $ */
+/* $OpenBSD: getdate.y,v 1.5 2003/06/11 23:33:28 deraadt Exp $ */
/*
** Originally written by Steven M. Bellovin <smb@research.att.com> while
@@ -643,9 +643,9 @@ static int
LookupWord(buff)
char *buff;
{
- register char *p;
- register char *q;
- register const TABLE *tp;
+ char *p;
+ char *q;
+ const TABLE *tp;
int i;
int abbrev;
@@ -749,8 +749,8 @@ LookupWord(buff)
static int
yylex()
{
- register char c;
- register char *p;
+ char c;
+ char *p;
char buff[20];
int Count;
int sign;
@@ -923,9 +923,7 @@ get_date(p, now)
/* ARGSUSED */
int
-main(ac, av)
- int ac;
- char *av[];
+main(int ac, char *av[])
{
char buff[128];
time_t d;
diff --git a/usr.sbin/mrinfo/mrinfo.c b/usr.sbin/mrinfo/mrinfo.c
index d9471447358..89a861f5cfe 100644
--- a/usr.sbin/mrinfo/mrinfo.c
+++ b/usr.sbin/mrinfo/mrinfo.c
@@ -76,7 +76,7 @@
#ifndef lint
static char rcsid[] =
- "@(#) $OpenBSD: mrinfo.c,v 1.15 2003/03/05 21:05:39 deraadt Exp $";
+ "@(#) $OpenBSD: mrinfo.c,v 1.16 2003/06/11 23:33:28 deraadt Exp $";
/* original rcsid:
"@(#) Header: mrinfo.c,v 1.6 93/04/08 15:14:16 van Exp (LBL)";
*/
@@ -205,7 +205,8 @@ accept_neighbors(u_int32_t src, u_int32_t dst, u_char *p, int datalen,
thresh = *p++;
ncount = *p++;
while (--ncount >= 0) {
- register u_int32_t neighbor;
+ u_int32_t neighbor;
+
GET_ADDR(neighbor);
neighbor = htonl(neighbor);
printf(" %s -> ", inet_fmt(laddr, s1));
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index e0b3f9b38f1..c08caade0f7 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ndp.c,v 1.26 2003/06/02 23:36:54 millert Exp $ */
+/* $OpenBSD: ndp.c,v 1.27 2003/06/11 23:33:29 deraadt Exp $ */
/* $KAME: ndp.c,v 1.101 2002/07/17 08:46:33 itojun Exp $ */
/*
@@ -376,9 +376,9 @@ set(argc, argv)
int argc;
char **argv;
{
- register struct sockaddr_in6 *sin = &sin_m;
- register struct sockaddr_dl *sdl;
- register struct rt_msghdr *rtm = &(m_rtmsg.m_rtm);
+ struct sockaddr_in6 *sin = &sin_m;
+ struct sockaddr_dl *sdl;
+ struct rt_msghdr *rtm = &(m_rtmsg.m_rtm);
struct addrinfo hints, *res;
int gai_error;
u_char *ea;
@@ -497,7 +497,7 @@ delete(host)
char *host;
{
struct sockaddr_in6 *sin = &sin_m;
- register struct rt_msghdr *rtm = &m_rtmsg.m_rtm;
+ struct rt_msghdr *rtm = &m_rtmsg.m_rtm;
struct sockaddr_dl *sdl;
struct addrinfo hints, *res;
int gai_error;
@@ -859,9 +859,9 @@ rtmsg(cmd)
{
static int seq;
int rlen;
- register struct rt_msghdr *rtm = &m_rtmsg.m_rtm;
- register char *cp = m_rtmsg.m_space;
- register int l;
+ struct rt_msghdr *rtm = &m_rtmsg.m_rtm;
+ char *cp = m_rtmsg.m_space;
+ int l;
errno = 0;
if (cmd == RTM_DELETE)
diff --git a/usr.sbin/pppd/chap_ms.c b/usr.sbin/pppd/chap_ms.c
index 44e36dd49d1..06bdf932127 100644
--- a/usr.sbin/pppd/chap_ms.c
+++ b/usr.sbin/pppd/chap_ms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chap_ms.c,v 1.7 2002/09/13 01:53:12 deraadt Exp $ */
+/* $OpenBSD: chap_ms.c,v 1.8 2003/06/11 23:33:29 deraadt Exp $ */
/*
* chap_ms.c - Microsoft MS-CHAP compatible implementation.
@@ -45,7 +45,7 @@
#if 0
static char rcsid[] = "Id: chap_ms.c,v 1.8 1998/04/01 00:15:43 paulus Exp $";
#else
-static char rcsid[] = "$OpenBSD: chap_ms.c,v 1.7 2002/09/13 01:53:12 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: chap_ms.c,v 1.8 2003/06/11 23:33:29 deraadt Exp $";
#endif
#endif
@@ -185,7 +185,7 @@ static u_char Get7Bits(input, startBit)
u_char *input;
int startBit;
{
- register unsigned int word;
+ unsigned int word;
word = (unsigned)input[startBit / 8] << 8;
word |= (unsigned)input[startBit / 8 + 1];
diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c
index 3be8f52be43..af7d4eacf91 100644
--- a/usr.sbin/rpc.lockd/lockd.c
+++ b/usr.sbin/rpc.lockd/lockd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lockd.c,v 1.5 2002/02/16 21:28:08 millert Exp $ */
+/* $OpenBSD: lockd.c,v 1.6 2003/06/11 23:33:29 deraadt Exp $ */
/*
* Copyright (c) 1995
@@ -49,8 +49,8 @@
#include "lockd.h"
-extern void nlm_prog_1(struct svc_req, register SVCXPRT);
-extern void nlm_prog_3(struct svc_req, register SVCXPRT);
+extern void nlm_prog_1(struct svc_req, SVCXPRT);
+extern void nlm_prog_3(struct svc_req, SVCXPRT);
int debug_level = 0; /* Zero means no debugging syslog() calls */
diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c
index 1eadc2e1bf8..90224f5aeaa 100644
--- a/usr.sbin/traceroute/traceroute.c
+++ b/usr.sbin/traceroute/traceroute.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: traceroute.c,v 1.58 2003/06/02 23:36:55 millert Exp $ */
+/* $OpenBSD: traceroute.c,v 1.59 2003/06/11 23:33:29 deraadt Exp $ */
/* $NetBSD: traceroute.c,v 1.10 1995/05/21 15:50:45 mycroft Exp $ */
/*-
@@ -43,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)traceroute.c 8.1 (Berkeley) 6/6/93";*/
#else
-static char rcsid[] = "$OpenBSD: traceroute.c,v 1.58 2003/06/02 23:36:55 millert Exp $";
+static char rcsid[] = "$OpenBSD: traceroute.c,v 1.59 2003/06/11 23:33:29 deraadt Exp $";
#endif
#endif /* not lint */
@@ -861,7 +861,7 @@ pr_type(u_int8_t t)
int
packet_ok(u_char *buf, int cc, struct sockaddr_in *from, int seq, int iflag)
{
- register struct icmp *icp;
+ struct icmp *icp;
u_char code;
u_int8_t type;
int hlen;
@@ -965,10 +965,10 @@ print(u_char *buf, int cc, struct sockaddr_in *from)
u_short
in_cksum(u_short *addr, int len)
{
- register int nleft = len;
- register u_short *w = addr;
- register u_short answer;
- register int sum = 0;
+ int nleft = len;
+ u_short *w = addr;
+ u_short answer;
+ int sum = 0;
/*
* Our algorithm is simple, using a 32 bit accumulator (sum),
@@ -1002,8 +1002,8 @@ in_cksum(u_short *addr, int len)
char *
inetname(struct in_addr in)
{
- register char *cp;
- register struct hostent *hp;
+ char *cp;
+ struct hostent *hp;
static int first = 1;
static char domain[MAXHOSTNAMELEN], line[MAXHOSTNAMELEN];
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index 3c4010892ed..f5037743428 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: traceroute6.c,v 1.35 2003/06/02 23:36:55 millert Exp $ */
+/* $OpenBSD: traceroute6.c,v 1.36 2003/06/11 23:33:30 deraadt Exp $ */
/* $KAME: traceroute6.c,v 1.63 2002/10/24 12:53:25 itojun Exp $ */
/*
@@ -353,9 +353,7 @@ int useicmp;
int lflag; /* print both numerical address & hostname */
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
struct hostent *hp;
int error;
@@ -952,9 +950,7 @@ wait_for_reply(sock, mhdr)
#ifdef IPSEC
#ifdef IPSEC_POLICY_IPSEC
int
-setpolicy(so, policy)
- int so;
- char *policy;
+setpolicy(int so, char *policy)
{
char *buf;
@@ -974,9 +970,7 @@ setpolicy(so, policy)
#endif
void
-send_probe(seq, hops)
- int seq;
- u_long hops;
+send_probe(int seq, u_long hops)
{
int i;
@@ -1021,8 +1015,7 @@ send_probe(seq, hops)
}
int
-get_hoplim(mhdr)
- struct msghdr *mhdr;
+get_hoplim(struct msghdr *mhdr)
{
struct cmsghdr *cm;
@@ -1038,10 +1031,9 @@ get_hoplim(mhdr)
}
double
-deltaT(t1p, t2p)
- struct timeval *t1p, *t2p;
+deltaT(struct timeval *t1p, struct timeval *t2p)
{
- register double dt;
+ double dt;
dt = (double)(t2p->tv_sec - t1p->tv_sec) * 1000.0 +
(double)(t2p->tv_usec - t1p->tv_usec) / 1000.0;
@@ -1052,8 +1044,7 @@ deltaT(t1p, t2p)
* Convert an ICMP "type" field to a printable string.
*/
char *
-pr_type(t0)
- int t0;
+pr_type(int t0)
{
u_char t = t0 & 0xff;
char *cp;
@@ -1109,12 +1100,9 @@ pr_type(t0)
}
int
-packet_ok(mhdr, cc, seq)
- struct msghdr *mhdr;
- int cc;
- int seq;
+packet_ok(struct msghdr *mhdr, int cc, int seq)
{
- register struct icmp6_hdr *icp;
+ struct icmp6_hdr *icp;
struct sockaddr_in6 *from = (struct sockaddr_in6 *)mhdr->msg_name;
u_char type, code;
char *buf = (char *)mhdr->msg_iov[0].iov_base;
@@ -1241,9 +1229,7 @@ packet_ok(mhdr, cc, seq)
* Increment pointer until find the UDP or ICMP header.
*/
struct udphdr *
-get_udphdr(ip6, lim)
- struct ip6_hdr *ip6;
- u_char *lim;
+get_udphdr(struct ip6_hdr *ip6, u_char *lim)
{
u_char *cp = (u_char *)ip6, nh;
int hlen;
@@ -1284,9 +1270,7 @@ get_udphdr(ip6, lim)
}
void
-print(mhdr, cc)
- struct msghdr *mhdr;
- int cc;
+print(struct msghdr *mhdr, int cc)
{
struct sockaddr_in6 *from = (struct sockaddr_in6 *)mhdr->msg_name;
char hbuf[NI_MAXHOST];
@@ -1319,8 +1303,7 @@ print(mhdr, cc)
* Out is assumed to be >= in.
*/
void
-tvsub(out, in)
- register struct timeval *out, *in;
+tvsub(struct timeval *out, struct timeval *in)
{
if ((out->tv_usec -= in->tv_usec) < 0) {
@@ -1336,10 +1319,9 @@ tvsub(out, in)
* numeric value, otherwise try for symbolic name.
*/
const char *
-inetname(sa)
- struct sockaddr *sa;
+inetname(struct sockaddr *sa)
{
- register char *cp;
+ char *cp;
static char line[NI_MAXHOST];
static char domain[MAXHOSTNAMELEN + 1];
static int first = 1;
@@ -1372,7 +1354,7 @@ inetname(sa)
}
void
-usage()
+usage(void)
{
fprintf(stderr,
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.