Date: Sat, 11 Aug 2018 11:28:51 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r337619 - in projects/clang700-import: sbin/ifconfig usr.bin/printf Message-ID: <201808111128.w7BBSpXM058775@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sat Aug 11 11:28:51 2018 New Revision: 337619 URL: https://svnweb.freebsd.org/changeset/base/337619 Log: Merge ^/head r336870 through r337618. Modified: projects/clang700-import/sbin/ifconfig/ifieee80211.c projects/clang700-import/usr.bin/printf/printf.c Directory Properties: projects/clang700-import/ (props changed) Modified: projects/clang700-import/sbin/ifconfig/ifieee80211.c ============================================================================== --- projects/clang700-import/sbin/ifconfig/ifieee80211.c Sat Aug 11 11:13:34 2018 (r337618) +++ projects/clang700-import/sbin/ifconfig/ifieee80211.c Sat Aug 11 11:28:51 2018 (r337619) @@ -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) Modified: projects/clang700-import/usr.bin/printf/printf.c ============================================================================== --- projects/clang700-import/usr.bin/printf/printf.c Sat Aug 11 11:13:34 2018 (r337618) +++ projects/clang700-import/usr.bin/printf/printf.c Sat Aug 11 11:28:51 2018 (r337619) @@ -388,7 +388,7 @@ printf_doformat(char *fmt, int *rval) free(p); if (getout) - exit(*rval); + return (end_fmt); break; } case 'c': {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808111128.w7BBSpXM058775>