Mercurial > ecos

changeset 3107:9c050c918d4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compiler warnings. Mostly variables that are set but not referenced and signed/unsigned char pointer mismatches.
author grante
date Fri, 09 Mar 2012 19:24:09 +0000
parents 7decb8c01c2a
children 8cb90904c542
files packages/net/bsd_tcpip/current/ChangeLog packages/net/bsd_tcpip/current/src/sys/net/if_ethersubr.c packages/net/bsd_tcpip/current/src/sys/netinet/ip_encap.c packages/net/bsd_tcpip/current/src/sys/netinet/tcp_input.c packages/net/bsd_tcpip/current/src/sys/netinet/tcp_output.c packages/net/bsd_tcpip/current/src/sys/netinet/tcp_usrreq.c packages/net/bsd_tcpip/current/src/sys/netinet/udp_usrreq.c
diffstat 7 files changed, 27 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/packages/net/bsd_tcpip/current/ChangeLog
+++ b/packages/net/bsd_tcpip/current/ChangeLog
@@ -1,3 +1,19 @@
+2012-03-08  Grant Edwards <grant.b.edwards@gmail.com>
+
+	* src/sys/net/if_ethersubr.c (ether_output, ether_resolvemulti):
+	Fix compiler warning by removing variable that was set but never
+	referenced.  Fix compiler warning about signed/unsigned pointer
+	mismatch.
+	* src/sys/netinet/tcp_input.c (tcp_input):
+	* src/sys/netinet/tcp_output.c (tcp_output):
+	* src/sys/netinet/ip_encap.c (encap6_ctlinput):
+	* src/sys/netinet/udp_usrreq.c (udp_output, udp_connect): Fix
+	compiler warnings about variables that are set but not referenced.
+	Some are removed, others that are referenced in
+	conditionally-compiled code are marked with the "unused"
+	attribute.
+	[ Bugzilla 1001525 ]
+
 2012-03-06  Grant Edwards <grant.b.edwards@gmail.com>
 	
 	* cdl/freebsd_net.cdl:
--- a/packages/net/bsd_tcpip/current/src/sys/net/if_ethersubr.c
+++ b/packages/net/bsd_tcpip/current/src/sys/net/if_ethersubr.c
@@ -147,7 +147,7 @@ ether_output(ifp, m, dst, rt0)
  	u_char esrc[6], edst[6];
 	register struct rtentry *rt;
 	register struct ether_header *eh;
-	int off, loop_copy = 0;
+	int loop_copy = 0;
 	int hlen;	/* link layer header lenght */
 	struct arpcom *ac = IFP2AC(ifp);
 
@@ -184,7 +184,6 @@ ether_output(ifp, m, dst, rt0)
 	case AF_INET:
 		if (!arpresolve(ac, rt, m, dst, edst, rt0))
 			return (0);	/* if not yet resolved */
-		off = m->m_pkthdr.len - m->m_len;
 		type = htons(ETHERTYPE_IP);
 		break;
 #endif
@@ -194,7 +193,6 @@ ether_output(ifp, m, dst, rt0)
 			/* Something bad happened */
 			return(0);
 		}
-		off = m->m_pkthdr.len - m->m_len;
 		type = htons(ETHERTYPE_IPV6);
 		break;
 #endif
@@ -935,7 +933,7 @@ ether_resolvemulti(ifp, llsa, sa)
 		sdl->sdl_index = ifp->if_index;
 		sdl->sdl_type = IFT_ETHER;
 		sdl->sdl_alen = ETHER_ADDR_LEN;
-		e_addr = LLADDR(sdl);
+		e_addr = (unsigned char*)LLADDR(sdl);
 		ETHER_MAP_IPV6_MULTICAST(&sin6->sin6_addr, e_addr);
 		*llsa = (struct sockaddr *)sdl;
 		return 0;
--- a/packages/net/bsd_tcpip/current/src/sys/netinet/ip_encap.c
+++ b/packages/net/bsd_tcpip/current/src/sys/netinet/ip_encap.c
@@ -817,12 +817,10 @@ encap6_ctlinput(cmd, sa, d0)
 	void *d0;
 {
 	void *d = d0;
-	struct ip6_hdr *ip6;
-	struct mbuf *m;
-	int off;
+	struct ip6_hdr *ip6 CYGBLD_ATTRIB_UNUSED;
+	struct mbuf *m CYGBLD_ATTRIB_UNUSED;
+	int off CYGBLD_ATTRIB_UNUSED;
 	struct ip6ctlparam *ip6cp = NULL;
-	const struct sockaddr_in6 *sa6_src = NULL;
-	void *cmdarg;
 	int nxt;
 	struct encaptab *ep;
 	const struct ip6protosw *psw;
@@ -848,14 +846,10 @@ encap6_ctlinput(cmd, sa, d0)
 		m = ip6cp->ip6c_m;
 		ip6 = ip6cp->ip6c_ip6;
 		off = ip6cp->ip6c_off;
-		cmdarg = ip6cp->ip6c_cmdarg;
-		sa6_src = ip6cp->ip6c_src;
 		nxt = ip6cp->ip6c_nxt;
 	} else {
 		m = NULL;
 		ip6 = NULL;
-		cmdarg = NULL;
-		sa6_src = &sa6_any;
 		nxt = -1;
 	}
 
