svn commit: r311812 - projects/clang400-import/usr.sbin/mfiutil
Dimitry Andric
dim at FreeBSD.org
Mon Jan 9 19:42:23 UTC 2017
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);
More information about the svn-src-projects
mailing list