From owner-svn-src-projects@freebsd.org  Mon Jan  9 19:42:23 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 A894DCA63CF
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon,  9 Jan 2017 19:42:23 +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 mx1.freebsd.org (Postfix) with ESMTPS id 7A59F153B;
 Mon,  9 Jan 2017 19:42:23 +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 v09JgMcv054144;
 Mon, 9 Jan 2017 19:42:22 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v09JgMDJ054143;
 Mon, 9 Jan 2017 19:42:22 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201701091942.v09JgMDJ054143@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 9 Jan 2017 19:42:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r311812 - projects/clang400-import/usr.sbin/mfiutil
X-SVN-Group: projects
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.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jan 2017 19:42:23 -0000

Author: dim
Date: Mon Jan  9 19:42:22 2017
New Revision: 311812
URL: https://svnweb.freebsd.org/changeset/base/311812

Log:
  Merge ^/head r311808 through r311811.

Modified:
  projects/clang400-import/usr.sbin/mfiutil/mfi_evt.c
Directory Properties:
  projects/clang400-import/   (props changed)

Modified: projects/clang400-import/usr.sbin/mfiutil/mfi_evt.c
==============================================================================
--- projects/clang400-import/usr.sbin/mfiutil/mfi_evt.c	Mon Jan  9 19:39:35 2017	(r311811)
+++ projects/clang400-import/usr.sbin/mfiutil/mfi_evt.c	Mon Jan  9 19:42:22 2017	(r311812)
@@ -540,6 +540,7 @@ show_events(int ac, char **av)
 	char *cp;
 	ssize_t size;
 	uint32_t seq, start, stop;
+	uint16_t locale;
 	uint8_t status;
 	int ch, error, fd, num_events, verbose;
 	u_int i;
@@ -580,12 +581,13 @@ show_events(int ac, char **av)
 			}
 			break;
 		case 'l':
-			if (parse_locale(optarg, &filter.members.locale) < 0) {
+			if (parse_locale(optarg, &locale) < 0) {
 				error = errno;
 				warn("Error parsing event locale");
 				close(fd);
 				return (error);
 			}
+			filter.members.locale = locale;
 			break;
 		case 'n':
 			val = strtol(optarg, &cp, 0);