diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2017-01-09 19:39:35 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2017-01-09 19:39:35 +0000 |
commit | 3ac0e4769e6763adc1ba758eab9c023dd089520d (patch) | |
tree | fae36fa516730dbb3f2afb94668e03026a2d1bae | |
parent | 0219a00679a03ef42d18f2ca52cec616b4306610 (diff) | |
download | src-3ac0e4769e6763adc1ba758eab9c023dd089520d.tar.gz src-3ac0e4769e6763adc1ba758eab9c023dd089520d.zip |
Avoid taking the address of a packed struct member in mfiutil
Fix a clang 4.0.0 warning about taking the address of a packed member of
struct mfi_evt in mfiutil:
usr.sbin/mfiutil/mfi_evt.c:583:30: error: taking address of packed
member 'members' of class or structure 'mfi_evt' may result in an
unaligned pointer value [-Werror,-Waddress-of-packed-member]
if (parse_locale(optarg, &filter.members.locale) < 0) {
^~~~~~~~~~~~~~~~~~~~~
Use a local variable instead, and copy that into the struct.
Reviewed by: jhb
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D9069
Notes
Notes:
svn path=/head/; revision=311811
-rw-r--r-- | usr.sbin/mfiutil/mfi_evt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/mfiutil/mfi_evt.c b/usr.sbin/mfiutil/mfi_evt.c index 901c0bd0a9d7..4bf24d9d89d9 100644 --- a/usr.sbin/mfiutil/mfi_evt.c +++ b/usr.sbin/mfiutil/mfi_evt.c @@ -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); |