Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Dec 2013 13:07:00 +0000 (UTC)
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r259943 - head/sys/netinet
Message-ID:  <201312271307.rBRD70oM037757@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tuexen
Date: Fri Dec 27 13:07:00 2013
New Revision: 259943
URL: http://svnweb.freebsd.org/changeset/base/259943

Log:
  Address some warnings which showed up on the userland version.
  
  MFC after: 1 week

Modified:
  head/sys/netinet/sctp_usrreq.c
  head/sys/netinet/sctputil.c

Modified: head/sys/netinet/sctp_usrreq.c
==============================================================================
--- head/sys/netinet/sctp_usrreq.c	Fri Dec 27 12:15:53 2013	(r259942)
+++ head/sys/netinet/sctp_usrreq.c	Fri Dec 27 13:07:00 2013	(r259943)
@@ -2788,7 +2788,7 @@ flags_out:
 
 			if (stcb) {
 				/* simply copy out the sockaddr_storage... */
-				int len;
+				size_t len;
 
 				len = *optsize;
 				if (len > stcb->asoc.primary_destination->ro._l_addr.sa.sa_len)

Modified: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c	Fri Dec 27 12:15:53 2013	(r259942)
+++ head/sys/netinet/sctputil.c	Fri Dec 27 13:07:00 2013	(r259943)
@@ -5868,8 +5868,8 @@ get_more_data:
 			goto release;
 		}
 		if ((uio->uio_resid == 0) ||
-		    ((in_eeor_mode) && (copied_so_far >= max(so->so_rcv.sb_lowat, 1)))
-		    ) {
+		    ((in_eeor_mode) &&
+		    (copied_so_far >= (uint32_t) max(so->so_rcv.sb_lowat, 1)))) {
 			goto release;
 		}
 		/*



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312271307.rBRD70oM037757>