svn commit: r260426 - stable/10/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Tue Jan  7 23:50:02 2014
New Revision: 260426
URL: http://svnweb.freebsd.org/changeset/base/260426

Log:
  MFC r259943:
  
  Address some warnings which showed up on the userland version.

Modified:
  stable/10/sys/netinet/sctp_usrreq.c
  stable/10/sys/netinet/sctputil.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/sctp_usrreq.c
==============================================================================
--- stable/10/sys/netinet/sctp_usrreq.c	Tue Jan  7 23:20:21 2014	(r260425)
+++ stable/10/sys/netinet/sctp_usrreq.c	Tue Jan  7 23:50:02 2014	(r260426)
@@ -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: stable/10/sys/netinet/sctputil.c
==============================================================================
--- stable/10/sys/netinet/sctputil.c	Tue Jan  7 23:20:21 2014	(r260425)
+++ stable/10/sys/netinet/sctputil.c	Tue Jan  7 23:50:02 2014	(r260426)
@@ -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;
 		}
 		/*