diff options
author | Shawn Paul Landden <shawn@churchofgit.com> | 2014-12-23 13:47:16 -0800 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2014-12-24 16:53:04 +0100 |
commit | 0254e9448f3c645758ed63618a3bbb13c242f5e7 (patch) | |
tree | 14259bc9ac0bd2ae5154278c87dc0b8cb886bf73 /src/shared/util.c | |
parent | 60329a9d9fc58b1a4c8a6244592f731839c2e8d7 (diff) |
util: fix strict aliasing violations in use of struct inotify_event v5
There is alot of cleanup that will have to happen to turn on
-fstrict-aliasing, but I think our code should be "correct" to the rule.
Diffstat (limited to 'src/shared/util.c')
-rw-r--r-- | src/shared/util.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/shared/util.c b/src/shared/util.c index 97ff320bc8..e95f6ed247 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -39,7 +39,6 @@ #include <linux/tiocl.h> #include <termios.h> #include <stdarg.h> -#include <sys/inotify.h> #include <sys/poll.h> #include <ctype.h> #include <sys/prctl.h> @@ -2106,7 +2105,7 @@ int acquire_terminal( assert(notify >= 0); for (;;) { - uint8_t buffer[INOTIFY_EVENT_MAX] _alignas_(struct inotify_event); + union inotify_event_buffer buffer; struct inotify_event *e; ssize_t l; @@ -2129,7 +2128,7 @@ int acquire_terminal( } } - l = read(notify, buffer, sizeof(buffer)); + l = read(notify, &buffer, sizeof(buffer)); if (l < 0) { if (errno == EINTR || errno == EAGAIN) continue; |