Author: tuexen
Date: Mon Nov 30 09:11:24 2020
New Revision: 368173
URL: https://svnweb.freebsd.org/changeset/base/368173

Log:
  MFC r366480:
  
  Cleanup, no functional change intended.

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

Modified: stable/12/sys/netinet/sctp_usrreq.c
==============================================================================
--- stable/12/sys/netinet/sctp_usrreq.c Mon Nov 30 09:10:05 2020        
(r368172)
+++ stable/12/sys/netinet/sctp_usrreq.c Mon Nov 30 09:11:24 2020        
(r368173)
@@ -3067,43 +3067,27 @@ flags_out:
                        break;
                }
        case SCTP_RECVRCVINFO:
-               {
-                       int onoff;
-
-                       if (*optsize < sizeof(int)) {
-                               SCTP_LTRACE_ERR_RET(inp, NULL, NULL, 
SCTP_FROM_SCTP_USRREQ, EINVAL);
-                               error = EINVAL;
-                       } else {
-                               SCTP_INP_RLOCK(inp);
-                               onoff = sctp_is_feature_on(inp, 
SCTP_PCB_FLAGS_RECVRCVINFO);
-                               SCTP_INP_RUNLOCK(inp);
-                       }
-                       if (error == 0) {
-                               /* return the option value */
-                               *(int *)optval = onoff;
-                               *optsize = sizeof(int);
-                       }
-                       break;
+               if (*optsize < sizeof(int)) {
+                       SCTP_LTRACE_ERR_RET(inp, NULL, NULL, 
SCTP_FROM_SCTP_USRREQ, EINVAL);
+                       error = EINVAL;
+               } else {
+                       SCTP_INP_RLOCK(inp);
+                       *(int *)optval = sctp_is_feature_on(inp, 
SCTP_PCB_FLAGS_RECVRCVINFO);
+                       SCTP_INP_RUNLOCK(inp);
+                       *optsize = sizeof(int);
                }
+               break;
        case SCTP_RECVNXTINFO:
-               {
-                       int onoff;
-
-                       if (*optsize < sizeof(int)) {
-                               SCTP_LTRACE_ERR_RET(inp, NULL, NULL, 
SCTP_FROM_SCTP_USRREQ, EINVAL);
-                               error = EINVAL;
-                       } else {
-                               SCTP_INP_RLOCK(inp);
-                               onoff = sctp_is_feature_on(inp, 
SCTP_PCB_FLAGS_RECVNXTINFO);
-                               SCTP_INP_RUNLOCK(inp);
-                       }
-                       if (error == 0) {
-                               /* return the option value */
-                               *(int *)optval = onoff;
-                               *optsize = sizeof(int);
-                       }
-                       break;
+               if (*optsize < sizeof(int)) {
+                       SCTP_LTRACE_ERR_RET(inp, NULL, NULL, 
SCTP_FROM_SCTP_USRREQ, EINVAL);
+                       error = EINVAL;
+               } else {
+                       SCTP_INP_RLOCK(inp);
+                       *(int *)optval = sctp_is_feature_on(inp, 
SCTP_PCB_FLAGS_RECVNXTINFO);
+                       SCTP_INP_RUNLOCK(inp);
+                       *optsize = sizeof(int);
                }
+               break;
        case SCTP_DEFAULT_SNDINFO:
                {
                        struct sctp_sndinfo *info;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to