From owner-svn-src-head@FreeBSD.ORG  Sat Apr 20 14:33:56 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3B3CAA12;
 Sat, 20 Apr 2013 14:33:56 +0000 (UTC) (envelope-from ken@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2CA6A1F60;
 Sat, 20 Apr 2013 14:33:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3KEXuYN041939;
 Sat, 20 Apr 2013 14:33:56 GMT (envelope-from ken@svn.freebsd.org)
Received: (from ken@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3KEXufn041937;
 Sat, 20 Apr 2013 14:33:56 GMT (envelope-from ken@svn.freebsd.org)
Message-Id: <201304201433.r3KEXufn041937@svn.freebsd.org>
From: "Kenneth D. Merry" <ken@FreeBSD.org>
Date: Sat, 20 Apr 2013 14:33:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249701 - head/sys/cam/scsi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Apr 2013 14:33:56 -0000

Author: ken
Date: Sat Apr 20 14:33:55 2013
New Revision: 249701
URL: http://svnweb.freebsd.org/changeset/base/249701

Log:
  Fix compilation.
  
  Pointy hat to:	ken

Modified:
  head/sys/cam/scsi/scsi_ch.c

Modified: head/sys/cam/scsi/scsi_ch.c
==============================================================================
--- head/sys/cam/scsi/scsi_ch.c	Sat Apr 20 14:01:22 2013	(r249700)
+++ head/sys/cam/scsi/scsi_ch.c	Sat Apr 20 14:33:55 2013	(r249701)
@@ -1147,15 +1147,11 @@ copy_element_status(struct ch_softc *sof
 			ces->ces_designator_length = devid->designator_length;
 			/*
 			 * Make sure we are always NUL terminated.  The
-			 * buffer should be sized for the maximum
-			 * designator length plus 1, but this will make sure
-			 * there is always a NUL at the end.  This won't
-			 * matter for the binary code set, since the user
-			 * will only pay attention to the length field.
+			 * This won't matter for the binary code set,
+			 * since the user will only pay attention to the
+			 * length field.
 			 */
-			ces->ces_designator[
-			    MIN(sizeof(ces->ces_designator) - 1,
-			    devid->designator_length)]= '\0';
+			ces->ces_designator[devid->designator_length]= '\0';
 		}
 		if (devid->piv_assoc_designator_type &
 		    READ_ELEMENT_STATUS_PIV_SET) {