From owner-svn-src-all@freebsd.org Thu Jan 26 20:18:04 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B930CC3429; Thu, 26 Jan 2017 20:18:04 +0000 (UTC) (envelope-from scottl@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 mx1.freebsd.org (Postfix) with ESMTPS id 58D571207; Thu, 26 Jan 2017 20:18:04 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0QKI3Dm085547; Thu, 26 Jan 2017 20:18:03 GMT (envelope-from scottl@FreeBSD.org) Received: (from scottl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0QKI3PF085546; Thu, 26 Jan 2017 20:18:03 GMT (envelope-from scottl@FreeBSD.org) Message-Id: <201701262018.v0QKI3PF085546@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: scottl set sender to scottl@FreeBSD.org using -f From: Scott Long Date: Thu, 26 Jan 2017 20:18:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r312830 - head/sys/cam X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jan 2017 20:18:04 -0000 Author: scottl Date: Thu Jan 26 20:18:03 2017 New Revision: 312830 URL: https://svnweb.freebsd.org/changeset/base/312830 Log: Fix a development mis-merge from r312827 Sponsored by: Netflix Modified: head/sys/cam/cam_xpt.c Modified: head/sys/cam/cam_xpt.c ============================================================================== --- head/sys/cam/cam_xpt.c Thu Jan 26 20:15:14 2017 (r312829) +++ head/sys/cam/cam_xpt.c Thu Jan 26 20:18:03 2017 (r312830) @@ -3727,9 +3727,9 @@ xpt_print(struct cam_path *path, const c { va_list ap; struct sbuf sb; - char buffer[XPT_PRINT_MAXLEN]; + char buffer[XPT_PRINT_LEN]; - sbuf_new(&sb, buffer, XPT_PRINT_MAXLEN, SBUF_FIXEDLEN); + sbuf_new(&sb, buffer, XPT_PRINT_LEN, SBUF_FIXEDLEN); xpt_path_sbuf(path, &sb); va_start(ap, fmt);