--- a/packages/net/bsd_tcpip/current/src/sys/netinet/tcp_input.c
+++ b/packages/net/bsd_tcpip/current/src/sys/netinet/tcp_input.c
@@ -411,7 +411,7 @@ tcp_input(m, off0)
 	struct ip6_hdr *ip6 = NULL;
 	int isipv6;
 #endif /* INET6 */
-	int rstreason; /* For badport_bandlim accounting purposes */
+	int rstreason CYGBLD_ATTRIB_UNUSED; /* For badport_bandlim accounting purposes */
 
 #ifdef INET6
 	isipv6 = (mtod(m, struct ip *)->ip_v == 6) ? 1 : 0;
--- a/packages/net/bsd_tcpip/current/src/sys/netinet/tcp_output.c
+++ b/packages/net/bsd_tcpip/current/src/sys/netinet/tcp_output.c
@@ -119,7 +119,6 @@ tcp_output(tp)
 	int off, flags, error;
 	register struct mbuf *m;
 	struct ip *ip = NULL;
-	register struct ipovly *ipov = NULL;
 #ifdef INET6
 	struct ip6_hdr *ip6 = NULL;
 #endif /* INET6 */
@@ -650,7 +649,6 @@ send:
 #endif /* INET6 */
       {
 	ip = mtod(m, struct ip *);
-	ipov = (struct ipovly *)ip;
 	th = (struct tcphdr *)(ip + 1);
 	/* this picks up the pseudo header (w/o the length) */
 	tcp_fillheaders(tp, ip, th);
--- a/packages/net/bsd_tcpip/current/src/sys/netinet/tcp_usrreq.c
+++ b/packages/net/bsd_tcpip/current/src/sys/netinet/tcp_usrreq.c
@@ -132,7 +132,7 @@ tcp_usr_attach(struct socket *so, int pr
 	int s = splnet();
 	int error;
 	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp = 0;
+	struct tcpcb *tp CYGBLD_ATTRIB_UNUSED = 0;
 	TCPDEBUG0;
 
 	TCPDEBUG1();
@@ -205,7 +205,7 @@ tcp_usr_bind(struct socket *so, struct s
 	int s = splnet();
 	int error = 0;
 	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
+	struct tcpcb *tp CYGBLD_ATTRIB_UNUSED;
 	struct sockaddr_in *sinp;
 
 	COMMON_START();
@@ -234,7 +234,7 @@ tcp6_usr_bind(struct socket *so, struct 
 	int s = splnet();
 	int error = 0;
 	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp;
+	struct tcpcb *tp CYGBLD_ATTRIB_UNUSED;
 	struct sockaddr_in6 *sin6p;
 
 	COMMON_START();
@@ -429,7 +429,7 @@ tcp_usr_accept(struct socket *so, struct
 	int s = splnet();
 	int error = 0;
 	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp = NULL;
+	struct tcpcb *tp CYGBLD_ATTRIB_UNUSED = NULL;
 	TCPDEBUG0;
 
 	if (so->so_state & SS_ISDISCONNECTED) {
@@ -453,7 +453,7 @@ tcp6_usr_accept(struct socket *so, struc
 	int s = splnet();
 	int error = 0;
 	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp = NULL;
+	struct tcpcb *tp CYGBLD_ATTRIB_UNUSED = NULL;
 	TCPDEBUG0;
 
 	if (so->so_state & SS_ISDISCONNECTED) {
--- a/packages/net/bsd_tcpip/current/src/sys/netinet/udp_usrreq.c
+++ b/packages/net/bsd_tcpip/current/src/sys/netinet/udp_usrreq.c
@@ -667,7 +667,6 @@ udp_output(inp, m, addr, control, p)
 	register struct udpiphdr *ui;
 	register int len = m->m_pkthdr.len;
 	struct in_addr laddr;
-	struct sockaddr_in *sin;
 	int s = 0, error = 0;
 
         bzero(&laddr, sizeof(laddr));
@@ -680,7 +679,6 @@ udp_output(inp, m, addr, control, p)
 	}
 
 	if (addr) {
-		sin = (struct sockaddr_in *)addr;
 		laddr = inp->inp_laddr;
 		if (inp->inp_faddr.s_addr != INADDR_ANY) {
 			error = EISCONN;
@@ -840,7 +838,6 @@ udp_connect(struct socket *so, struct so
 {
 	struct inpcb *inp;
 	int s, error;
-	struct sockaddr_in *sin;
 
 	inp = sotoinpcb(so);
 	if (inp == 0)
@@ -850,7 +847,6 @@ udp_connect(struct socket *so, struct so
 	error = 0;
 	s = splnet();
 	if (error == 0) {
-		sin = (struct sockaddr_in *)nam;
 		error = in_pcbconnect(inp, nam, p);
 	}
 	splx(s);