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

Merge ^/head r336870 through r337618.

Browse Source
This commit is contained in:
dim 2018-08-11 11:28:51 +00:00
parent 2b779a63b2
commit 660a1c820d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/ifconfig/ifieee80211.c
View File

@ -3529,8 +3529,8 @@ list_scan(int s)
idlen = sr->isr_ssid_len;
}
printf("%-*.*s %s %3d %3dM %4d:%-4d %4d %-4.4s"
, IEE80211_NWID_LEN
, copy_essid(ssid, IEE80211_NWID_LEN, idp, idlen)
, IEEE80211_NWID_LEN
, copy_essid(ssid, IEEE80211_NWID_LEN, idp, idlen)
, ssid
, ether_ntoa((const struct ether_addr *) sr->isr_bssid)
, ieee80211_mhz2ieee(sr->isr_freq, sr->isr_flags)

2
usr.bin/printf/printf.c
View File

@ -388,7 +388,7 @@ printf_doformat(char *fmt, int *rval)
free(p);
if (getout)
exit(*rval);
return (end_fmt);
break;
}
case 'c': {