From owner-svn-src-all@freebsd.org  Wed Dec 21 09:49:17 2016
Return-Path: <owner-svn-src-all@freebsd.org>
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 AF606C8AE25;
 Wed, 21 Dec 2016 09:49:17 +0000 (UTC) (envelope-from mav@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 7F1C41CB8;
 Wed, 21 Dec 2016 09:49:17 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBL9nGKE074047;
 Wed, 21 Dec 2016 09:49:16 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBL9nGZl074046;
 Wed, 21 Dec 2016 09:49:16 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201612210949.uBL9nGZl074046@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 21 Dec 2016 09:49:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r310361 - 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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Dec 2016 09:49:17 -0000

Author: mav
Date: Wed Dec 21 09:49:16 2016
New Revision: 310361
URL: https://svnweb.freebsd.org/changeset/base/310361

Log:
  Fix UUID formatting added in r310360.  Oops!
  
  MFC after:	2 weeks

Modified:
  head/sys/cam/cam_xpt.c

Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c	Wed Dec 21 09:36:23 2016	(r310360)
+++ head/sys/cam/cam_xpt.c	Wed Dec 21 09:49:16 2016	(r310361)
@@ -1191,10 +1191,10 @@ xpt_getattr(char *buf, size_t len, const
 		    && idd->identifier[0] == 0x10) {
 			if ((idd->length - 2) * 2 + 4 < len) {
 				for (l = 2, o = 0; l < idd->length; l++) {
+					if (l == 6 || l == 8 || l == 10 || l == 12)
+					    o += sprintf(buf + o, "-");
 					o += sprintf(buf + o, "%02x",
 					    idd->identifier[l]);
-					if (l == 4 || l == 6 || l == 8 || l == 10)
-					    o += sprintf(buf + o, "-");
 				}
 			} else
 				ret = EFAULT;