From: Keith Sklower Date: Sun, 6 Jun 1993 06:57:13 +0000 (-0800) Subject: various lintish things come to light by protoypes. X-Git-Tag: BSD-4_4-Snapshot-Development~2 X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/45a83555dab1a83321c0256cfbc6e9a6574982dd various lintish things come to light by protoypes. SCCS-vsn: sys/netccitt/if_x25subr.c 7.21 SCCS-vsn: sys/netccitt/pk_subr.c 7.26 SCCS-vsn: sys/netccitt/ccitt_proto.c 7.9 SCCS-vsn: sys/netccitt/llc_input.c 7.2 SCCS-vsn: sys/netccitt/llc_subr.c 7.3 SCCS-vsn: sys/netccitt/llc_var.h 7.3 SCCS-vsn: sys/netccitt/pk_llcsubr.c 7.3 --- diff --git a/usr/src/sys/netccitt/ccitt_proto.c b/usr/src/sys/netccitt/ccitt_proto.c index 7e728333cc..3e05144ca3 100644 --- a/usr/src/sys/netccitt/ccitt_proto.c +++ b/usr/src/sys/netccitt/ccitt_proto.c @@ -9,7 +9,7 @@ * * %sccs.include.redist.c% * - * @(#)ccitt_proto.c 7.8 (Berkeley) %G% + * @(#)ccitt_proto.c 7.9 (Berkeley) %G% */ #include @@ -29,13 +29,15 @@ extern struct domain ccittdomain; #define DOMAIN &ccittdomain #ifdef LLC -int llc_output(), llc_ctlinput(), llc_init(), llc_timer(); +int llc_output(); +void llc_ctlinput(), llc_init(), llc_timer(); #endif #ifdef HDLC -int hd_output(), hd_ctlinput(), hd_init(), hd_timer(); +int hd_output(); +void hd_ctlinput(), hd_init(), hd_timer(); #endif -int pk_usrreq(), pk_timer(), pk_init(), pk_ctloutput(); -int pk_input(), pk_ctlinput(); +int pk_usrreq(), pk_ctloutput(); +void pk_timer(), pk_init(), pk_input(), pk_ctlinput(); struct protosw ccittsw[] = { #ifdef LLC diff --git a/usr/src/sys/netccitt/if_x25subr.c b/usr/src/sys/netccitt/if_x25subr.c index 472a1d6077..e68016309e 100644 --- a/usr/src/sys/netccitt/if_x25subr.c +++ b/usr/src/sys/netccitt/if_x25subr.c @@ -4,7 +4,7 @@ * * %sccs.include.redist.c% * - * @(#)if_x25subr.c 7.20 (Berkeley) %G% + * @(#)if_x25subr.c 7.21 (Berkeley) %G% */ #include @@ -621,7 +621,7 @@ register struct x25_ifaddr *ia; * This uses the X25 routing table to do inverse * lookup of x25 address to sockaddr. */ - if (rt = rtalloc1(dst, 0)) { + if (rt = rtalloc1(SA(dst), 0)) { sa = rt->rt_gateway; rt->rt_refcnt--; } diff --git a/usr/src/sys/netccitt/llc_input.c b/usr/src/sys/netccitt/llc_input.c index ffa70d6ede..491e62d60a 100644 --- a/usr/src/sys/netccitt/llc_input.c +++ b/usr/src/sys/netccitt/llc_input.c @@ -10,7 +10,7 @@ * * %sccs.include.redist.c% * - * @(#)llc_input.c 7.1 (Berkeley) %G% + * @(#)llc_input.c 7.2 (Berkeley) %G% */ #include @@ -59,8 +59,6 @@ llcintr() struct rtentry *llrt; struct rtentry *nlrt; - struct mbuf *m_adj(); - for (;;) { i = splimp(); IF_DEQUEUE(&llcintrq, m); @@ -154,7 +152,7 @@ llcintr() */ cmdrsp = (frame->llc_ssap & 0x01); frame->llc_ssap &= ~0x01; - if (llrt = rtalloc1(&sdlhdr->sdlhdr_src, 0)) + if (llrt = rtalloc1((struct sockaddr *)&sdlhdr->sdlhdr_src, 0)) llrt->rt_refcnt--; #ifdef notyet else llrt = npaidb_enter(&sdlhdr->sdlhdr_src, 0, 0, 0); diff --git a/usr/src/sys/netccitt/llc_subr.c b/usr/src/sys/netccitt/llc_subr.c index afd0b9e171..fb213ad0a6 100644 --- a/usr/src/sys/netccitt/llc_subr.c +++ b/usr/src/sys/netccitt/llc_subr.c @@ -10,7 +10,7 @@ * * %sccs.include.redist.c% * - * @(#)llc_subr.c 7.2 (Berkeley) %G% + * @(#)llc_subr.c 7.3 (Berkeley) %G% */ #include @@ -206,7 +206,8 @@ llc_setsapinfo(struct ifnet *ifp, u_char af, u_char sap, struct dllconfig *llcon sap_saddr.sdl_alen++; /* now enter it */ - rtrequest(RTM_ADD, &sap_saddr, &sap_sgate, 0, 0, &sirt); + rtrequest(RTM_ADD, (struct sockaddr *)&sap_saddr, + (struct sockaddr *)&sap_sgate, 0, 0, &sirt); if (sirt == 0) return 0; @@ -254,7 +255,7 @@ llc_getsapinfo(u_char sap, struct ifnet *ifp) si_addr.sdl_data[saploc] = sap; si_addr.sdl_alen++; - if ((sirt = rtalloc1(&si_addr, 0))) + if ((sirt = rtalloc1((struct sockaddr *)&si_addr, 0))) sirt->rt_refcnt--; else return(0); diff --git a/usr/src/sys/netccitt/llc_var.h b/usr/src/sys/netccitt/llc_var.h index c76effc0a5..d5c7f6015f 100644 --- a/usr/src/sys/netccitt/llc_var.h +++ b/usr/src/sys/netccitt/llc_var.h @@ -10,7 +10,7 @@ * * %sccs.include.redist.c% * - * @(#)llc_var.h 7.2 (Berkeley) %G% + * @(#)llc_var.h 7.3 (Berkeley) %G% */ #ifdef __STDC__ @@ -39,7 +39,7 @@ struct npaidbentry { u_short SI_window; u_short SI_trace; u_short SI_xchxid; - int (*SI_input) + void (*SI_input) __P((struct mbuf *)); caddr_t (*SI_ctlinput) __P((int, struct sockaddr *, caddr_t)); diff --git a/usr/src/sys/netccitt/pk_llcsubr.c b/usr/src/sys/netccitt/pk_llcsubr.c index e3f3a57dae..f9c739b7d4 100644 --- a/usr/src/sys/netccitt/pk_llcsubr.c +++ b/usr/src/sys/netccitt/pk_llcsubr.c @@ -10,7 +10,7 @@ * * %sccs.include.redist.c% * - * @(#)pk_llcsubr.c 7.2 (Berkeley) %G% + * @(#)pk_llcsubr.c 7.3 (Berkeley) %G% */ #include @@ -94,6 +94,7 @@ (caddr_t)(a2), \ (a1)->sa_len) == 0) #define XIFA(rt) ((struct x25_ifaddr *)((rt)->rt_ifa)) +#define SA(s) ((struct sockaddr *)s) int cons_rtrequest(int cmd, struct rtentry *rt, struct sockaddr *dst) @@ -251,7 +252,7 @@ npaidb_enter(struct sockaddr_dl *key, struct sockaddr *value, USES_AF_LINK_RTS; - if ((nprt = rtalloc1(key, 0)) == 0) { + if ((nprt = rtalloc1(SA(key), 0)) == 0) { register u_int size = sizeof(struct npaidbentry); register u_char saploc = LLSAPLOC(key, rt->rt_ifp); @@ -270,7 +271,8 @@ npaidb_enter(struct sockaddr_dl *key, struct sockaddr *value, value = &npdl_dummy; /* now enter it */ - rtrequest(RTM_ADD, key, value, &npdl_netmask, 0, &nprt); + rtrequest(RTM_ADD, SA(key), SA(value), + SA(&npdl_netmask), 0, &nprt); /* and reset npdl_netmask */ for (i = saploc; i < npdl_datasize; i++) @@ -292,7 +294,7 @@ npaidb_enrich(short type, caddr_t info, struct sockaddr_dl *sdl) USES_AF_LINK_RTS; - if (rt = rtalloc1(sdl, 0)) { + if (rt = rtalloc1((struct sockaddr *)sdl, 0)) { rt->rt_refcnt--; switch (type) { case NPAIDB_LINK: diff --git a/usr/src/sys/netccitt/pk_subr.c b/usr/src/sys/netccitt/pk_subr.c index b40605d4fd..f9033649a7 100644 --- a/usr/src/sys/netccitt/pk_subr.c +++ b/usr/src/sys/netccitt/pk_subr.c @@ -12,7 +12,7 @@ * * %sccs.include.redist.c% * - * @(#)pk_subr.c 7.25 (Berkeley) %G% + * @(#)pk_subr.c 7.26 (Berkeley) %G% */ #include @@ -459,7 +459,7 @@ register struct sockaddr_x25 *sa; /* * Is the destination address known? */ - if (!(rt = rtalloc1 (sa, 1))) + if (!(rt = rtalloc1 ((struct sockaddr *)sa, 1))) return (ENETUNREACH); if (!(pkp = XTRACTPKP(rt)))