From owner-svn-src-projects@freebsd.org Sat Aug 11 11:28:52 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7B691067FDB for ; Sat, 11 Aug 2018 11:28:52 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 74CB3779E2; Sat, 11 Aug 2018 11:28:52 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 53FB5168D1; Sat, 11 Aug 2018 11:28:52 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7BBSqaT058777; Sat, 11 Aug 2018 11:28:52 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7BBSpXM058775; Sat, 11 Aug 2018 11:28:51 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201808111128.w7BBSpXM058775@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 11 Aug 2018 11:28:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r337619 - in projects/clang700-import: sbin/ifconfig usr.bin/printf X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in projects/clang700-import: sbin/ifconfig usr.bin/printf X-SVN-Commit-Revision: 337619 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Aug 2018 11:28:52 -0000 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': {