Author: tuexen
Date: Sun May 31 12:42:34 2015
New Revision: 283821
URL: https://svnweb.freebsd.org/changeset/base/283821
Log:
MFC r283648:
Address some compiler warnings. No functional change.
Modified:
stable/10/sys/netinet/sctp_indata.c
stable/10/sys/netinet/sctp_output.c
stable/10/sys/netinet/sctputil.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/netinet/sctp_indata.c
==============================================================================
--- stable/10/sys/netinet/sctp_indata.c Sun May 31 12:18:30 2015
(r283820)
+++ stable/10/sys/netinet/sctp_indata.c Sun May 31 12:42:34 2015
(r283821)
@@ -3462,12 +3462,18 @@ sctp_fs_audit(struct sctp_association *a
{
struct sctp_tmit_chunk *chk;
int inflight = 0, resend = 0, inbetween = 0, acked = 0, above = 0;
- int entry_flight, entry_cnt, ret;
+ int ret;
+#ifndef INVARIANTS
+ int entry_flight, entry_cnt;
+
+#endif
+
+ ret = 0;
+#ifndef INVARIANTS
entry_flight = asoc->total_flight;
entry_cnt = asoc->total_flight_count;
- ret = 0;
-
+#endif
if (asoc->pr_sctp_cnt >= asoc->sent_queue_cnt)
return (0);
Modified: stable/10/sys/netinet/sctp_output.c
==============================================================================
--- stable/10/sys/netinet/sctp_output.c Sun May 31 12:18:30 2015
(r283820)
+++ stable/10/sys/netinet/sctp_output.c Sun May 31 12:42:34 2015
(r283821)
@@ -12012,9 +12012,6 @@ sctp_copy_one(struct sctp_stream_queue_p
struct uio *uio,
int resv_upfront)
{
- int left;
-
- left = sp->length;
sp->data = m_uiotombuf(uio, M_WAITOK, sp->length,
resv_upfront, 0);
if (sp->data == NULL) {
Modified: stable/10/sys/netinet/sctputil.c
==============================================================================
--- stable/10/sys/netinet/sctputil.c Sun May 31 12:18:30 2015
(r283820)
+++ stable/10/sys/netinet/sctputil.c Sun May 31 12:42:34 2015
(r283821)
@@ -1449,7 +1449,7 @@ sctp_timeout_handler(void *t)
struct socket *so;
#endif
- int did_output, type;
+ int did_output;
tmr = (struct sctp_timer *)t;
inp = (struct sctp_inpcb *)tmr->ep;
@@ -1488,7 +1488,6 @@ sctp_timeout_handler(void *t)
}
/* if this is an iterator timeout, get the struct and clear inp */
tmr->stopped_from = 0xa003;
- type = tmr->type;
if (inp) {
SCTP_INP_INCR_REF(inp);
if ((inp->sctp_socket == NULL) &&
@@ -1873,7 +1872,7 @@ out_decr:
}
out_no_decr:
SCTPDBG(SCTP_DEBUG_TIMER1, "Timer now complete (type %d)\n",
- type);
+ tmr->type);
CURVNET_RESTORE();
}
_______________________________________________
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"
