d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(media_status): Factor common code between IFM_ETHER and IFM_ATM cases.

Browse Source 
(print_media_word, print_media_word_ifconfig): Remove unnecessary
goto following test for null desc.

PR:		bin/102354
Submitted by:	Ricardo Nabinger Sanchez <rnsanchez@gmail.com>
MFC after:	1 week
This commit is contained in:
Thomas Quinot 2006-08-22 23:49:36 +00:00
parent fb7e6ed3e6
commit 68e160886a
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sbin/ifconfig/ifmedia.c
View File

@ -146,6 +146,7 @@ media_status(int s)
printf("\tstatus: ");
switch (IFM_TYPE(ifmr.ifm_active)) {
case IFM_ETHER:
case IFM_ATM:
if (ifmr.ifm_status & IFM_ACTIVE)
printf("active");
else
@ -160,13 +161,6 @@ media_status(int s)
printf("no ring");
break;
case IFM_ATM:
if (ifmr.ifm_status & IFM_ACTIVE)
printf("active");
else
printf("no carrier");
break;
case IFM_IEEE80211:
/* XXX: Different value for adhoc? */
if (ifmr.ifm_status & IFM_ACTIVE)
@ -692,14 +686,11 @@ print_media_word(int ifmw, int print_toptype)
/* Find subtype. */
desc = get_subtype_desc(ifmw, ttos);
if (desc != NULL)
goto got_subtype;
if (desc == NULL) {
printf("<unknown subtype>");
return;
}
/* Falling to here means unknown subtype. */
printf("<unknown subtype>");
return;
got_subtype:
if (print_toptype)
putchar(' ');
@ -750,14 +741,11 @@ print_media_word_ifconfig(int ifmw)
/* Find subtype. */
desc = get_subtype_desc(ifmw, ttos);
if (desc != NULL)
goto got_subtype;
if (desc == NULL) {
printf("<unknown subtype>");
return;
}
/* Falling to here means unknown subtype. */
printf("<unknown subtype>");
return;
got_subtype:
printf("media %s", desc->ifmt_string);
desc = get_mode_desc(ifmw, ttos);