MFC r285651:
Move assignments around to avoid a false-positive uninitialized variable warning which broke the sparc64 build. This is work from des@ and MFCing was discussed with him.
This commit is contained in:
parent
384a4d33ff
commit
8dc6b51361
@ -598,9 +598,10 @@ gather_inet(int proto)
|
|||||||
xig = (struct xinpgen *)(void *)((char *)xig + xig->xig_len);
|
xig = (struct xinpgen *)(void *)((char *)xig + xig->xig_len);
|
||||||
if (xig >= exig)
|
if (xig >= exig)
|
||||||
break;
|
break;
|
||||||
|
xip = (struct xinpcb *)xig;
|
||||||
|
xtp = (struct xtcpcb *)xig;
|
||||||
switch (proto) {
|
switch (proto) {
|
||||||
case IPPROTO_TCP:
|
case IPPROTO_TCP:
|
||||||
xtp = (struct xtcpcb *)xig;
|
|
||||||
if (xtp->xt_len != sizeof(*xtp)) {
|
if (xtp->xt_len != sizeof(*xtp)) {
|
||||||
warnx("struct xtcpcb size mismatch");
|
warnx("struct xtcpcb size mismatch");
|
||||||
goto out;
|
goto out;
|
||||||
@ -612,7 +613,6 @@ gather_inet(int proto)
|
|||||||
break;
|
break;
|
||||||
case IPPROTO_UDP:
|
case IPPROTO_UDP:
|
||||||
case IPPROTO_DIVERT:
|
case IPPROTO_DIVERT:
|
||||||
xip = (struct xinpcb *)xig;
|
|
||||||
if (xip->xi_len != sizeof(*xip)) {
|
if (xip->xi_len != sizeof(*xip)) {
|
||||||
warnx("struct xinpcb size mismatch");
|
warnx("struct xinpcb size mismatch");
|
||||||
goto out;
|
goto out;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user