39c39
< "$FreeBSD: head/usr.bin/netstat/route.c 100161 2002-07-16 05:57:21Z kbyanc $";
---
> "$FreeBSD: head/usr.bin/netstat/route.c 102975 2002-09-05 17:06:51Z dwmalone $";
109c109
< { 0 }
---
> { 0 , 0 }
139c139
< static void p_flags (int, char *);
---
> static void p_flags (int, const char *);
189c189
< pr_family(int af)
---
> pr_family(int af1)
191c191
< char *afname;
---
> const char *afname;
193c193
< switch (af) {
---
> switch (af1) {
229c229
< printf("\nProtocol Family %d:\n", af);
---
> printf("\nProtocol Family %d:\n", af1);
366c366
< pr_rthdr(int af)
---
> pr_rthdr(int af1)
371c371
< if (af == AF_INET || Wflag) {
---
> if (af1 == AF_INET || Wflag) {
493c493
< register struct rt_msghdr *rtm;
---
> struct rt_msghdr *rtm;
521c521
< register struct sockaddr *sa = (struct sockaddr *)(rtm + 1);
---
> struct sockaddr *sa = (struct sockaddr *)(rtm + 1);
526c526
< int af = 0, interesting = RTF_UP | RTF_GATEWAY | RTF_HOST;
---
> int af1 = 0, interesting = RTF_UP | RTF_GATEWAY | RTF_HOST;
537c537
< af = sa->sa_family;
---
> af1 = sa->sa_family;
541,544c541,544
< af = sa->sa_family;
< if (af != old_af) {
< pr_family(af);
< old_af = af;
---
> af1 = sa->sa_family;
> if (af1 != old_af) {
> pr_family(af1);
> old_af = af1;
578,579c578
< char *cplim;
< char *cp = workbuf;
---
> const char *cp;
584c583
< register struct sockaddr_in *sin = (struct sockaddr_in *)sa;
---
> struct sockaddr_in *sin = (struct sockaddr_in *)sa;
661c660
< register struct sockaddr_dl *sdl = (struct sockaddr_dl *)sa;
---
> struct sockaddr_dl *sdl = (struct sockaddr_dl *)sa;
664c663
< sdl->sdl_slen == 0)
---
> sdl->sdl_slen == 0) {
666c665,666
< else
---
> cp = workbuf;
> } else
685c685,686
< register u_char *s = (u_char *)sa->sa_data, *slim;
---
> u_char *s = (u_char *)sa->sa_data, *slim;
> char *cq, *cqlim;
686a688
> cq = workbuf;
688,691c690,693
< cplim = cp + sizeof(workbuf) - 6;
< cp += sprintf(cp, "(%d)", sa->sa_family);
< while (s < slim && cp < cplim) {
< cp += sprintf(cp, " %02x", *s++);
---
> cqlim = cq + sizeof(workbuf) - 6;
> cq += sprintf(cq, "(%d)", sa->sa_family);
> while (s < slim && cq < cqlim) {
> cq += sprintf(cq, " %02x", *s++);
693c695
< cp += sprintf(cp, "%02x", *s++);
---
> cq += sprintf(cq, "%02x", *s++);
703c705
< p_flags(int f, char *format)
---
> p_flags(int f, const char *format)
786c788
< register char *cp;
---
> char *cp;
828c830
< register int b, i;
---
> int b, i;
837c839
< register int bb;
---
> int bb;
864c866
< register u_long i;
---
> u_long i;
920c922
< char *
---
> const char *
1044,1046c1046,1048
< char *net = "", *host = "";
< register char *p;
< register u_char *q;
---
> const char *net = "", *host = "";
> char *p;
> u_char *q;
1111c1113
< register struct sockaddr_ipx *sipx = (struct sockaddr_ipx *)sa;
---
> struct sockaddr_ipx *sipx = (struct sockaddr_ipx *)sa;
1135c1137
< register struct sockaddr_ns *sns = (struct sockaddr_ns*)sa;
---
> struct sockaddr_ns *sns = (struct sockaddr_ns*)sa;
1141c1143
< register char *p; register u_char *q;
---
> char *p; u_char *q;
1181c1183
< register struct sockaddr_ns *sns = (struct sockaddr_ns *)sa;
---
> struct sockaddr_ns *sns = (struct sockaddr_ns *)sa;
1200c1202
< register char *p = p0;
---
> char *p = p0;