Mercurial > ecos
changeset 3108:8cb90904c542
Fix compiler warnings -- mostly variables that are set but not referenced
and mismatches between pointers to signed/unsigned char. Bugzilla 1001526
line wrap: on
line diff
--- a/packages/net/bsd_tcpip/current/ChangeLog +++ b/packages/net/bsd_tcpip/current/ChangeLog @@ -1,3 +1,26 @@ +2012-03-08 Grant Edwards <grant.b.edwards@gmail.com> + + * src/sys/netinet6/icmp6.c (icmp6_redirect_input): + * src/sys/netinet6/in6_src.c (in6_selectroute): + * src/sys/netinet6/ip6_mroute.c (phyint_send, pim6_input): + * src/sys/netinet6/nd6.c (nd6_timer, nd6_dad_ns_input): + * src/sys/netinet6/nd6_rtr.c (prelist_update): + * src/sys/netinet6/ip6_output.c (ip6_ctloutput, ip6_raw_ctloutput): + * src/sys/netinet6/raw_ip6.c (rip6_ctlinput): + * src/sys/netinet6/ip6_input.c (ip6_hopopts_input): Fix compiler + warnings by removing variables that are set but never referenced, + or by declaring them as "unused" if they are referenced only by + conditionally-compiled code. + * src/sys/netinet6/raw_ip6.c (rip6_ctlinput): + * src/sys/netinet6/in6_ifattach.c (get_rand_ifid,in6_nigroup): + * src/sys/netinet6/ip6_output.c (ip6_insert_jumboopt): + * src/sys/netinet6/ip6_input.c (ip6_get_prevhdr): Fix compiler + warnings about signed/unsigned char mismatches. + * src/sys/netinet6/ip6_input.c (ip6_savecontrol): Fix + grouping/precedence/paren error in flag checking expression -- + verified same fix is already in upstream. + [ Bugzilla 1001526 ] + 2012-03-08 Grant Edwards <grant.b.edwards@gmail.com> * src/sys/net/if_ethersubr.c (ether_output, ether_resolvemulti):
--- a/packages/net/bsd_tcpip/current/src/sys/netinet6/icmp6.c +++ b/packages/net/bsd_tcpip/current/src/sys/netinet6/icmp6.c @@ -2536,8 +2536,6 @@ icmp6_redirect_input(m, off) int icmp6len = ntohs(ip6->ip6_plen); char *lladdr = NULL; int lladdrlen = 0; - u_char *redirhdr = NULL; - int redirhdrlen = 0; struct rtentry *rt = NULL; int is_router; int is_onlink; @@ -2670,11 +2668,6 @@ icmp6_redirect_input(m, off) lladdrlen = ndopts.nd_opts_tgt_lladdr->nd_opt_len << 3; } - if (ndopts.nd_opts_rh) { - redirhdrlen = ndopts.nd_opts_rh->nd_opt_rh_len; - redirhdr = (u_char *)(ndopts.nd_opts_rh + 1); /* xxx */ - } - if (lladdr && ((ifp->if_addrlen + 2 + 7) & ~7) != lladdrlen) { nd6log((LOG_INFO, "icmp6_redirect_input: lladdrlen mismatch for %s "
--- a/packages/net/bsd_tcpip/current/src/sys/netinet6/in6_ifattach.c +++ b/packages/net/bsd_tcpip/current/src/sys/netinet6/in6_ifattach.c @@ -209,7 +209,7 @@ get_rand_ifid(ifp, in6) /* generate 8 bytes of pseudo-random value. */ bzero(&ctxt, sizeof(ctxt)); MD5Init(&ctxt); - MD5Update(&ctxt, hostname, hostnamelen); + MD5Update(&ctxt, (unsigned char*)hostname, hostnamelen); MD5Final(digest, &ctxt); /* assumes sizeof(digest) > sizeof(ifid) */ @@ -411,7 +411,7 @@ get_hw_ifid(ifp, in6) return -1; found: - addr = LLADDR(sdl); + addr = (unsigned char*)LLADDR(sdl); addrlen = sdl->sdl_alen; switch (ifp->if_type) { @@ -841,7 +841,7 @@ in6_nigroup(ifp, name, namelen, in6) l = p - name; strncpy(n, name, l); n[(int)l] = '\0'; - for (q = n; *q; q++) { + for (q = (unsigned char*)n; *q; q++) { if ('A' <= *q && *q <= 'Z') *q = *q - 'A' + 'a'; } @@ -849,8 +849,8 @@ in6_nigroup(ifp, name, namelen, in6) /* generate 8 bytes of pseudo-random value. */ bzero(&ctxt, sizeof(ctxt)); MD5Init(&ctxt); - MD5Update(&ctxt, &l, sizeof(l)); - MD5Update(&ctxt, n, l); + MD5Update(&ctxt, (unsigned char*)&l, sizeof(l)); + MD5Update(&ctxt, (unsigned char*)n, l); MD5Final(digest, &ctxt); bzero(in6, sizeof(*in6));
--- a/packages/net/bsd_tcpip/current/src/sys/netinet6/in6_src.c +++ b/packages/net/bsd_tcpip/current/src/sys/netinet6/in6_src.c @@ -716,8 +716,6 @@ in6_selectroute(dstsock, opts, mopts, ro * a new one. */ if (ro) { - int newroute = 0; - if (ro->ro_rt && (!(ro->ro_rt->rt_flags & RTF_UP) || !IN6_ARE_ADDR_EQUAL(&satosin6(&ro->ro_dst)->sin6_addr, @@ -729,7 +727,6 @@ in6_selectroute(dstsock, opts, mopts, ro struct sockaddr_in6 *sa6; /* No route yet, so try to acquire one */ - newroute = 1; bzero(&ro->ro_dst, sizeof(struct sockaddr_in6)); sa6 = (struct sockaddr_in6 *)&ro->ro_dst; sa6->sin6_family = AF_INET6;
--- a/packages/net/bsd_tcpip/current/src/sys/netinet6/ip6_input.c +++ b/packages/net/bsd_tcpip/current/src/sys/netinet6/ip6_input.c @@ -1362,7 +1362,6 @@ ip6_hopopts_input(plenp, rtalertp, mp, o struct mbuf *m = *mp; int off = *offp, hbhlen; struct ip6_hbh *hbh; - u_int8_t *opt; /* validation of the length of the header */ #ifndef PULLDOWN_TEST @@ -1389,7 +1388,6 @@ ip6_hopopts_input(plenp, rtalertp, mp, o #endif off += hbhlen; hbhlen -= sizeof(struct ip6_hbh); - opt = (u_int8_t *)hbh + sizeof(struct ip6_hbh); if (ip6_process_hopopts(m, (u_int8_t *)hbh + sizeof(struct ip6_hbh), hbhlen, rtalertp, plenp) < 0) @@ -1914,7 +1912,7 @@ ip6_savecontrol(in6p, ip6, m, ctl, prevc struct ip6_rthdr *prevrth = NULL; int prevrhlen = 0; - if (!in6p->in6p_flags & IN6P_RTHDR) + if (!(in6p->in6p_flags & IN6P_RTHDR)) break; if (prevctl && prevctl->rthdr) { @@ -2274,7 +2272,7 @@ ip6_get_prevhdr(m, off) struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *); if (off == sizeof(struct ip6_hdr)) - return(&ip6->ip6_nxt); + return((char*)&ip6->ip6_nxt); else { int len, nxt; struct ip6_ext *ip6e = NULL; @@ -2298,7 +2296,7 @@ ip6_get_prevhdr(m, off) nxt = ip6e->ip6e_nxt; } if (ip6e) - return(&ip6e->ip6e_nxt); + return((char*)&ip6e->ip6e_nxt); else return NULL; }
--- a/packages/net/bsd_tcpip/current/src/sys/netinet6/ip6_mroute.c +++ b/packages/net/bsd_tcpip/current/src/sys/netinet6/ip6_mroute.c @@ -1605,7 +1605,7 @@ phyint_send(ip6, mifp, m) { struct mbuf *mb_copy; struct ifnet *ifp = mifp->m6_ifp; - int error = 0; + int error CYGBLD_ATTRIB_UNUSED = 0; #ifdef __NetBSD__ int s = splsoftnet(); /* needs to protect static "ro" below. */ #else @@ -1896,7 +1896,6 @@ pim6_input(mp, offp, proto) struct mbuf *mcp; struct ip6_hdr *eip6; u_int32_t *reghdr; - int rc; ++pim6stat.pim6s_rcv_registers; @@ -2000,15 +1999,15 @@ pim6_input(mp, offp, proto) #if defined(__FreeBSD__) && __FreeBSD__ >= 3 #if (__FreeBSD_version >= 410000) - rc = if_simloop(mif6table[reg_mif_num].m6_ifp, m, + if_simloop(mif6table[reg_mif_num].m6_ifp, m, dst.sin6_family, (int)NULL); #else - rc = if_simloop(mif6table[reg_mif_num].m6_ifp, m, + if_simloop(mif6table[reg_mif_num].m6_ifp, m, (struct sockaddr *) &dst, NULL); #endif #else - rc = looutput(mif6table[reg_mif_num].m6_ifp, m, + looutput(mif6table[reg_mif_num].m6_ifp, m, (struct sockaddr *) &dst, (struct rtentry *) NULL); #endif
--- a/packages/net/bsd_tcpip/current/src/sys/netinet6/ip6_output.c +++ b/packages/net/bsd_tcpip/current/src/sys/netinet6/ip6_output.c @@ -1654,7 +1654,7 @@ ip6_insert_jumboopt(exthdrs, plen) n->m_len = oldoptlen + JUMBOOPTLEN; bcopy(mtod(mopt, caddr_t), mtod(n, caddr_t), oldoptlen); - optbuf = mtod(n, caddr_t) + oldoptlen; + optbuf = (unsigned char*)mtod(n, caddr_t) + oldoptlen; m_freem(mopt); mopt = exthdrs->ip6e_hbh = n; } else { @@ -1822,7 +1822,6 @@ ip6_ctloutput(op, so, level, optname, mp void *optdata; struct ip6_recvpktopts *rcvopts; #if defined(IPSEC) && defined(__OpenBSD__) - struct proc *p = curproc; /* XXX */ struct tdb *tdb; struct tdb_ident *tdbip, tdbi; int s; @@ -1832,7 +1831,6 @@ ip6_ctloutput(op, so, level, optname, mp int error, optval; int level, op, optname; int optlen; - struct proc *p; if (!sopt) { panic("ip6_ctloutput: arg soopt is NULL"); @@ -1841,7 +1839,6 @@ ip6_ctloutput(op, so, level, optname, mp op = sopt->sopt_dir; optname = sopt->sopt_name; optlen = sopt->sopt_valsize; - p = sopt->sopt_p; #else #ifdef HAVE_NRL_INPCB struct inpcb *inp = sotoinpcb(so); @@ -1853,7 +1850,6 @@ ip6_ctloutput(op, so, level, optname, mp int error, optval; int optlen; #if defined(__NetBSD__) || (defined(__FreeBSD__) && __FreeBSD__ >= 3) - struct proc *p = curproc; /* XXX */ #endif optlen = m ? m->m_len : 0; @@ -2863,7 +2859,6 @@ ip6_raw_ctloutput(op, so, level, optname #endif #if defined(__FreeBSD__) && __FreeBSD__ >= 3 int level, op, optname; - struct proc *p; #else struct mbuf *m = *mp; #endif /* FreeBSD >= 3 */ @@ -2876,7 +2871,6 @@ ip6_raw_ctloutput(op, so, level, optname op = sopt->sopt_dir; optname = sopt->sopt_name; optlen = sopt->sopt_valsize; - p = sopt->sopt_p; #else optlen = m ? m->m_len : 0; #endif /* FreeBSD >= 3 */
--- a/packages/net/bsd_tcpip/current/src/sys/netinet6/nd6.c +++ b/packages/net/bsd_tcpip/current/src/sys/netinet6/nd6.c @@ -496,7 +496,6 @@ nd6_timer(ignored_arg) #endif struct ifnet *ifp; struct in6_ifaddr *ia6, *nia6; - struct in6_addrlifetime *lt6; #ifdef __NetBSD__ s = splsoftnet(); @@ -672,7 +671,6 @@ nd6_timer(ignored_arg) for (ia6 = in6_ifaddr; ia6; ia6 = nia6) { nia6 = ia6->ia_next; /* check address lifetime */ - lt6 = &ia6->ia6_lifetime; if (IFA6_IS_INVALID(ia6)) { int regen = 0;
--- a/packages/net/bsd_tcpip/current/src/sys/netinet6/nd6_nbr.c +++ b/packages/net/bsd_tcpip/current/src/sys/netinet6/nd6_nbr.c @@ -1460,7 +1460,6 @@ nd6_dad_ns_input(ifa) struct ifaddr *ifa; { struct in6_ifaddr *ia; - struct ifnet *ifp; const struct in6_addr *taddr6; struct dadq *dp; int duplicate; @@ -1469,7 +1468,6 @@ nd6_dad_ns_input(ifa) panic("ifa == NULL in nd6_dad_ns_input"); ia = (struct in6_ifaddr *)ifa; - ifp = ifa->ifa_ifp; taddr6 = &ia->ia_addr.sin6_addr; duplicate = 0; dp = nd6_dad_find(ifa);
--- a/packages/net/bsd_tcpip/current/src/sys/netinet6/nd6_rtr.c +++ b/packages/net/bsd_tcpip/current/src/sys/netinet6/nd6_rtr.c @@ -1258,7 +1258,6 @@ prelist_update(new, dr, m) int s = splnet(); #endif int error = 0; - int newprefix = 0; int auth; struct in6_addrlifetime lt6_tmp; @@ -1317,8 +1316,6 @@ prelist_update(new, dr, m) } else { struct nd_prefix *newpr = NULL; - newprefix = 1; - if (new->ndpr_vltime == 0) goto end; if (new->ndpr_raf_onlink == 0 && new->ndpr_raf_auto == 0)
--- a/packages/net/bsd_tcpip/current/src/sys/netinet6/raw_ip6.c +++ b/packages/net/bsd_tcpip/current/src/sys/netinet6/raw_ip6.c @@ -259,9 +259,6 @@ rip6_ctlinput(cmd, sa, d) struct sockaddr *sa; void *d; { - struct ip6_hdr *ip6; - struct mbuf *m; - int off = 0; struct ip6ctlparam *ip6cp = NULL; const struct sockaddr_in6 *sa6_src = NULL; void *cmdarg; @@ -283,14 +280,9 @@ rip6_ctlinput(cmd, sa, d) /* if the parameter is from icmp6, decode it. */ if (d != NULL) { ip6cp = (struct ip6ctlparam *)d; - m = ip6cp->ip6c_m; - ip6 = ip6cp->ip6c_ip6; - off = ip6cp->ip6c_off; cmdarg = ip6cp->ip6c_cmdarg; sa6_src = ip6cp->ip6c_src; } else { - m = NULL; - ip6 = NULL; cmdarg = NULL; sa6_src = &sa6_any; }