[patch] tcpdump: de-register

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[patch] tcpdump: de-register

Alexey Dobriyan-2
--- usr.sbin/tcpdump/addrtoname.c
+++ usr.sbin/tcpdump/addrtoname.c
@@ -124,9 +124,9 @@ struct protoidmem protoidtable[HASHNAMES
 char *
 intoa(u_int32_t addr)
 {
- register char *cp;
- register u_int byte;
- register int n;
+ char *cp;
+ u_int byte;
+ int n;
  static char buf[sizeof(".xxx.xxx.xxx.xxx")];
 
  NTOHL(addr);
@@ -251,7 +251,7 @@ getname6(const u_char *ap)
  char host[MAXHOSTNAMELEN];
  struct in6_addr addr;
  struct h6namemem *p;
- register char *cp;
+ char *cp;
  char ntop_buf[INET6_ADDRSTRLEN];
 
  memcpy(&addr, ap, sizeof(addr));
@@ -309,7 +309,7 @@ static char hex[] = "0123456789abcdef";
 static inline struct enamemem *
 lookup_emem(const u_char *ep)
 {
- register u_int i, j, k;
+ u_int i, j, k;
  struct enamemem *tp;
 
  k = (ep[0] << 8) | ep[1];
@@ -340,10 +340,10 @@ lookup_emem(const u_char *ep)
  */
 
 static inline struct enamemem *
-lookup_bytestring(register const u_char *bs, const int nlen)
+lookup_bytestring(const u_char *bs, const int nlen)
 {
  struct enamemem *tp;
- register u_int i, j, k;
+ u_int i, j, k;
 
  if (nlen >= 6) {
  k = (bs[0] << 8) | bs[1];
@@ -384,9 +384,9 @@ lookup_bytestring(register const u_char
 /* Find the hash node that corresponds the NSAP 'nsap' */
 
 static inline struct enamemem *
-lookup_nsap(register const u_char *nsap)
+lookup_nsap(const u_char *nsap)
 {
- register u_int i, j, k;
+ u_int i, j, k;
  int nlen = *nsap;
  struct enamemem *tp;
  const u_char *ensap = nsap + nlen - 6;
@@ -429,7 +429,7 @@ lookup_nsap(register const u_char *nsap)
 static inline struct protoidmem *
 lookup_protoid(const u_char *pi)
 {
- register u_int i, j;
+ u_int i, j;
  struct protoidmem *tp;
 
  /* 5 octets won't be aligned */
@@ -453,11 +453,11 @@ lookup_protoid(const u_char *pi)
 }
 
 char *
-etheraddr_string(register const u_char *ep)
+etheraddr_string(const u_char *ep)
 {
- register u_int i, j;
- register char *cp;
- register struct enamemem *tp;
+ u_int i, j;
+ char *cp;
+ struct enamemem *tp;
  char buf[sizeof("00:00:00:00:00:00")];
 
  tp = lookup_emem(ep);
@@ -491,9 +491,9 @@ etheraddr_string(register const u_char *
 char *
 linkaddr_string(const u_char *ep, const int len)
 {
- register u_int i, j;
- register char *cp;
- register struct enamemem *tp;
+ u_int i, j;
+ char *cp;
+ struct enamemem *tp;
 
  if (len == 6) /* XXX not totally correct... */
  return etheraddr_string(ep);
@@ -521,9 +521,9 @@ linkaddr_string(const u_char *ep, const
 char *
 etherproto_string(u_short port)
 {
- register char *cp;
- register struct hnamemem *tp;
- register u_int32_t i = port;
+ char *cp;
+ struct hnamemem *tp;
+ u_int32_t i = port;
  char buf[sizeof("0000")];
 
  for (tp = &eprototable[i & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt)
@@ -545,11 +545,11 @@ etherproto_string(u_short port)
 }
 
 char *
-protoid_string(register const u_char *pi)
+protoid_string(const u_char *pi)
 {
- register u_int i, j;
- register char *cp;
- register struct protoidmem *tp;
+ u_int i, j;
+ char *cp;
+ struct protoidmem *tp;
  char buf[sizeof("00:00:00:00:00")];
 
  tp = lookup_protoid(pi);
@@ -574,8 +574,8 @@ protoid_string(register const u_char *pi
 char *
 llcsap_string(u_char sap)
 {
- register struct hnamemem *tp;
- register u_int32_t i = sap;
+ struct hnamemem *tp;
+ u_int32_t i = sap;
  char buf[sizeof("sap 00")];
 
  for (tp = &llcsaptable[i & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt)
@@ -593,9 +593,9 @@ llcsap_string(u_char sap)
 char *
 isonsap_string(const u_char *nsap)
 {
- register u_int i, nlen = nsap[0];
- register char *cp;
- register struct enamemem *tp;
+ u_int i, nlen = nsap[0];
+ char *cp;
+ struct enamemem *tp;
 
  tp = lookup_nsap(nsap);
  if (tp->e_name)
@@ -618,8 +618,8 @@ isonsap_string(const u_char *nsap)
 char *
 tcpport_string(u_short port)
 {
- register struct hnamemem *tp;
- register u_int32_t i = port;
+ struct hnamemem *tp;
+ u_int32_t i = port;
  char buf[sizeof("00000")];
 
  for (tp = &tporttable[i & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt)
@@ -635,10 +635,10 @@ tcpport_string(u_short port)
 }
 
 char *
-udpport_string(register u_short port)
+udpport_string(u_short port)
 {
- register struct hnamemem *tp;
- register u_int32_t i = port;
+ struct hnamemem *tp;
+ u_int32_t i = port;
  char buf[sizeof("00000")];
 
  for (tp = &uporttable[i & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt)
@@ -720,8 +720,8 @@ extern struct eproto {
 static void
 init_eprotoarray(void)
 {
- register int i;
- register struct hnamemem *table;
+ int i;
+ struct hnamemem *table;
 
  for (i = 0; eproto_db[i].s; i++) {
  int j = ntohs(eproto_db[i].p) & (HASHNAMESIZE-1);
@@ -741,8 +741,8 @@ init_eprotoarray(void)
 static void
 init_protoidarray(void)
 {
- register int i;
- register struct protoidmem *tp;
+ int i;
+ struct protoidmem *tp;
  u_char protoid[5];
 
  protoid[0] = 0;
@@ -782,13 +782,13 @@ static struct etherlist {
 static void
 init_etherarray(void)
 {
- register struct etherlist *el;
- register struct enamemem *tp;
+ struct etherlist *el;
+ struct enamemem *tp;
 #ifdef HAVE_ETHER_NTOHOST
  char name[MAXHOSTNAMELEN + 1];
 #else
- register struct pcap_etherent *ep;
- register FILE *fp;
+ struct pcap_etherent *ep;
+ FILE *fp;
 
  /* Suck in entire ethers file */
  fp = fopen(PCAP_ETHERS_FILE, "r");
@@ -838,8 +838,8 @@ static struct tok llcsap_db[] = {
 static void
 init_llcsaparray(void)
 {
- register int i;
- register struct hnamemem *table;
+ int i;
+ struct hnamemem *table;
 
  for (i = 0; llcsap_db[i].s != NULL; i++) {
  table = &llcsaptable[llcsap_db[i].v];
@@ -884,7 +884,7 @@ init_addrtoname(u_int32_t localnet, u_in
 char *
 dnaddr_string(u_short dnaddr)
 {
- register struct hnamemem *tp;
+ struct hnamemem *tp;
 
  for (tp = &dnaddrtable[dnaddr & (HASHNAMESIZE-1)]; tp->nxt != 0;
      tp = tp->nxt)
@@ -905,7 +905,7 @@ dnaddr_string(u_short dnaddr)
 struct hnamemem *
 newhnamemem(void)
 {
- register struct hnamemem *p;
+ struct hnamemem *p;
  static struct hnamemem *ptr = NULL;
  static u_int num = 0;
 
@@ -925,7 +925,7 @@ newhnamemem(void)
 struct h6namemem *
 newh6namemem(void)
 {
- register struct h6namemem *p;
+ struct h6namemem *p;
  static struct h6namemem *ptr = NULL;
  static u_int num = 0;
 
--- usr.sbin/tcpdump/gmt2local.c
+++ usr.sbin/tcpdump/gmt2local.c
@@ -49,8 +49,8 @@ static const char rcsid[] =
 int32_t
 gmt2local(time_t t)
 {
- register int dt, dir;
- register struct tm *gmt, *loc;
+ int dt, dir;
+ struct tm *gmt, *loc;
  struct tm sgmt;
 
  if (t == 0)
--- usr.sbin/tcpdump/interface.h
+++ usr.sbin/tcpdump/interface.h
@@ -287,4 +287,4 @@ extern void ospf6_print(const u_char *,
 extern void dhcp6_print(const u_char *, u_int, u_short, u_short);
 #endif /*INET6*/
 
-extern u_short in_cksum(const u_short *addr, register int len, u_short csum);
+extern u_short in_cksum(const u_short *addr, int len, u_short csum);
--- usr.sbin/tcpdump/nameser.h
+++ usr.sbin/tcpdump/nameser.h
@@ -244,13 +244,13 @@ struct rrec {
  * portable or it can be elegant but never both.
  */
 #define GETSHORT(s, cp) { \
- register u_char *t_cp = (u_char *)(cp); \
+ u_char *t_cp = (u_char *)(cp); \
  (s) = ((u_int16_t)t_cp[0] << 8) | (u_int16_t)t_cp[1]; \
  (cp) += 2; \
 }
 
 #define GETLONG(l, cp) { \
- register u_char *t_cp = (u_char *)(cp); \
+ u_char *t_cp = (u_char *)(cp); \
  (l) = (((u_int32_t)t_cp[0]) << 24) \
     | (((u_int32_t)t_cp[1]) << 16) \
     | (((u_int32_t)t_cp[2]) << 8) \
@@ -259,8 +259,8 @@ struct rrec {
 }
 
 #define PUTSHORT(s, cp) { \
- register u_int16_t t_s = (u_int16_t)(s); \
- register u_char *t_cp = (u_char *)(cp); \
+ u_int16_t t_s = (u_int16_t)(s); \
+ u_char *t_cp = (u_char *)(cp); \
  *t_cp++ = t_s >> 8; \
  *t_cp   = t_s; \
  (cp) += 2; \
@@ -271,8 +271,8 @@ struct rrec {
  * were depending on this "feature", you will lose.
  */
 #define PUTLONG(l, cp) { \
- register u_int32_t t_l = (u_int32_t)(l); \
- register u_char *t_cp = (u_char *)(cp); \
+ u_int32_t t_l = (u_int32_t)(l); \
+ u_char *t_cp = (u_char *)(cp); \
  *t_cp++ = t_l >> 24; \
  *t_cp++ = t_l >> 16; \
  *t_cp++ = t_l >> 8; \
--- usr.sbin/tcpdump/parsenfsfh.c
+++ usr.sbin/tcpdump/parsenfsfh.c
@@ -111,14 +111,14 @@ static int is_UCX(unsigned char *);
 
 void
 Parse_fh(fh, fsidp, inop, osnamep, fsnamep, ourself)
-register caddr_t *fh;
+caddr_t *fh;
 my_fsid *fsidp;
 ino_t *inop;
 char **osnamep; /* if non-NULL, return OS name here */
 char **fsnamep; /* if non-NULL, return server fs name here (for VMS) */
 int ourself; /* true if file handle was generated on this host */
 {
- register unsigned char *fhp = (unsigned char *)fh;
+ unsigned char *fhp = (unsigned char *)fh;
  u_int32_t temp;
  int fhtype = FHT_UNKNOWN;
 
@@ -434,7 +434,7 @@ static int
 is_UCX(fhp)
 unsigned char *fhp;
 {
- register int i;
+ int i;
  int seen_null = 0;
 
  for (i = 1; i < 14; i++) {
--- usr.sbin/tcpdump/print-arp.c
+++ usr.sbin/tcpdump/print-arp.c
@@ -57,11 +57,11 @@ struct rtentry;
 static u_char ezero[6];
 
 void
-arp_print(register const u_char *bp, u_int length, u_int caplen)
+arp_print(const u_char *bp, u_int length, u_int caplen)
 {
- register const struct ether_arp *ap;
- register const struct ether_header *eh;
- register u_short pro, hrd, op;
+ const struct ether_arp *ap;
+ const struct ether_header *eh;
+ u_short pro, hrd, op;
 
  ap = (struct ether_arp *)bp;
  if ((u_char *)(ap + 1) > snapend) {
--- usr.sbin/tcpdump/print-atalk.c
+++ usr.sbin/tcpdump/print-atalk.c
@@ -100,9 +100,9 @@ static const char *ddpskt_string(int);
  * from Ethertalk)
  */
 void
-atalk_print(register const u_char *bp, u_int length)
+atalk_print(const u_char *bp, u_int length)
 {
- register const struct atDDP *dp;
+ const struct atDDP *dp;
  u_short snet;
 
  if (length < ddpSize) {
@@ -128,11 +128,11 @@ atalk_print(register const u_char *bp, u
  * interface if we have one, or from UDP encapsulated tunnels.
  */
 void
-atalk_print_llap(register const u_char *bp, u_int length)
+atalk_print_llap(const u_char *bp, u_int length)
 {
- register const struct LAP *lp;
- register const struct atDDP *dp;
- register const struct atShortDDP *sdp;
+ const struct LAP *lp;
+ const struct atDDP *dp;
+ const struct atShortDDP *sdp;
  u_short snet;
 
  lp = (struct LAP *)bp;
@@ -187,9 +187,9 @@ atalk_print_llap(register const u_char *
 
 /* XXX should probably pass in the snap header and do checks like arp_print() */
 void
-aarp_print(register const u_char *bp, u_int length)
+aarp_print(const u_char *bp, u_int length)
 {
- register const struct aarp *ap;
+ const struct aarp *ap;
 
 #define AT(member) ataddr_string((ap->member[1]<<8)|ap->member[2],ap->member[3])
 
@@ -220,8 +220,8 @@ aarp_print(register const u_char *bp, u_
 }
 
 static void
-ddp_print(register const u_char *bp, register u_int length, register int t,
-  register u_short snet, register u_char snode, u_char skt)
+ddp_print(const u_char *bp, u_int length, int t,
+  u_short snet, u_char snode, u_char skt)
 {
 
  if ((intptr_t)bp & (sizeof(long)-1)) {
@@ -255,7 +255,7 @@ ddp_print(register const u_char *bp, reg
 }
 
 static void
-atp_print(register const struct atATP *ap, u_int length)
+atp_print(const struct atATP *ap, u_int length)
 {
  char c;
  u_int32_t data;
@@ -347,10 +347,10 @@ atp_print(register const struct atATP *a
 }
 
 static void
-atp_bitmap_print(register u_char bm)
+atp_bitmap_print(u_char bm)
 {
- register char c;
- register int i;
+ char c;
+ int i;
 
  /*
  * The '& 0xff' below is needed for compilers that want to sign
@@ -378,10 +378,10 @@ atp_bitmap_print(register u_char bm)
 }
 
 static void
-nbp_print(register const struct atNBP *np, u_int length, register u_short snet,
-  register u_char snode, register u_char skt)
+nbp_print(const struct atNBP *np, u_int length, u_short snet,
+  u_char snode, u_char skt)
 {
- register const struct atNBPtuple *tp =
+ const struct atNBPtuple *tp =
  (struct atNBPtuple *)((u_char *)np + nbpHeaderSize);
  int i;
  const u_char *ep;
@@ -465,9 +465,9 @@ nbp_print(register const struct atNBP *n
 
 /* print a counted string */
 static const char *
-print_cstring(register const char *cp, register const u_char *ep)
+print_cstring(const char *cp, const u_char *ep)
 {
- register u_int length;
+ u_int length;
 
  if (cp >= (const char *)ep) {
  fputs(tstr, stdout);
@@ -491,12 +491,10 @@ print_cstring(register const char *cp, r
 }
 
 static const struct atNBPtuple *
-nbp_tuple_print(register const struct atNBPtuple *tp,
- register const u_char *ep,
- register u_short snet, register u_char snode,
- register u_char skt)
+nbp_tuple_print(const struct atNBPtuple *tp, const u_char *ep,
+ u_short snet, u_char snode, u_char skt)
 {
- register const struct atNBPtuple *tpn;
+ const struct atNBPtuple *tpn;
 
  if ((const u_char *)(tp + 1) > ep) {
  fputs(tstr, stdout);
@@ -521,9 +519,9 @@ nbp_tuple_print(register const struct at
 }
 
 static const struct atNBPtuple *
-nbp_name_print(const struct atNBPtuple *tp, register const u_char *ep)
+nbp_name_print(const struct atNBPtuple *tp, const u_char *ep)
 {
- register const char *cp = (const char *)tp + nbpTupleSize;
+ const char *cp = (const char *)tp + nbpTupleSize;
 
  putchar(' ');
 
@@ -589,8 +587,8 @@ init_atalk(void)
 static const char *
 ataddr_string(u_short atnet, u_char athost)
 {
- register struct hnamemem *tp, *tp2;
- register int i = (atnet << 8) | athost;
+ struct hnamemem *tp, *tp2;
+ int i = (atnet << 8) | athost;
  char nambuf[MAXHOSTNAMELEN + 20];
  static int first = 1;
 
@@ -636,7 +634,7 @@ static struct tok skt2str[] = {
 };
 
 static const char *
-ddpskt_string(register int skt)
+ddpskt_string(int skt)
 {
  static char buf[12];
 
--- usr.sbin/tcpdump/print-bootp.c
+++ usr.sbin/tcpdump/print-bootp.c
@@ -56,10 +56,9 @@ static char tstr[] = " [|bootp]";
  * Print bootp requests
  */
 void
-bootp_print(register const u_char *cp, u_int length,
-    u_short sport, u_short dport)
+bootp_print(const u_char *cp, u_int length, u_short sport, u_short dport)
 {
- register const struct bootp *bp;
+ const struct bootp *bp;
  static u_char vm_cmu[4] = VM_CMU;
  static u_char vm_rfc1048[4] = VM_RFC1048;
 
@@ -125,8 +124,8 @@ bootp_print(register const u_char *cp, u
 
  /* Client's Ethernet address */
  if (bp->bp_htype == 1 && bp->bp_hlen == 6) {
- register const struct ether_header *eh;
- register const char *e;
+ const struct ether_header *eh;
+ const char *e;
 
  TCHECK2(bp->bp_chaddr[0], 6);
  eh = (struct ether_header *)packetp;
@@ -268,12 +267,12 @@ static struct tok tag2str[] = {
 };
 
 static void
-rfc1048_print(register const u_char *bp, register u_int length)
+rfc1048_print(const u_char *bp, u_int length)
 {
- register u_char tag;
- register u_int len, size;
- register const char *cp;
- register char c;
+ u_char tag;
+ u_int len, size;
+ const char *cp;
+ char c;
  int first;
  u_int32_t ul;
  u_short us;
@@ -445,9 +444,9 @@ rfc1048_print(register const u_char *bp,
 }
 
 static void
-cmu_print(register const u_char *bp, register u_int length)
+cmu_print(const u_char *bp, u_int length)
 {
- register const struct cmu_vend *cmu;
+ const struct cmu_vend *cmu;
  char *fmt = " %s:%s";
 
 #define PRINTCMUADDR(m, s) { TCHECK(cmu->m); \
--- usr.sbin/tcpdump/print-carp.c
+++ usr.sbin/tcpdump/print-carp.c
@@ -48,7 +48,7 @@ static const char rcsid[] =
 #include "addrtoname.h"
 
 void
-carp_print(register const u_char *bp, register u_int len, int ttl)
+carp_print(const u_char *bp, u_int len, int ttl)
 {
  int version, type;
  char *type_s;
--- usr.sbin/tcpdump/print-cnfp.c
+++ usr.sbin/tcpdump/print-cnfp.c
@@ -68,11 +68,11 @@ struct nfrec {
 };
 
 void
-cnfp_print(register const u_char *cp, u_int len, register const u_char *bp)
+cnfp_print(const u_char *cp, u_int len, const u_char *bp)
 {
- register const struct nfhdr *nh;
- register const struct nfrec *nr;
- register const struct ip *ip;
+ const struct nfhdr *nh;
+ const struct nfrec *nr;
+ const struct ip *ip;
  int nrecs, ver, proto;
  time_t t;
 
--- usr.sbin/tcpdump/print-decnet.c
+++ usr.sbin/tcpdump/print-decnet.c
@@ -67,12 +67,11 @@ extern char *dnet_htoa(struct dn_naddr *
 #endif
 
 void
-decnet_print(register const u_char *ap, register u_int length,
-     register u_int caplen)
+decnet_print(const u_char *ap, u_int length, u_int caplen)
 {
  static union routehdr rhcopy;
- register union routehdr *rhp = &rhcopy;
- register int mflags;
+ union routehdr *rhp = &rhcopy;
+ int mflags;
  int dst, src, hops;
  u_int rhlen, nsplen, pktlen;
  const u_char *nspp;
@@ -157,10 +156,10 @@ decnet_print(register const u_char *ap,
 }
 
 static void
-print_decnet_ctlmsg(register const union routehdr *rhp, u_int length)
+print_decnet_ctlmsg(const union routehdr *rhp, u_int length)
 {
  int mflags = EXTRACT_LE_8BITS(rhp->rh_short.sh_flags);
- register union controlmsg *cmp = (union controlmsg *)rhp;
+ union controlmsg *cmp = (union controlmsg *)rhp;
  int src, dst, info, blksize, eco, ueco, hello, other, vers;
  etheraddr srcea, rtea;
  int priority;
@@ -724,7 +723,7 @@ static struct tok reason2str[] = {
 };
 
 static void
-print_reason(register int reason)
+print_reason(int reason)
 {
  printf("%s ", tok2str(reason2str, "reason-%d", reason));
 }
--- usr.sbin/tcpdump/print-dhcp6.c
+++ usr.sbin/tcpdump/print-dhcp6.c
@@ -229,8 +229,7 @@ trunc:
  * Print dhcp6 requests
  */
 void
-dhcp6_print(register const u_char *cp, u_int length,
-    u_short sport, u_short dport)
+dhcp6_print(const u_char *cp, u_int length, u_short sport, u_short dport)
 {
  union dhcp6 *dh6;
  u_char *ep;
--- usr.sbin/tcpdump/print-domain.c
+++ usr.sbin/tcpdump/print-domain.c
@@ -71,9 +71,9 @@ static const char *ns_resp[] = {
 
 /* skip over a domain name */
 static const u_char *
-ns_nskip(register const u_char *cp)
+ns_nskip(const u_char *cp)
 {
- register u_char i;
+ u_char i;
 
  if (!TTEST2(*cp, 1))
  return (NULL);
@@ -141,7 +141,7 @@ blabel_print(const u_char *cp)
 static int
 labellen(const u_char *cp)
 {
- register u_int i;
+ u_int i;
 
  if (!TTEST2(*cp, 1))
  return(-1);
@@ -161,11 +161,11 @@ labellen(const u_char *cp)
 }
 
 static const u_char *
-ns_nprint(register const u_char *cp, register const u_char *bp)
+ns_nprint(const u_char *cp, const u_char *bp)
 {
- register u_int i, l;
- register const u_char *rp = NULL;
- register int compress = 0;
+ u_int i, l;
+ const u_char *rp = NULL;
+ int compress = 0;
  int chars_processed;
  int elt;
  int data_size = snapend - bp;
@@ -245,9 +245,9 @@ ns_nprint(register const u_char *cp, reg
 
 /* print a <character-string> */
 static const u_char *
-ns_cprint(register const u_char *cp)
+ns_cprint(const u_char *cp)
 {
- register u_int i;
+ u_int i;
 
  if (!TTEST2(*cp, 1))
  return (NULL);
@@ -330,10 +330,10 @@ struct tok ns_class2str[] = {
 
 /* print a query */
 static const u_char *
-ns_qprint(register const u_char *cp, register const u_char *bp, int is_mdns)
+ns_qprint(const u_char *cp, const u_char *bp, int is_mdns)
 {
- register const u_char *np = cp;
- register u_int i;
+ const u_char *np = cp;
+ u_int i;
 
  cp = ns_nskip(cp);
 
@@ -358,11 +358,11 @@ ns_qprint(register const u_char *cp, reg
 
 /* print a reply */
 static const u_char *
-ns_rprint(register const u_char *cp, register const u_char *bp, int is_mdns)
+ns_rprint(const u_char *cp, const u_char *bp, int is_mdns)
 {
- register u_int class;
- register u_short typ, len;
- register const u_char *rp;
+ u_int class;
+ u_short typ, len;
+ const u_char *rp;
 
  if (vflag) {
  putchar(' ');
@@ -547,11 +547,11 @@ ns_rprint(register const u_char *cp, reg
 }
 
 void
-ns_print(register const u_char *bp, u_int length, int is_mdns)
+ns_print(const u_char *bp, u_int length, int is_mdns)
 {
- register const HEADER *np;
- register int qdcount, ancount, nscount, arcount;
- register const u_char *cp;
+ const HEADER *np;
+ int qdcount, ancount, nscount, arcount;
+ const u_char *cp;
  u_int16_t b2;
 
  np = (const HEADER *)bp;
--- usr.sbin/tcpdump/print-dvmrp.c
+++ usr.sbin/tcpdump/print-dvmrp.c
@@ -83,10 +83,10 @@ static void print_graft_ack(const u_char
 static u_int32_t target_level;
 
 void
-dvmrp_print(register const u_char *bp, register u_int len)
+dvmrp_print(const u_char *bp, u_int len)
 {
- register const u_char *ep;
- register u_char type;
+ const u_char *ep;
+ u_char type;
 
  ep = (const u_char *)snapend;
  if (bp >= ep)
@@ -162,11 +162,10 @@ dvmrp_print(register const u_char *bp, r
 }
 
 static void
-print_report(register const u_char *bp, register const u_char *ep,
-    register u_int len)
+print_report(const u_char *bp, const u_char *ep, u_int len)
 {
- register u_int32_t mask, origin;
- register int metric, i, width, done;
+ u_int32_t mask, origin;
+ int metric, i, width, done;
 
  while (len > 0) {
  if (len < 3) {
@@ -213,10 +212,9 @@ print_report(register const u_char *bp,
 #define GET_ADDR(to) (memcpy((char *)to, (char *)bp, 4), bp += 4)
 
 static void
-print_probe(register const u_char *bp, register const u_char *ep,
-    register u_int len)
+print_probe(const u_char *bp, const u_char *ep, u_int len)
 {
- register u_int32_t genid;
+ u_int32_t genid;
  u_char neighbor[4];
 
  if ((len < 4) || ((bp + 4) > ep)) {
@@ -241,13 +239,12 @@ print_probe(register const u_char *bp, r
 }
 
 static void
-print_neighbors(register const u_char *bp, register const u_char *ep,
-    register u_int len)
+print_neighbors(const u_char *bp, const u_char *ep, u_int len)
 {
  u_char laddr[4], neighbor[4];
- register u_char metric;
- register u_char thresh;
- register int ncount;
+ u_char metric;
+ u_char thresh;
+ int ncount;
 
  while (len > 0 && bp < ep) {
  if (len < 7 || (bp + 7) >= ep) {
@@ -270,12 +267,11 @@ print_neighbors(register const u_char *b
 }
 
 static void
-print_neighbors2(register const u_char *bp, register const u_char *ep,
-    register u_int len)
+print_neighbors2(const u_char *bp, const u_char *ep, u_int len)
 {
  u_char laddr[4], neighbor[4];
- register u_char metric, thresh, flags;
- register int ncount;
+ u_char metric, thresh, flags;
+ int ncount;
 
  printf(" (v %d.%d):",
        (int)target_level & 0xff,
@@ -318,8 +314,7 @@ print_neighbors2(register const u_char *
 }
 
 static void
-print_prune(register const u_char *bp, register const u_char *ep,
-    register u_int len)
+print_prune(const u_char *bp, const u_char *ep, u_int len)
 {
  union a {
  u_char b[4];
@@ -337,8 +332,7 @@ print_prune(register const u_char *bp, r
 }
 
 static void
-print_graft(register const u_char *bp, register const u_char *ep,
-    register u_int len)
+print_graft(const u_char *bp, const u_char *ep, u_int len)
 {
 
  if (len < 8 || (bp + 8) > ep) {
@@ -349,8 +343,7 @@ print_graft(register const u_char *bp, r
 }
 
 static void
-print_graft_ack(register const u_char *bp, register const u_char *ep,
-    register u_int len)
+print_graft_ack(const u_char *bp, const u_char *ep, u_int len)
 {
 
  if (len < 8 || (bp + 8) > ep) {
--- usr.sbin/tcpdump/print-enc.c
+++ usr.sbin/tcpdump/print-enc.c
@@ -58,11 +58,10 @@ struct rtentry;
  }
 
 void
-enc_if_print(u_char *user, const struct pcap_pkthdr *h,
-     register const u_char *p)
+enc_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
 {
- register u_int length = h->len;
- register u_int caplen = h->caplen;
+ u_int length = h->len;
+ u_int caplen = h->caplen;
  int flags;
  const struct enchdr *hdr;
 
--- usr.sbin/tcpdump/print-ether.c
+++ usr.sbin/tcpdump/print-ether.c
@@ -60,9 +60,9 @@ const u_char *snapend;
 void ether_macctl(const u_char *, u_int);
 
 void
-ether_print(register const u_char *bp, u_int length)
+ether_print(const u_char *bp, u_int length)
 {
- register const struct ether_header *ep;
+ const struct ether_header *ep;
 
  ep = (const struct ether_header *)bp;
  if (qflag)
--- usr.sbin/tcpdump/print-etherip.c
+++ usr.sbin/tcpdump/print-etherip.c
@@ -65,8 +65,8 @@ extern u_short extracted_ethertype;
 
 void
 etherip_print(bp, len, bp2)
- register const u_char *bp, *bp2;
- register u_int len;
+ const u_char *bp, *bp2;
+ u_int len;
 {
  const struct ip *ip = (const struct ip *)bp2;
  struct ether_header *eh;
--- usr.sbin/tcpdump/print-fddi.c
+++ usr.sbin/tcpdump/print-fddi.c
@@ -205,7 +205,7 @@ print_fddi_fc(u_char fc)
 static inline void
 extract_fddi_addrs(const struct fddi_header *fddip, char *fsrc, char *fdst)
 {
- register int i;
+ int i;
 
  if (fddi_bitswap) {
  /*
@@ -227,8 +227,8 @@ extract_fddi_addrs(const struct fddi_hea
  * Print the FDDI MAC header
  */
 static inline void
-fddi_print(register const struct fddi_header *fddip, register u_int length,
-   register const u_char *fsrc, register const u_char *fdst)
+fddi_print(const struct fddi_header *fddip, u_int length,
+   const u_char *fsrc, const u_char *fdst)
 {
  char *srcname, *dstname;
 
@@ -261,8 +261,7 @@ fddi_smt_print(const u_char *p, u_int le
  * is the number of bytes actually captured.
  */
 void
-fddi_if_print(u_char *pcap, const struct pcap_pkthdr *h,
-      register const u_char *p)
+fddi_if_print(u_char *pcap, const struct pcap_pkthdr *h, const u_char *p)
 {
  u_int caplen = h->caplen;
  u_int length = h->len;
@@ -344,8 +343,7 @@ out:
 
 #include "interface.h"
 void
-fddi_if_print(u_char *pcap, const struct pcap_pkthdr *h,
-      register const u_char *p)
+fddi_if_print(u_char *pcap, const struct pcap_pkthdr *h, const u_char *p)
 {
 
  error("not configured for fddi");
--- usr.sbin/tcpdump/print-frag6.c
+++ usr.sbin/tcpdump/print-frag6.c
@@ -53,11 +53,11 @@ static const char rcsid[] =
 #include "addrtoname.h"
 
 int
-frag6_print(register const u_char *bp, register const u_char *bp2)
+frag6_print(const u_char *bp, const u_char *bp2)
 {
- register const struct ip6_frag *dp;
- register const struct ip6_hdr *ip6;
- register const u_char *ep;
+ const struct ip6_frag *dp;
+ const struct ip6_hdr *ip6;
+ const u_char *ep;
 
 #if 0
 #define TCHECK(var) if ((u_char *)&(var) >= ep - sizeof(var)) goto trunc
--- usr.sbin/tcpdump/print-hsrp.c
+++ usr.sbin/tcpdump/print-hsrp.c
@@ -101,7 +101,7 @@ struct hsrp {
 };
 
 void
-hsrp_print(register const u_char *bp, register u_int len)
+hsrp_print(const u_char *bp, u_int len)
 {
  struct hsrp *hp = (struct hsrp *) bp;
 
--- usr.sbin/tcpdump/print-icmp6.c
+++ usr.sbin/tcpdump/print-icmp6.c
@@ -61,15 +61,15 @@ void icmp6_opt_print(const u_char *, int
 void mld6_print(const u_char *);
 
 void
-icmp6_print(register const u_char *bp, register const u_char *bp2)
+icmp6_print(const u_char *bp, const u_char *bp2)
 {
- register const struct icmp6_hdr *dp;
- register const struct ip6_hdr *ip;
- register const char *str;
- register const struct ip6_hdr *oip;
- register const struct udphdr *ouh;
- register int hlen, dport;
- register const u_char *ep;
+ const struct icmp6_hdr *dp;
+ const struct ip6_hdr *ip;
+ const char *str;
+ const struct ip6_hdr *oip;
+ const struct udphdr *ouh;
+ int hlen, dport;
+ const u_char *ep;
  char buf[256];
  int icmp6len;
 
@@ -414,21 +414,21 @@ trunc:
 }
 
 void
-icmp6_opt_print(register const u_char *bp, int resid)
+icmp6_opt_print(const u_char *bp, int resid)
 {
- register const struct nd_opt_hdr *op;
- register const struct nd_opt_hdr *opl; /* why there's no struct? */
- register const struct nd_opt_prefix_info *opp;
- register const struct icmp6_opts_redirect *opr;
- register const struct nd_opt_mtu *opm;
- register const u_char *ep;
+ const struct nd_opt_hdr *op;
+ const struct nd_opt_hdr *opl; /* why there's no struct? */
+ const struct nd_opt_prefix_info *opp;
+ const struct icmp6_opts_redirect *opr;
+ const struct nd_opt_mtu *opm;
+ const u_char *ep;
  int opts_len;
 #if 0
- register const struct ip6_hdr *ip;
- register const char *str;
- register const struct ip6_hdr *oip;
- register const struct udphdr *ouh;
- register int hlen, dport;
+ const struct ip6_hdr *ip;
+ const char *str;
+ const struct ip6_hdr *oip;
+ const struct udphdr *ouh;
+ int hlen, dport;
  char buf[256];
 #endif
 
@@ -557,10 +557,10 @@ icmp6_opt_print(register const u_char *b
 }
 
 void
-mld6_print(register const u_char *bp)
+mld6_print(const u_char *bp)
 {
- register struct mld6_hdr *mp = (struct mld6_hdr *)bp;
- register const u_char *ep;
+ struct mld6_hdr *mp = (struct mld6_hdr *)bp;
+ const u_char *ep;
 
  /* 'ep' points to the end of avaible data. */
  ep = snapend;
--- usr.sbin/tcpdump/print-igrp.c
+++ usr.sbin/tcpdump/print-igrp.c
@@ -48,10 +48,9 @@ static const char rcsid[] =
 #include "extract.h" /* must come after interface.h */
 
 static void
-igrp_entry_print(register struct igrprte *igr, register int is_interior,
-    register int is_exterior)
+igrp_entry_print(struct igrprte *igr, int is_interior, int is_exterior)
 {
- register u_int delay, bandwidth;
+ u_int delay, bandwidth;
  u_int metric, mtu;
 
  if (is_interior)
@@ -84,11 +83,11 @@ static struct tok op2str[] = {
 };
 
 void
-igrp_print(register const u_char *bp, u_int length, register const u_char *bp2)
+igrp_print(const u_char *bp, u_int length, const u_char *bp2)
 {
- register struct igrphdr *hdr;
- register struct ip *ip;
- register u_char *cp;
+ struct igrphdr *hdr;
+ struct ip *ip;
+ u_char *cp;
  u_int nint, nsys, next;
 
  hdr = (struct igrphdr *)bp;
--- usr.sbin/tcpdump/print-ip.c
+++ usr.sbin/tcpdump/print-ip.c
@@ -131,9 +131,9 @@ struct tr_resp {
 #define TR_PROTO_PIM 3
 #define TR_PROTO_CBT 4
 
-static void print_mtrace(register const u_char *bp, register u_int len)
+static void print_mtrace(const u_char *bp, u_int len)
 {
- register struct tr_query *tr = (struct tr_query *)(bp + 8);
+ struct tr_query *tr = (struct tr_query *)(bp + 8);
 
  printf("mtrace %d: %s to %s reply-to %s", tr->tr_qid,
  ipaddr_string(&tr->tr_src), ipaddr_string(&tr->tr_dst),
@@ -142,9 +142,9 @@ static void print_mtrace(register const
  printf(" with-ttl %d", tr->tr_rttl);
 }
 
-static void print_mresp(register const u_char *bp, register u_int len)
+static void print_mresp(const u_char *bp, u_int len)
 {
- register struct tr_query *tr = (struct tr_query *)(bp + 8);
+ struct tr_query *tr = (struct tr_query *)(bp + 8);
 
  printf("mresp %d: %s to %s reply-to %s", tr->tr_qid,
  ipaddr_string(&tr->tr_src), ipaddr_string(&tr->tr_dst),
@@ -154,10 +154,9 @@ static void print_mresp(register const u
 }
 
 static void
-igmp_print(register const u_char *bp, register u_int len,
-   register const u_char *bp2)
+igmp_print(const u_char *bp, u_int len, const u_char *bp2)
 {
- register const struct ip *ip;
+ const struct ip *ip;
 
  ip = (const struct ip *)bp2;
         (void)printf("%s > %s: ",
@@ -234,10 +233,10 @@ trunc:
  * print the recorded route in an IP RR, LSRR or SSRR option.
  */
 static void
-ip_printroute(const char *type, register const u_char *cp, u_int length)
+ip_printroute(const char *type, const u_char *cp, u_int length)
 {
- register u_int ptr = cp[2] - 1;
- register u_int len;
+ u_int ptr = cp[2] - 1;
+ u_int len;
 
  printf(" %s{", type);
  if ((length + 1) & 3)
@@ -259,9 +258,9 @@ ip_printroute(const char *type, register
  * print IP options.
  */
 static void
-ip_optprint(register const u_char *cp, u_int length)
+ip_optprint(const u_char *cp, u_int length)
 {
- register u_int len;
+ u_int len;
 
  for (; length > 0; cp += len, length -= len) {
  int tt = *cp;
@@ -320,7 +319,7 @@ ip_optprint(register const u_char *cp, u
  * don't modifiy the packet.
  */
 u_short
-in_cksum(const u_short *addr, register int len, u_short csum)
+in_cksum(const u_short *addr, int len, u_short csum)
 {
  int nleft = len;
  const u_short *w = addr;
@@ -353,11 +352,11 @@ in_cksum(const u_short *addr, register i
  * print an IP datagram.
  */
 void
-ip_print(register const u_char *bp, register u_int length)
+ip_print(const u_char *bp, u_int length)
 {
- register const struct ip *ip;
- register u_int hlen, len, off;
- register const u_char *cp;
+ const struct ip *ip;
+ u_int hlen, len, off;
+ const u_char *cp;
 
  ip = (const struct ip *)bp;
  /*
--- usr.sbin/tcpdump/print-ip6.c
+++ usr.sbin/tcpdump/print-ip6.c
@@ -56,12 +56,12 @@ static const char rcsid[] =
  * print an IP6 datagram.
  */
 void
-ip6_print(register const u_char *bp, register int length)
+ip6_print(const u_char *bp, int length)
 {
- register const struct ip6_hdr *ip6;
- register int hlen;
- register int len;
- register const u_char *cp;
+ const struct ip6_hdr *ip6;
+ int hlen;
+ int len;
+ const u_char *cp;
  int nh;
  u_int flow;
 
--- usr.sbin/tcpdump/print-ip6opts.c
+++ usr.sbin/tcpdump/print-ip6opts.c
@@ -106,10 +106,10 @@ trunc:
 }
 
 int
-hbhopt_print(register const u_char *bp)
+hbhopt_print(const u_char *bp)
 {
     const struct ip6_hbh *dp = (struct ip6_hbh *)bp;
-    register const u_char *ep;
+    const u_char *ep;
     int hbhlen = 0;
 
     /* 'ep' points to the end of avaible data. */
@@ -129,10 +129,10 @@ hbhopt_print(register const u_char *bp)
 }
 
 int
-dstopt_print(register const u_char *bp)
+dstopt_print(const u_char *bp)
 {
     const struct ip6_dest *dp = (struct ip6_dest *)bp;
-    register const u_char *ep;
+    const u_char *ep;
     int dstoptlen = 0;
 
     /* 'ep' points to the end of avaible data. */
--- usr.sbin/tcpdump/print-ipsec.c
+++ usr.sbin/tcpdump/print-ipsec.c
@@ -197,8 +197,7 @@ esp_decrypt (const u_char *bp, u_int len
 }
 
 void
-esp_print (register const u_char *bp, register u_int len,
-   register const u_char *bp2)
+esp_print (const u_char *bp, u_int len, const u_char *bp2)
 {
  const struct ip *ip;
  const struct esp_hdr *esp;
@@ -234,8 +233,7 @@ struct ah_hdr {
 };
 
 void
-ah_print (register const u_char *bp, register u_int len,
-  register const u_char *bp2)
+ah_print (const u_char *bp, u_int len, const u_char *bp2)
 {
  const struct ip *ip;
  const struct ah_hdr *ah;
@@ -312,8 +310,7 @@ struct ipcomp_hdr {
 };
 
 void
-ipcomp_print (register const u_char *bp, register u_int len,
-  register const u_char *bp2)
+ipcomp_print (const u_char *bp, u_int len, const u_char *bp2)
 {
  const struct ip *ip;
  const struct ipcomp_hdr *ipc;
--- usr.sbin/tcpdump/print-ipx.c
+++ usr.sbin/tcpdump/print-ipx.c
@@ -97,7 +97,7 @@ ipxaddr_string(u_int32_t net, const u_ch
 void
 ipx_decode(const struct ipxHdr *ipx, const u_char *datap, u_int length)
 {
-    register u_short dstSkt;
+    u_short dstSkt;
 
     dstSkt = EXTRACT_16BITS(&ipx->dstSkt);
     switch (dstSkt) {
--- usr.sbin/tcpdump/print-isoclns.c
+++ usr.sbin/tcpdump/print-isoclns.c
@@ -299,7 +299,7 @@ esis_print(const u_char *p, u_int length
 }
 
 static int
-osi_cksum(register const u_char *p, register u_int len,
+osi_cksum(const u_char *p, u_int len,
   const u_char *toff, u_char *cksum, u_char *off)
 {
  const u_char *ep;
--- usr.sbin/tcpdump/print-krb.c
+++ usr.sbin/tcpdump/print-krb.c
@@ -46,7 +46,7 @@ static const char rcsid[] =
 #include "interface.h"
 #include "addrtoname.h"
 
-const u_char *c_print(register const u_char *, register const u_char *);
+const u_char *c_print(const u_char *, const u_char *);
 const u_char *krb4_print_hdr(const u_char *);
 void krb4_print(const u_char *);
 void krb_print(const u_char *, u_int);
@@ -129,10 +129,10 @@ static struct tok kerr2str[] = {
 
 
 const u_char *
-c_print(register const u_char *s, register const u_char *ep)
+c_print(const u_char *s, const u_char *ep)
 {
- register u_char c;
- register int flag;
+ u_char c;
+ int flag;
 
  flag = 1;
  while (ep == NULL || s < ep) {
@@ -182,7 +182,7 @@ trunc:
 void
 krb4_print(const u_char *cp)
 {
- register const struct krb *kp;
+ const struct krb *kp;
  u_char type;
  u_short len;
 
@@ -264,7 +264,7 @@ trunc:
 void
 krb_print(const u_char *dat, u_int length)
 {
- register const struct krb *kp;
+ const struct krb *kp;
 
  kp = (struct krb *)dat;
 
--- usr.sbin/tcpdump/print-llc.c
+++ usr.sbin/tcpdump/print-llc.c
@@ -67,11 +67,11 @@ llc_print(const u_char *p, u_int length,
   const u_char *esrc, const u_char *edst)
 {
  struct llc llc;
- register u_short et;
+ u_short et;
 #if 0
  u_short control;
 #endif
- register int ret;
+ int ret;
 
  if (caplen < 3) {
  (void)printf("[|llc]");
--- usr.sbin/tcpdump/print-lwres.c
+++ usr.sbin/tcpdump/print-lwres.c
@@ -348,7 +348,7 @@ lwres_printaddr(lwres_addr_t *ap)
 }
 
 void
-lwres_print(register const u_char *bp, u_int length)
+lwres_print(const u_char *bp, u_int length)
 {
  const struct lwres_lwpacket *np;
  u_int32_t v;
--- usr.sbin/tcpdump/print-nfs.c
+++ usr.sbin/tcpdump/print-nfs.c
@@ -284,10 +284,9 @@ print_sattr3(const struct nfsv3_sattr *s
 }
 
 void
-nfsreply_print(register const u_char *bp, u_int length,
-       register const u_char *bp2)
+nfsreply_print(const u_char *bp, u_int length, const u_char *bp2)
 {
- register const struct rpc_msg *rp;
+ const struct rpc_msg *rp;
  u_int32_t proc, vers;
 
  nfserr = 0; /* assume no error */
@@ -305,10 +304,10 @@ nfsreply_print(register const u_char *bp
  * If the packet was truncated, return 0.
  */
 static const u_int32_t *
-parsereq(register const struct rpc_msg *rp, register u_int length)
+parsereq(const struct rpc_msg *rp, u_int length)
 {
- register const u_int32_t *dp;
- register u_int len;
+ const u_int32_t *dp;
+ u_int len;
 
  /*
  * find the start of the req data (if we captured it)
@@ -335,7 +334,7 @@ trunc:
  * If packet was truncated, return 0.
  */
 static const u_int32_t *
-parsefh(register const u_int32_t *dp, int v3)
+parsefh(const u_int32_t *dp, int v3)
 {
  int len;
 
@@ -359,10 +358,10 @@ trunc:
  * If packet was truncated, return 0.
  */
 static const u_int32_t *
-parsefn(register const u_int32_t *dp)
+parsefn(const u_int32_t *dp)
 {
- register u_int32_t len;
- register const u_char *cp;
+ u_int32_t len;
+ const u_char *cp;
 
  /* Bail if we don't have the string length */
  TCHECK(*dp);
@@ -392,7 +391,7 @@ trunc:
  * If packet was truncated (or there was some other error), return 0.
  */
 static const u_int32_t *
-parsefhn(register const u_int32_t *dp, int v3)
+parsefhn(const u_int32_t *dp, int v3)
 {
  dp = parsefh(dp, v3);
  if (dp == NULL)
@@ -402,11 +401,10 @@ parsefhn(register const u_int32_t *dp, i
 }
 
 void
-nfsreq_print(register const u_char *bp, u_int length,
-    register const u_char *bp2)
+nfsreq_print(const u_char *bp, u_int length, const u_char *bp2)
 {
- register const struct rpc_msg *rp;
- register const u_int32_t *dp;
+ const struct rpc_msg *rp;
+ const u_int32_t *dp;
  nfstype type;
  int v3;
  u_int32_t proc;
@@ -703,7 +701,7 @@ trunc:
  * additional hacking on the parser code.
  */
 static void
-nfs_printfh(register const u_int32_t *dp, const u_int len)
+nfs_printfh(const u_int32_t *dp, const u_int len)
 {
  my_fsid fsid;
  ino_t ino;
@@ -837,9 +835,9 @@ xid_map_find(const struct rpc_msg *rp, c
  * If the packet was truncated, return 0.
  */
 static const u_int32_t *
-parserep(register const struct rpc_msg *rp, register u_int length)
+parserep(const struct rpc_msg *rp, u_int length)
 {
- register const u_int32_t *dp;
+ const u_int32_t *dp;
  u_int len;
  enum accept_stat astat;
 
@@ -1332,8 +1330,8 @@ trunc:
 static void
 interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int32_t vers, int length)
 {
- register const u_int32_t *dp;
- register int v3;
+ const u_int32_t *dp;
+ int v3;
  int er;
 
  v3 = (vers == NFS_VER3);
--- usr.sbin/tcpdump/print-ntp.c
+++ usr.sbin/tcpdump/print-ntp.c
@@ -60,9 +60,9 @@ static void p_ntp_delta(const struct l_f
  * Print ntp requests
  */
 void
-ntp_print(register const u_char *cp, u_int length)
+ntp_print(const u_char *cp, u_int length)
 {
- register const struct ntpdata *bp;
+ const struct ntpdata *bp;
  int mode, version, leapind;
 
  bp = (struct ntpdata *)cp;
@@ -199,11 +199,11 @@ trunc:
 }
 
 static void
-p_sfix(register const struct s_fixedpt *sfp)
+p_sfix(const struct s_fixedpt *sfp)
 {
- register int i;
- register int f;
- register float ff;
+ int i;
+ int f;
+ float ff;
 
  i = ntohs(sfp->int_part);
  f = ntohs(sfp->fraction);
@@ -215,12 +215,12 @@ p_sfix(register const struct s_fixedpt *
 #define FMAXINT (4294967296.0) /* floating point rep. of MAXINT */
 
 static void
-p_ntp_time(register const struct l_fixedpt *lfp)
+p_ntp_time(const struct l_fixedpt *lfp)
 {
- register int32_t i;
- register u_int32_t uf;
- register u_int32_t f;
- register float ff;
+ int32_t i;
+ u_int32_t uf;
+ u_int32_t f;
+ float ff;
 
  i = ntohl(lfp->int_part);
  uf = ntohl(lfp->fraction);
@@ -234,14 +234,13 @@ p_ntp_time(register const struct l_fixed
 
 /* Prints time difference between *lfp and *olfp */
 static void
-p_ntp_delta(register const struct l_fixedpt *olfp,
-    register const struct l_fixedpt *lfp)
+p_ntp_delta(const struct l_fixedpt *olfp, const struct l_fixedpt *lfp)
 {
- register int32_t i;
- register u_int32_t uf;
- register u_int32_t ouf;
- register u_int32_t f;
- register float ff;
+ int32_t i;
+ u_int32_t uf;
+ u_int32_t ouf;
+ u_int32_t f;
+ float ff;
  int signbit;
 
  i = ntohl(lfp->int_part) - ntohl(olfp->int_part);
--- usr.sbin/tcpdump/print-ospf.c
+++ usr.sbin/tcpdump/print-ospf.c
@@ -87,11 +87,11 @@ static int ospf_print_lsa(const struct l
 static int ospf_decode_v2(const struct ospfhdr *, const u_char *);
 
 static inline void
-ospf_print_seqage(register u_int32_t seq, register time_t us)
+ospf_print_seqage(u_int32_t seq, time_t us)
 {
- register time_t sec = us % 60;
- register time_t mins = (us / 60) % 60;
- register time_t hour = us / 3600;
+ time_t sec = us % 60;
+ time_t mins = (us / 60) % 60;
+ time_t hour = us / 3600;
 
  printf(" S %X age ", seq);
  if (hour)
@@ -105,9 +105,9 @@ ospf_print_seqage(register u_int32_t seq
 
 
 static inline void
-ospf_print_bits(register const struct bits *bp, register u_char options)
+ospf_print_bits(const struct bits *bp, u_char options)
 {
- register char sep = ' ';
+ char sep = ' ';
 
  do {
  if (options & bp->bit) {
@@ -118,9 +118,9 @@ ospf_print_bits(register const struct bi
 }
 
 static void
-ospf_print_ls_type(register u_int ls_type,
-    register const struct in_addr *ls_stateid,
-    register const struct in_addr *ls_router, register const char *fmt)
+ospf_print_ls_type(u_int ls_type,
+    const struct in_addr *ls_stateid,
+    const struct in_addr *ls_router, const char *fmt)
 {
 
  switch (ls_type) {
@@ -167,7 +167,7 @@ ospf_print_ls_type(register u_int ls_typ
 }
 
 static int
-ospf_print_lshdr(register const struct lsa_hdr *lshp)
+ospf_print_lshdr(const struct lsa_hdr *lshp)
 {
 
  TCHECK(lshp->ls_type);
@@ -190,16 +190,16 @@ trunc:
  * Print a single link state advertisement.  If truncated return 1, else 0.
  */
 static int
-ospf_print_lsa(register const struct lsa *lsap)
+ospf_print_lsa(const struct lsa *lsap)
 {
- register const u_char *ls_end;
- register const struct rlalink *rlp;
- register const struct tos_metric *tosp;
- register const struct in_addr *ap;
- register const struct aslametric *almp;
- register const struct mcla *mcp;
- register const u_int32_t *lp;
- register int j, k;
+ const u_char *ls_end;
+ const struct rlalink *rlp;
+ const struct tos_metric *tosp;
+ const struct in_addr *ap;
+ const struct aslametric *almp;
+ const struct mcla *mcp;
+ const u_int32_t *lp;
+ int j, k;
 
  if (ospf_print_lshdr(&lsap->ls_hdr))
  return (1);
@@ -287,7 +287,7 @@ ospf_print_lsa(register const struct lsa
  TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
  lp = lsap->lsa_un.un_sla.sla_tosmetric;
  while ((u_char *)lp < ls_end) {
- register u_int32_t ul;
+ u_int32_t ul;
 
  TCHECK(*lp);
  ul = ntohl(*lp);
@@ -306,7 +306,7 @@ ospf_print_lsa(register const struct lsa
  TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
  almp = lsap->lsa_un.un_asla.asla_metric;
  while ((u_char *)almp < ls_end) {
- register u_int32_t ul;
+ u_int32_t ul;
 
  TCHECK(almp->asla_tosmetric);
  ul = ntohl(almp->asla_tosmetric);
@@ -363,15 +363,14 @@ trunc:
 }
 
 static int
-ospf_decode_v2(register const struct ospfhdr *op,
-    register const u_char *dataend)
+ospf_decode_v2(const struct ospfhdr *op, const u_char *dataend)
 {
- register const struct in_addr *ap;
- register const struct lsr *lsrp;
- register const struct lsa_hdr *lshp;
- register const struct lsa *lsap;
- register char sep;
- register int i;
+ const struct in_addr *ap;
+ const struct lsr *lsrp;
+ const struct lsa_hdr *lshp;
+ const struct lsa *lsap;
+ char sep;
+ int i;
 
  switch (op->ospf_type) {
 
@@ -498,13 +497,12 @@ trunc:
 }
 
 void
-ospf_print(register const u_char *bp, register u_int length,
-    register const u_char *bp2)
+ospf_print(const u_char *bp, u_int length, const u_char *bp2)
 {
- register const struct ospfhdr *op;
- register const struct ip *ip;
- register const u_char *dataend;
- register const char *cp;
+ const struct ospfhdr *op;
+ const struct ip *ip;
+ const u_char *dataend;
+ const char *cp;
 
  op = (struct ospfhdr *)bp;
  ip = (struct ip *)bp2;
--- usr.sbin/tcpdump/print-ospf6.c
+++ usr.sbin/tcpdump/print-ospf6.c
@@ -94,11 +94,11 @@ static int ospf6_print_lsa(const struct
 static int ospf6_decode_v3(const struct ospf6hdr *, const u_char *);
 
 static inline void
-ospf6_print_seqage(register u_int32_t seq, register time_t us)
+ospf6_print_seqage(u_int32_t seq, time_t us)
 {
- register time_t sec = us % 60;
- register time_t mins = (us / 60) % 60;
- register time_t hour = us / 3600;
+ time_t sec = us % 60;
+ time_t mins = (us / 60) % 60;
+ time_t hour = us / 3600;
 
  printf(" S %X age ", seq);
  if (hour)
@@ -112,9 +112,9 @@ ospf6_print_seqage(register u_int32_t se
 
 
 static inline void
-ospf6_print_bits(register const struct bits *bp, register u_char options)
+ospf6_print_bits(const struct bits *bp, u_char options)
 {
- register char sep = ' ';
+ char sep = ' ';
 
  do {
  if (options & bp->bit) {
@@ -125,9 +125,8 @@ ospf6_print_bits(register const struct b
 }
 
 static void
-ospf6_print_ls_type(register u_int ls_type,
-    register const rtrid_t *ls_stateid,
-    register const rtrid_t *ls_router, register const char *fmt)
+ospf6_print_ls_type(u_int ls_type, const rtrid_t *ls_stateid,
+    const rtrid_t *ls_router, const char *fmt)
 {
  char *scope;
 
@@ -208,7 +207,7 @@ ospf6_print_ls_type(register u_int ls_ty
 }
 
 static int
-ospf6_print_lshdr(register const struct lsa_hdr *lshp)
+ospf6_print_lshdr(const struct lsa_hdr *lshp)
 {
 
  TCHECK(lshp->ls_type);
@@ -225,7 +224,7 @@ trunc:
 }
 
 static int
-ospf6_print_lsaprefix(register const struct lsa_prefix *lsapp)
+ospf6_print_lsaprefix(const struct lsa_prefix *lsapp)
 {
  int k;
  struct in6_addr prefix;
@@ -253,24 +252,24 @@ trunc:
  * Print a single link state advertisement.  If truncated return 1, else 0.
  */
 static int
-ospf6_print_lsa(register const struct lsa *lsap)
+ospf6_print_lsa(const struct lsa *lsap)
 {
- register const u_char *ls_end;
- register const struct rlalink *rlp;
+ const u_char *ls_end;
+ const struct rlalink *rlp;
 #if 0
- register const struct tos_metric *tosp;
+ const struct tos_metric *tosp;
 #endif
- register const rtrid_t *ap;
+ const rtrid_t *ap;
 #if 0
- register const struct aslametric *almp;
- register const struct mcla *mcp;
+ const struct aslametric *almp;
+ const struct mcla *mcp;
 #endif
- register const struct llsa *llsap;
- register const struct lsa_prefix *lsapp;
+ const struct llsa *llsap;
+ const struct lsa_prefix *lsapp;
 #if 0
- register const u_int32_t *lp;
+ const u_int32_t *lp;
 #endif
- register int j, k;
+ int j, k;
 
  if (ospf6_print_lshdr(&lsap->ls_hdr))
  return (1);
@@ -354,7 +353,7 @@ ospf6_print_lsa(register const struct ls
  TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
  lp = lsap->lsa_un.un_sla.sla_tosmetric;
  while ((u_char *)lp < ls_end) {
- register u_int32_t ul;
+ u_int32_t ul;
 
  TCHECK(*lp);
  ul = ntohl(*lp);
@@ -373,7 +372,7 @@ ospf6_print_lsa(register const struct ls
  TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
  almp = lsap->lsa_un.un_asla.asla_metric;
  while ((u_char *)almp < ls_end) {
- register u_int32_t ul;
+ u_int32_t ul;
 
  TCHECK(almp->asla_tosmetric);
  ul = ntohl(almp->asla_tosmetric);
@@ -476,15 +475,14 @@ trunc:
 }
 
 static int
-ospf6_decode_v3(register const struct ospf6hdr *op,
-    register const u_char *dataend)
+ospf6_decode_v3(const struct ospf6hdr *op, const u_char *dataend)
 {
- register const rtrid_t *ap;
- register const struct lsr *lsrp;
- register const struct lsa_hdr *lshp;
- register const struct lsa *lsap;
- register char sep;
- register int i;
+ const rtrid_t *ap;
+ const struct lsr *lsrp;
+ const struct lsa_hdr *lshp;
+ const struct lsa *lsap;
+ char sep;
+ int i;
 
  switch (op->ospf6_type) {
 
@@ -613,11 +611,11 @@ trunc:
 }
 
 void
-ospf6_print(register const u_char *bp, register u_int length)
+ospf6_print(const u_char *bp, u_int length)
 {
- register const struct ospf6hdr *op;
- register const u_char *dataend;
- register const char *cp;
+ const struct ospf6hdr *op;
+ const u_char *dataend;
+ const char *cp;
 
  op = (struct ospf6hdr *)bp;
 
--- usr.sbin/tcpdump/print-pflog.c
+++ usr.sbin/tcpdump/print-pflog.c
@@ -60,8 +60,7 @@ struct rtentry;
 char *pf_reasons[PFRES_MAX+2] = PFRES_NAMES;
 
 void
-pflog_if_print(u_char *user, const struct pcap_pkthdr *h,
-     register const u_char *p)
+pflog_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
 {
  u_int length = h->len;
  u_int hdrlen;
@@ -179,8 +178,7 @@ out:
 
 
 void
-pflog_old_if_print(u_char *user, const struct pcap_pkthdr *h,
-     register const u_char *p)
+pflog_old_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
 {
  u_int length = h->len;
  u_int caplen = h->caplen;
--- usr.sbin/tcpdump/print-pfsync.c
+++ usr.sbin/tcpdump/print-pfsync.c
@@ -67,8 +67,7 @@ const char *pfsync_acts[] = { PFSYNC_ACT
 void pfsync_print(struct pfsync_header *, int);
 
 void
-pfsync_if_print(u_char *user, const struct pcap_pkthdr *h,
-     register const u_char *p)
+pfsync_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
 {
  u_int caplen = h->caplen;
 
--- usr.sbin/tcpdump/print-pim.c
+++ usr.sbin/tcpdump/print-pim.c
@@ -47,10 +47,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 
 void
-pim_print(register const u_char *bp, register u_int len)
+pim_print(const u_char *bp, u_int len)
 {
-    register const u_char *ep;
-    register u_char type;
+    const u_char *ep;
+    u_char type;
 
     ep = (const u_char *)snapend;
     if (bp >= ep)
--- usr.sbin/tcpdump/print-ppp.c
+++ usr.sbin/tcpdump/print-ppp.c
@@ -513,10 +513,10 @@ void
 ppp_if_print(user, h, p)
  u_char *user;
  const struct pcap_pkthdr *h;
- register const u_char *p;
+ const u_char *p;
 {
- register u_int length = h->len;
- register u_int caplen = h->caplen;
+ u_int length = h->len;
+ u_int caplen = h->caplen;
 
  ts_print(&h->ts);
 
@@ -574,7 +574,7 @@ void
 ppp_ether_if_print(user, h, p)
  u_char *user;
  const struct pcap_pkthdr *h;
- register const u_char *p;
+ const u_char *p;
 {
  u_int16_t pppoe_sid, pppoe_len;
  u_int caplen = h->caplen;
--- usr.sbin/tcpdump/print-radius.c
+++ usr.sbin/tcpdump/print-radius.c
@@ -234,7 +234,7 @@ static void r_print_hex(int code, int le
  fputc(']', stdout);
 }
 
-void radius_print(register const u_char *data, u_int len) {
+void radius_print(const u_char *data, u_int len) {
  const struct radius_header *rhp;
  const u_char *pp;
  int i, l, ac, al;
--- usr.sbin/tcpdump/print-rip.c
+++ usr.sbin/tcpdump/print-rip.c
@@ -77,9 +77,9 @@ rip_printblk(const u_char *cp, const u_c
 }
 
 static void
-rip_entry_print_v1(register int vers, register const struct rip_netinfo *ni)
+rip_entry_print_v1(int vers, const struct rip_netinfo *ni)
 {
- register u_short family;
+ u_short family;
 
  /* RFC 1058 */
  family = EXTRACT_16BITS(&ni->rip_family);
@@ -105,10 +105,10 @@ rip_entry_print_v1(register int vers, re
 }
 
 static void
-rip_entry_print_v2(register int vers, register const struct rip_netinfo *ni)
+rip_entry_print_v2(int vers, const struct rip_netinfo *ni)
 {
- register u_char *p;
- register u_short family;
+ u_char *p;
+ u_short family;
  char buf[RIP_AUTHLEN];
 
  /* RFC 1723 */
@@ -160,9 +160,9 @@ rip_entry_print_v2(register int vers, re
 void
 rip_print(const u_char *dat, u_int length)
 {
- register const struct rip *rp;
- register const struct rip_netinfo *ni;
- register int i, j, trunc;
+ const struct rip *rp;
+ const struct rip_netinfo *ni;
+ int i, j, trunc;
 
  i = min(length, snapend - dat) - sizeof(*rp);
  if (i < 0) {
--- usr.sbin/tcpdump/print-ripng.c
+++ usr.sbin/tcpdump/print-ripng.c
@@ -50,7 +50,7 @@ static const char rcsid[] =
 #include "addrtoname.h"
 
 static int
-rip6_entry_print(register const struct netinfo6 *ni, int metric)
+rip6_entry_print(const struct netinfo6 *ni, int metric)
 {
  int l;
  l = printf("%s/%d", ip6addr_string(&ni->rip6_dest), ni->rip6_plen);
@@ -64,10 +64,10 @@ rip6_entry_print(register const struct n
 void
 ripng_print(const u_char *dat, int length)
 {
- register const struct rip6 *rp = (struct rip6 *)dat;
- register const struct netinfo6 *ni;
- register int amt = snapend - dat;
- register int i = min(length, amt) -
+ const struct rip6 *rp = (struct rip6 *)dat;
+ const struct netinfo6 *ni;
+ int amt = snapend - dat;
+ int i = min(length, amt) -
  (sizeof(struct rip6) - sizeof(struct netinfo6));
  int j;
  int trunc;
--- usr.sbin/tcpdump/print-rt6.c
+++ usr.sbin/tcpdump/print-rt6.c
@@ -54,12 +54,12 @@ static const char rcsid[] =
 #include "addrtoname.h"
 
 int
-rt6_print(register const u_char *bp, register const u_char *bp2)
+rt6_print(const u_char *bp, const u_char *bp2)
 {
- register const struct ip6_rthdr *dp;
- register const struct ip6_rthdr0 *dp0;
- register const struct ip6_hdr *ip;
- register const u_char *ep;
+ const struct ip6_rthdr *dp;
+ const struct ip6_rthdr0 *dp0;
+ const struct ip6_hdr *ip;
+ const u_char *ep;
  int i, len;
 
  dp = (struct ip6_rthdr *)bp;
--- usr.sbin/tcpdump/print-skip.c
+++ usr.sbin/tcpdump/print-skip.c
@@ -164,8 +164,7 @@ unsigned char   old_skip_mid_sizes[MAX_A
                           8,    /* simplecrypt */
                 };
 
-void skip_print_old(register const u_char *bp, register int length,
- const u_char *bp2)
+void skip_print_old(const u_char *bp, int length, const u_char *bp2)
 {
  struct ip *ip;
  const u_char *end;
@@ -592,8 +591,7 @@ void skip_print_next(u_char nxt, const u
     }
 }
 
-void skip_print(register const u_char *bp, register int length,
- const u_char *bp2)
+void skip_print(const u_char *bp, int length, const u_char *bp2)
 {
  struct ip *ip;
  const u_char *end;
@@ -756,8 +754,7 @@ void skip_print(register const u_char *b
 
 
 
-void ah_print(register const u_char *bp, register int length,
- const u_char *bp2)
+void ah_print(const u_char *bp, int length, const u_char *bp2)
 {
  struct ip *ip;
  const u_char *end;
@@ -848,8 +845,7 @@ void ah_print(register const u_char *bp,
 }
 
 
-void esp_print(register const u_char *bp, register int length,
- const u_char *bp2)
+void esp_print(const u_char *bp, int length, const u_char *bp2)
 {
  struct ip *ip;
  const u_char *end;
--- usr.sbin/tcpdump/print-sl.c
+++ usr.sbin/tcpdump/print-sl.c
@@ -76,9 +76,9 @@ static void compressed_sl_print(const u_
 void
 sl_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
 {
- register u_int caplen = h->caplen;
- register u_int length = h->len;
- register const struct ip *ip;
+ u_int caplen = h->caplen;
+ u_int length = h->len;
+ const struct ip *ip;
 
  ts_print(&h->ts);
 
@@ -124,9 +124,9 @@ sl_if_print(u_char *user, const struct p
 void
 sl_bsdos_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
 {
- register u_int caplen = h->caplen;
- register u_int length = h->len;
- register const struct ip *ip;
+ u_int caplen = h->caplen;
+ u_int length = h->len;
+ const struct ip *ip;
 
  ts_print(&h->ts);
 
@@ -160,8 +160,7 @@ sl_bsdos_if_print(u_char *user, const st
 }
 
 static void
-sliplink_print(register const u_char *p, register const struct ip *ip,
-       register u_int length)
+sliplink_print(const u_char *p, const struct ip *ip, u_int length)
 {
  int dir;
  u_int hlen;
@@ -172,7 +171,7 @@ sliplink_print(register const u_char *p,
 
  if (nflag) {
  /* XXX just dump the header */
- register int i;
+ int i;
 
  for (i = SLX_CHDR; i < SLX_CHDR + CHDR_LEN - 1; ++i)
  printf("%02x.", p[i]);
@@ -209,9 +208,9 @@ sliplink_print(register const u_char *p,
 }
 
 static const u_char *
-print_sl_change(const char *str, register const u_char *cp)
+print_sl_change(const char *str, const u_char *cp)
 {
- register u_int i;
+ u_int i;
 
  if ((i = *cp++) == 0) {
  i = EXTRACT_16BITS(cp);
@@ -222,9 +221,9 @@ print_sl_change(const char *str, registe
 }
 
 static const u_char *
-print_sl_winchange(register const u_char *cp)
+print_sl_winchange(const u_char *cp)
 {
- register short i;
+ short i;
 
  if ((i = *cp++) == 0) {
  i = EXTRACT_16BITS(cp);
@@ -241,8 +240,8 @@ static void
 compressed_sl_print(const u_char *chdr, const struct ip *ip,
     u_int length, int dir)
 {
- register const u_char *cp = chdr;
- register u_int flags, hlen;
+ const u_char *cp = chdr;
+ u_int flags, hlen;
 
  flags = *cp++;
  if (flags & NEW_C) {
--- usr.sbin/tcpdump/print-snmp.c
+++ usr.sbin/tcpdump/print-snmp.c
@@ -332,7 +332,7 @@ static int truncated;
  * O/w, this returns the number of bytes parsed from "p".
  */
 static int
-asn1_parse(register const u_char *p, u_int len, struct be *elem)
+asn1_parse(const u_char *p, u_int len, struct be *elem)
 {
  u_char form, class, id;
  int i, hdr;
@@ -436,7 +436,7 @@ asn1_parse(register const u_char *p, u_i
  break;
 
  case INTEGER: {
- register int32_t data;
+ int32_t data;
  elem->type = BE_INT;
  data = 0;
 
@@ -477,7 +477,7 @@ asn1_parse(register const u_char *p, u_i
  case COUNTER:
  case GAUGE:
  case TIMETICKS: {
- register u_int32_t data;
+ u_int32_t data;
  elem->type = BE_UNS;
  data = 0;
  for (i = elem->asnlen; i-- > 0; p++)
@@ -611,7 +611,7 @@ asn1_print(struct be *elem)
  break;
 
  case BE_STR: {
- register int printable = 1, first = 1;
+ int printable = 1, first = 1;
  const u_char *p = elem->data.str;
  for (i = asnlen; printable && i-- > 0; p++)
  printable = isprint(*p) || isspace(*p);
--- usr.sbin/tcpdump/print-sunrpc.c
+++ usr.sbin/tcpdump/print-sunrpc.c
@@ -69,11 +69,10 @@ static struct tok proc2str[] = {
 static char *progstr(u_int32_t);
 
 void
-sunrpcrequest_print(register const u_char *bp, register u_int length,
-    register const u_char *bp2)
+sunrpcrequest_print(const u_char *bp, u_int length, const u_char *bp2)
 {
- register const struct rpc_msg *rp;
- register const struct ip *ip;
+ const struct rpc_msg *rp;
+ const struct ip *ip;
  u_int32_t x;
 
  rp = (struct rpc_msg *)bp;
--- usr.sbin/tcpdump/print-tcp.c
+++ usr.sbin/tcpdump/print-tcp.c
@@ -56,7 +56,7 @@ static const char rcsid[] =
 
 #include "nfs.h"
 
-static void print_tcp_rst_data(register const u_char *sp, u_int length);
+static void print_tcp_rst_data(const u_char *sp, u_int length);
 
 #define MAX_RST_DATA_LEN 30
 
@@ -131,9 +131,7 @@ static struct tcp_seq_hash tcp_seq_hash[
 #endif
 #define NETBIOS_SSN_PORT 139
 
-static int tcp_cksum(register const struct ip *ip,
-     register const struct tcphdr *tp,
-     register int len)
+static int tcp_cksum(const struct ip *ip, const struct tcphdr *tp, int len)
 {
  int i, tlen;
  union phu {
@@ -146,7 +144,7 @@ static int tcp_cksum(register const stru
  } ph;
  u_int16_t pa[6];
  } phu;
- register const u_int16_t *sp;
+ const u_int16_t *sp;
  u_int32_t sum;
  tlen = ntohs(ip->ip_len) - ((const char *)tp-(const char*)ip);
 
@@ -178,20 +176,19 @@ static int tcp_cksum(register const stru
 
 
 void
-tcp_print(register const u_char *bp, register u_int length,
-  register const u_char *bp2)
+tcp_print(const u_char *bp, u_int length, const u_char *bp2)
 {
- register const struct tcphdr *tp;
- register const struct ip *ip;
- register u_char flags;
- register int hlen;
- register char ch;
- register struct tcp_seq_hash *th = NULL;
- register int rev = 0;
+ const struct tcphdr *tp;
+ const struct ip *ip;
+ u_char flags;
+ int hlen;
+ char ch;
+ struct tcp_seq_hash *th = NULL;
+ int rev = 0;
  u_int16_t sport, dport, win, urp;
  tcp_seq seq, ack;
 #ifdef INET6
- register const struct ip6_hdr *ip6;
+ const struct ip6_hdr *ip6;
 #endif
 
  tp = (struct tcphdr *)bp;
@@ -463,8 +460,8 @@ tcp_print(register const u_char *bp, reg
  * Handle any options.
  */
  if ((hlen -= sizeof(*tp)) > 0) {
- register const u_char *cp;
- register int i, opt, len, datalen;
+ const u_char *cp;
+ int i, opt, len, datalen;
 
  cp = (const u_char *)tp + sizeof(*tp);
  putchar(' ');
@@ -675,7 +672,7 @@ trunc:
  */
 
 static void
-print_tcp_rst_data(register const u_char *sp, u_int length)
+print_tcp_rst_data(const u_char *sp, u_int length)
 {
  int c;
 
--- usr.sbin/tcpdump/print-tftp.c
+++ usr.sbin/tcpdump/print-tftp.c
@@ -72,12 +72,12 @@ static struct tok err2str[] = {
  * Print trivial file transfer program requests
  */
 void
-tftp_print(register const u_char *bp, u_int length)
+tftp_print(const u_char *bp, u_int length)
 {
- register const struct tftphdr *tp;
- register const char *cp;
- register const u_char *p;
- register int opcode, i;
+ const struct tftphdr *tp;
+ const char *cp;
+ const u_char *p;
+ int opcode, i;
  static char tstr[] = " [|tftp]";
 
  tp = (const struct tftphdr *)bp;
--- usr.sbin/tcpdump/print-timed.c
+++ usr.sbin/tcpdump/print-timed.c
@@ -55,7 +55,7 @@ static const char *tsptype[TSPTYPENUMBER
   "TEST", "SETDATE", "SETDATEREQ", "LOOP" };
 
 void
-timed_print(register const u_char *bp, u_int length)
+timed_print(const u_char *bp, u_int length)
 {
 #define endof(x) ((u_char *)&(x) + sizeof (x))
  struct tsp *tsp = (struct tsp *)bp;
--- usr.sbin/tcpdump/print-udp.c
+++ usr.sbin/tcpdump/print-udp.c
@@ -118,7 +118,7 @@ struct rtcp_rr {
 #define RTCP_PT_APP 204
 
 static void
-vat_print(const void *hdr,