svn commit: r266068 - stable/9/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Wed May 14 18:22:11 2014
New Revision: 266068
URL: http://svnweb.freebsd.org/changeset/base/266068

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

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

Modified: stable/9/sys/netinet/sctp_usrreq.c
==============================================================================
--- stable/9/sys/netinet/sctp_usrreq.c	Wed May 14 18:20:35 2014	(r266067)
+++ stable/9/sys/netinet/sctp_usrreq.c	Wed May 14 18:22:11 2014	(r266068)
@@ -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/9/sys/netinet/sctputil.c
==============================================================================
--- stable/9/sys/netinet/sctputil.c	Wed May 14 18:20:35 2014	(r266067)
+++ stable/9/sys/netinet/sctputil.c	Wed May 14 18:22:11 2014	(r266068)
@@ -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;
 		}
 		/*