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/journal/sd-journal.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/journal/sd-journal.c')
-rw-r--r-- | src/journal/sd-journal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index d46dc3c29c..2ce9262a20 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -2188,11 +2188,11 @@ _public_ int sd_journal_process(sd_journal *j) { j->last_process_usec = now(CLOCK_MONOTONIC); for (;;) { - uint8_t buffer[INOTIFY_EVENT_MAX] _alignas_(struct inotify_event); + union inotify_event_buffer buffer; struct inotify_event *e; ssize_t l; - l = read(j->inotify_fd, buffer, sizeof(buffer)); + l = read(j->inotify_fd, &buffer, sizeof(buffer)); if (l < 0) { if (errno == EAGAIN || errno == EINTR) return got_something ? determine_change(j) : SD_JOURNAL_NOP; |