Author: tuexen
Date: Fri May 29 11:43:51 2015
New Revision: 283705
URL: https://svnweb.freebsd.org/changeset/base/283705
Log:
MFC r275954:
Cleanup the code.
Reported by: Coverity
CID: 1232003
Modified:
stable/10/sys/netinet/sctp_usrreq.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/netinet/sctp_usrreq.c
==============================================================================
--- stable/10/sys/netinet/sctp_usrreq.c Fri May 29 11:40:50 2015
(r283704)
+++ stable/10/sys/netinet/sctp_usrreq.c Fri May 29 11:43:51 2015
(r283705)
@@ -3644,12 +3644,6 @@ flags_out:
(sid < stcb->asoc.streamoutcnt) &&
((policy == SCTP_PR_SCTP_ALL) ||
(PR_SCTP_VALID_POLICY(policy)))) {
-#else
- if ((stcb != NULL) &&
- (policy != SCTP_PR_SCTP_NONE) &&
- (sid < stcb->asoc.streamoutcnt) &&
- (policy == SCTP_PR_SCTP_ALL)) {
-#endif
if (policy == SCTP_PR_SCTP_ALL) {
sprstat->sprstat_abandoned_unsent =
stcb->asoc.strmout[sid].abandoned_unsent[0];
sprstat->sprstat_abandoned_sent =
stcb->asoc.strmout[sid].abandoned_sent[0];
@@ -3657,6 +3651,13 @@ flags_out:
sprstat->sprstat_abandoned_unsent =
stcb->asoc.strmout[sid].abandoned_unsent[policy];
sprstat->sprstat_abandoned_sent =
stcb->asoc.strmout[sid].abandoned_sent[policy];
}
+#else
+ if ((stcb != NULL) &&
+ (policy == SCTP_PR_SCTP_ALL) &&
+ (sid < stcb->asoc.streamoutcnt)) {
+ sprstat->sprstat_abandoned_unsent =
stcb->asoc.strmout[sid].abandoned_unsent[0];
+ sprstat->sprstat_abandoned_sent =
stcb->asoc.strmout[sid].abandoned_sent[0];
+#endif
SCTP_TCB_UNLOCK(stcb);
*optsize = sizeof(struct sctp_prstatus);
} else {
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
